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