diff options
author | Javier Jardón <javier.jardon@codethink.co.uk> | 2015-02-27 18:40:06 +0000 |
---|---|---|
committer | Javier Jardón <javier.jardon@codethink.co.uk> | 2015-02-27 18:42:52 +0000 |
commit | f9aade23afd8471b5501bb3fb158543ffccae88e (patch) | |
tree | 05d7d61d72136138d6210f39460cc0ac8f171dd2 /morphlib | |
parent | 071c66ac45601800d5de6ce6e5e7ef3287fea050 (diff) | |
download | morph-f9aade23afd8471b5501bb3fb158543ffccae88e.tar.gz |
morphlib/morphloader.py: Add a check to load_from_string()
Diffstat (limited to 'morphlib')
-rw-r--r-- | morphlib/morphloader.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py index d257dced..e0f0952b 100644 --- a/morphlib/morphloader.py +++ b/morphlib/morphloader.py @@ -398,13 +398,17 @@ class MorphologyLoader(object): return morphlib.morphology.Morphology(obj) - def load_from_string(self, string, filename='string'): + def load_from_string(self, string, + filename='string'): # pragma: no cover '''Load a morphology from a string. Return the Morphology object. ''' + if string is None: + return None + m = self.parse_morphology_text(string, filename) m.filename = filename self.validate(m) |