summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-05-06 12:05:30 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2015-05-06 14:00:26 +0000
commit9c8852879b80d867a4c52179c5c0b7ddb32f0446 (patch)
tree681a0b0714fe38e70004ec55a723ec9fa5e8d40c
parentbf996168cb969c559d457d3877197c070ae48d66 (diff)
downloadmorph-9c8852879b80d867a4c52179c5c0b7ddb32f0446.tar.gz
MorphologyLoader: Set filename attribute at parse time
-rw-r--r--morphlib/morphloader.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py
index 47cb03d7..32dd2ff4 100644
--- a/morphlib/morphloader.py
+++ b/morphlib/morphloader.py
@@ -387,7 +387,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
@@ -401,7 +403,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)