From 5f48a256d3a50068b65c903e46a6f2dda5194ffa Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Wed, 29 Apr 2015 20:36:17 +0000
Subject: MorphologyLoader: Set filename attribute at parse time

Change-Id: I0e0b8d352eb4ef1ab6c50e0ba0162263d9bac09d
---
 morphlib/morphloader.py | 5 +++--
 1 file 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)
-- 
cgit v1.2.1