diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-06-24 10:12:51 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-06-24 10:12:51 +0000 |
| commit | 8b6df9a186a8d4fae77003d560448411c7279010 (patch) | |
| tree | a713cf41265cc07b6d97b5f9f8e5c6590fbf7c76 | |
| parent | 6f5294833f120612924a3f42d429c5d1965e9786 (diff) | |
| download | morph-8b6df9a186a8d4fae77003d560448411c7279010.tar.gz | |
Use morphloader rather than morph2 in MorphologyFactory
| -rw-r--r-- | morphlib/morphologyfactory.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/morphlib/morphologyfactory.py b/morphlib/morphologyfactory.py index 9f0877ce..4dea54ba 100644 --- a/morphlib/morphologyfactory.py +++ b/morphlib/morphologyfactory.py @@ -105,11 +105,8 @@ class MorphologyFactory(object): raise AutodetectError(reponame, sha1, filename) text = bs.get_morphology_text(morph_name) - try: - morphology = morphlib.morph2.Morphology(text) - except morphlib.YAMLError as e: # pragma: no cover - raise morphlib.Error("Error parsing %s: %s" % - (filename, str(e))) + loader = morphlib.morphloader.MorphologyLoader() + morphology = loader.load_from_string(text) if morph_name != morphology['name']: raise morphlib.Error( |