summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-08-15 14:15:58 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2013-08-15 17:02:12 +0000
commit306b330553ff8936d192957c24313dea8884ce68 (patch)
treeedbf533ed8147494600f17a65b9b9e1f3e8b7c8a
parent71aad66f7360c16eb9569c599ffb709df0a49db4 (diff)
downloaddefinitions-306b330553ff8936d192957c24313dea8884ce68.tar.gz
Systematically use spec instead of info
We don't have a real name for the dict that tells us what chunk (or stratum) to use in a stratum (or system). The code was sometimes using spec, and sometimes info. It now uses spec always. Suggested by Richard Maw
-rw-r--r--morphlib/morphloader.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py
index a8bf2440..597d4ec6 100644
--- a/morphlib/morphloader.py
+++ b/morphlib/morphloader.py
@@ -237,8 +237,8 @@ class MorphologyLoader(object):
def _validate_system(self, morph):
# All stratum names should be unique within a system.
names = set()
- for info in morph['strata']:
- name = info.get('alias', info['morph'])
+ for spec in morph['strata']:
+ name = spec.get('alias', spec['morph'])
if name in names:
raise ValueError('Duplicate stratum "%s"' % name)
names.add(name)
@@ -261,8 +261,8 @@ class MorphologyLoader(object):
def _validate_stratum(self, morph):
# All chunk names must be unique within a stratum.
names = set()
- for info in morph['chunks']:
- name = info.get('alias', info['name'])
+ for spec in morph['chunks']:
+ name = spec.get('alias', spec['name'])
if name in names:
raise ValueError('Duplicate chunk "%s"' % name)
names.add(name)