diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-01-29 13:50:46 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-01-29 14:32:49 +0000 |
commit | e06eafcbf0784271f51c0936852d1e97c0ccce8b (patch) | |
tree | e7e914cd82348e79b7662e6bd06851a0100e7751 /morphlib/morph2.py | |
parent | 63f608d7c05095c16d1a8863b13c55634c0cae8b (diff) | |
download | morph-e06eafcbf0784271f51c0936852d1e97c0ccce8b.tar.gz |
Make yaml be an optional dependency
This can go away when we have made a release with yaml in it, and its
staging filler.
Diffstat (limited to 'morphlib/morph2.py')
-rw-r--r-- | morphlib/morph2.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/morph2.py b/morphlib/morph2.py index edf7bb31..3a3ad679 100644 --- a/morphlib/morph2.py +++ b/morphlib/morph2.py @@ -70,7 +70,7 @@ class Morphology(object): try: self._dict = self._load_json(text) self._dumper = self._dump_json - except Exception, e: + except Exception, e: # pragma: no cover self._dict = morphlib.yamlparse.load(text) self._dumper = morphlib.yamlparse.dump self._set_defaults() |