diff options
| author | Siegfried-Angel Gevatter Pujals <siegfried@gevatter.com> | 2012-10-12 17:44:43 +0200 |
|---|---|---|
| committer | Siegfried-Angel Gevatter Pujals <siegfried@gevatter.com> | 2012-10-12 17:46:24 +0200 |
| commit | 12bb390f15eb0d4923ee423f3231074f77e4e99c (patch) | |
| tree | e09739773fe9f82869a61f8ea6a6ae586537f47e /python | |
| parent | 491dbf8d1c90cd029d78276065ab3d9c299a27aa (diff) | |
| download | zeitgeist-12bb390f15eb0d4923ee423f3231074f77e4e99c.tar.gz | |
python/datamodel.py: relax struct length requirements
Don't complain if there is superfluous data in the event or
subject tuple, only if something is missing. This will make
any future additions to them forwards-compatible.
Diffstat (limited to 'python')
| -rw-r--r-- | python/datamodel.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/python/datamodel.py b/python/datamodel.py index 27052f1a..bdbffad5 100644 --- a/python/datamodel.py +++ b/python/datamodel.py @@ -385,12 +385,12 @@ class Subject(list): def __init__(self, data=None): if data: if len(data) == len(Subject.Fields) - 2: - # current_origin has been added in Zeitgeist 1.0 Beta 1 + # current_uri has been added in Zeitgeist 0.8.0 data.append("") if len(data) == len(Subject.Fields) - 1: - # current_uri has been added in Zeitgeist 0.8.0 + # current_origin has been added in Zeitgeist 1.0 Beta 1 data.append("") - if len(data) != len(Subject.Fields): + if len(data) < len(Subject.Fields): raise ValueError( "Invalid subject data length %s, expected %s" \ %(len(data), len(Subject.Fields))) @@ -634,7 +634,7 @@ class Event(list): if len(event_data) == len(cls.Fields) - 1: # Old versions of Zeitgeist didn't have the event origin field. event_data.append("") - if len(event_data) != len(cls.Fields): + if len(event_data) < len(cls.Fields): raise ValueError("event_data must have %s members, found %s" % \ (len(cls.Fields), len(event_data))) return event_data |