diff options
| -rw-r--r-- | AUTHORS.rst | 14 | ||||
| -rw-r--r-- | pygerrit/events.py | 9 | ||||
| -rw-r--r-- | pygerrit/models.py | 2 |
3 files changed, 22 insertions, 3 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst new file mode 100644 index 0000000..58941af --- /dev/null +++ b/AUTHORS.rst @@ -0,0 +1,14 @@ +pygerrit is written and maintained by David Pursehouse and +various contributors: + +Development Lead +```````````````` + +- David Pursehouse <david.pursehouse@sonymobile.com> + + +Patches and Suggestions +``````````````````````` + +- Ernst Sjöstrand <ernst.sjostrand@sonymobile.com> +- Jens Andersen <jens.andersen@gmail.com> diff --git a/pygerrit/events.py b/pygerrit/events.py index ebbb327..000387e 100644 --- a/pygerrit/events.py +++ b/pygerrit/events.py @@ -220,7 +220,8 @@ class MergeFailedEvent(GerritEvent): self.change = Change(json_data["change"]) self.patchset = Patchset(json_data["patchSet"]) self.submitter = Account(json_data["submitter"]) - self.reason = json_data["reason"] + if 'reason' in json_data: + self.reason = json_data["reason"] except KeyError as e: raise GerritError("MergeFailedEvent: %s" % e) @@ -241,7 +242,8 @@ class ChangeAbandonedEvent(GerritEvent): self.change = Change(json_data["change"]) self.patchset = Patchset.from_json(json_data) self.abandoner = Account(json_data["abandoner"]) - self.reason = json_data["reason"] + if 'reason' in json_data: + self.reason = json_data["reason"] except KeyError as e: raise GerritError("ChangeAbandonedEvent: %s" % e) @@ -262,7 +264,8 @@ class ChangeRestoredEvent(GerritEvent): self.change = Change(json_data["change"]) self.patchset = Patchset.from_json(json_data) self.restorer = Account(json_data["restorer"]) - self.reason = json_data["reason"] + if 'reason' in json_data: + self.reason = json_data["reason"] except KeyError as e: raise GerritError("ChangeRestoredEvent: %s" % e) diff --git a/pygerrit/models.py b/pygerrit/models.py index ac9575a..22716ec 100644 --- a/pygerrit/models.py +++ b/pygerrit/models.py @@ -64,6 +64,8 @@ class Change(object): self.subject = from_json(json_data, "subject") self.url = from_json(json_data, "url") self.owner = Account.from_json(json_data, "owner") + if 'sortKey' in json_data: + self.sortkey = from_json(json_data, "sortKey") def __repr__(self): return u"<Change %s, %s, %s>" % (self.number, self.project, self.branch) |