projects
/
naja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
751c25c
)
Use YAML and JSON support for deck loading.
author
Simon Cross
<hodgestar@gmail.com>
Sat, 17 May 2014 14:47:32 +0000
(16:47 +0200)
committer
Simon Cross
<hodgestar@gmail.com>
Sat, 17 May 2014 14:47:41 +0000
(16:47 +0200)
naja/gamestate.py
patch
|
blob
|
history
diff --git
a/naja/gamestate.py
b/naja/gamestate.py
index a32438170e3c5663366850cde744027507b57ceb..d00c7fc182b8af7887b4f1fab472b38f25ebf35f 100644
(file)
--- a/
naja/gamestate.py
+++ b/
naja/gamestate.py
@@
-2,23
+2,15
@@
The current game state.
"""
The current game state.
"""
-try:
- import yaml
-except ImportError:
- yaml = None
- import json
-
from naja.gameboard import GameBoard
from naja.gameboard import GameBoard
-from naja.resources import resources
+from naja.resources import resources
, ResourceNotFound
def load_location_deck(name):
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):
class GameState(object):