From 0ad137344b5712a7a42c54dc744f7367c56a3212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 27 Feb 2015 15:36:49 +0000 Subject: morphlib/sourceresolver.py: Add _get_file_contents_from_definitions() And make _get_morphology_from_definitions() use it --- morphlib/sourceresolver.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1