diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2015-04-29 20:36:17 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2015-05-11 10:49:26 +0000 |
| commit | 5f48a256d3a50068b65c903e46a6f2dda5194ffa (patch) | |
| tree | c1beb0de1a6d02582b44f05b0532c530200f1520 | |
| parent | af5866c94ec111c2f2b2cf61f53462088b7c919e (diff) | |
| download | morph-5f48a256d3a50068b65c903e46a6f2dda5194ffa.tar.gz | |
MorphologyLoader: Set filename attribute at parse time
Change-Id: I0e0b8d352eb4ef1ab6c50e0ba0162263d9bac09d
| -rw-r--r-- | morphlib/morphloader.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py index 0c69baac..1cf53711 100644 --- a/morphlib/morphloader.py +++ b/morphlib/morphloader.py @@ -395,7 +395,9 @@ class MorphologyLoader(object): if not isinstance(obj, dict): raise NotADictionaryError(morph_filename) - return morphlib.morphology.Morphology(obj) + m = morphlib.morphology.Morphology(obj) + m.filename = morph_filename + return m def load_from_string(self, string, filename='string'): # pragma: no cover @@ -409,7 +411,6 @@ class MorphologyLoader(object): return None m = self.parse_morphology_text(string, filename) - m.filename = filename self.validate(m) self.set_commands(m) self.set_defaults(m) |