summaryrefslogtreecommitdiff
path: root/morphlib/plugins
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-11-12 09:37:52 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-03-25 20:47:55 +0000
commit0ee859ada56e13b3c3a5d789372ba8e7e16c05ad (patch)
treef5aba4f9dd3dc6130883addd6198227c922e5856 /morphlib/plugins
parentd58d8e8f7a4ec03ff14021a4515c8283dad52573 (diff)
downloadmorph-0ee859ada56e13b3c3a5d789372ba8e7e16c05ad.tar.gz
morphloader: simplify API
Use an optional parameter to control whether the defaults should be set instead of a separate function. Change-Id: Idbbd5a08e8b16d8e01bb9539274092978b64f6f0
Diffstat (limited to 'morphlib/plugins')
-rw-r--r--morphlib/plugins/diff_plugin.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/plugins/diff_plugin.py b/morphlib/plugins/diff_plugin.py
index 24a6d69a..de4ca0b9 100644
--- a/morphlib/plugins/diff_plugin.py
+++ b/morphlib/plugins/diff_plugin.py
@@ -108,8 +108,8 @@ class DiffPlugin(cliapp.Plugin):
definitions = mf.list_morphologies()
system_paths = set()
for definition in definitions:
- m = ml.parse_morphology_text(mf.read_file(definition),
- definition)
+ m = ml.load_from_string(mf.read_file(definition), definition,
+ False)
if m.get('kind') == 'system' or 'strata' in m:
system_paths.add(definition)
return reponame, ref, system_paths