diff options
author | Javier Jardón <javier.jardon@codethink.co.uk> | 2015-02-27 15:36:49 +0000 |
---|---|---|
committer | Javier Jardón <javier.jardon@codethink.co.uk> | 2015-02-27 18:42:52 +0000 |
commit | 174a0d7c67f15e9ce6c34e8f3e7d6e0d9acd3f6e (patch) | |
tree | bc1d4795d0c7375aadbfa674a68fa4cb8f02438f /morphlib | |
parent | 593556017d4b8e5e862d92f1a56dc086138b2acc (diff) | |
download | morph-174a0d7c67f15e9ce6c34e8f3e7d6e0d9acd3f6e.tar.gz |
morphlib/sourceresolver.py: Add _get_file_contents_from_definitions()
And make _get_morphology_from_definitions() use it
Diffstat (limited to 'morphlib')
-rw-r--r-- | morphlib/sourceresolver.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/morphlib/sourceresolver.py b/morphlib/sourceresolver.py index 6347861e..dd020803 100644 --- a/morphlib/sourceresolver.py +++ b/morphlib/sourceresolver.py @@ -212,10 +212,19 @@ class SourceResolver(object): return absref, tree + def _get_file_contents_from_definitions(self, + filename): # pragma: no cover + if os.path.exists(filename): + with open(filename) as f: + return f.read() + else: + return None + def _get_morphology_from_definitions(self, loader, filename): # pragma: no cover if os.path.exists(filename): - return loader.load_from_file(filename) + text = self._get_file_contents_from_definitions(filename) + return self.load_from_string(text, filename=filename) else: return None |