diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-08 16:16:42 +0000 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-08 16:16:42 +0000 |
| commit | 53f9395fa3570c7f0a07825e125fc4713864af3c (patch) | |
| tree | 686d68d2150620e9dea4e3e90ab2f17ee931aba1 | |
| parent | 6e36e9a1a29495f0c8b62fedddadcf8df78506d9 (diff) | |
| parent | d9b77f6e78e1bfa6c8cc9b55becf1280ad5c018d (diff) | |
| download | morph-53f9395fa3570c7f0a07825e125fc4713864af3c.tar.gz | |
Merge remote-tracking branch 'origin/danielfirth/RT241'
Reviewed-by: Lars Wirzenius
Reviewed-by: Richard Maw
| -rw-r--r-- | morphlib/morph2.py | 4 | ||||
| -rw-r--r-- | morphlib/morphloader.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/morphlib/morph2.py b/morphlib/morph2.py index a10dda8d..0e0d9201 100644 --- a/morphlib/morph2.py +++ b/morphlib/morph2.py @@ -60,7 +60,9 @@ class Morphology(object): ('arch', None), ('configuration-extensions', []), ], - 'cluster': [] + 'cluster': [ + ('description', ''), + ], } @staticmethod diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py index 8c20d9ed..702a330c 100644 --- a/morphlib/morphloader.py +++ b/morphlib/morphloader.py @@ -151,7 +151,9 @@ class MorphologyLoader(object): 'arch': None, 'configuration-extensions': [], }, - 'cluster': {}, + 'cluster': { + 'description': '', + }, } def parse_morphology_text(self, text, whence): |