From: Simon Cross Date: Sat, 17 May 2014 14:47:32 +0000 (+0200) Subject: Use YAML and JSON support for deck loading. X-Git-Tag: 0.1~96^2~1 X-Git-Url: https://git.ctpug.org.za/?a=commitdiff_plain;ds=sidebyside;h=e50637a954ab1e5f8235df0f8712a3eeed581ad9;p=naja.git Use YAML and JSON support for deck loading. --- diff --git a/naja/gamestate.py b/naja/gamestate.py index a324381..d00c7fc 100644 --- a/naja/gamestate.py +++ b/naja/gamestate.py @@ -2,23 +2,15 @@ The current game state. """ -try: - import yaml -except ImportError: - yaml = None - import json - from naja.gameboard import GameBoard -from naja.resources import resources +from naja.resources import resources, ResourceNotFound def load_location_deck(name): - if yaml: - with resources.get_file('location_decks', '%s.yaml' % name) as deck_fp: - return yaml.safe_load(deck_fp) - else: - with resources.get_file('location_decks', '%s.json' % name) as deck_fp: - return json.load(deck_fp) + try: + return resources.get_yaml('location_decks', '%s.yaml' % name) + except ResourceNotFound: + return resources.get_json('location_decks', '%s.json' % name) class GameState(object):