From 1cdb11800c4eb49b56ac1aa95a511e902b553cfa Mon Sep 17 00:00:00 2001 From: Jens Andersen Date: Thu, 17 Oct 2013 13:47:45 +0000 Subject: Return sortKey from query result, to allow resuming query. This is required to be able to retrieve more than 500 changes using the query interface. --- pygerrit/models.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pygerrit') diff --git a/pygerrit/models.py b/pygerrit/models.py index ac9575a..3b6826b 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"" % (self.number, self.project, self.branch) -- cgit v1.2.1 From 69649921b58472db5176c8476d9e0fedaba0de55 Mon Sep 17 00:00:00 2001 From: Jens Andersen Date: Thu, 17 Oct 2013 13:45:57 +0000 Subject: Reason is optional in abandon and restore changes --- pygerrit/events.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pygerrit') 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) -- cgit v1.2.1 From f4440f8fda0fc767b988acd252ea0aecdce89cb9 Mon Sep 17 00:00:00 2001 From: Jens Andersen Date: Thu, 17 Oct 2013 14:44:31 +0000 Subject: Fix indentation --- pygerrit/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pygerrit') diff --git a/pygerrit/models.py b/pygerrit/models.py index 3b6826b..22716ec 100644 --- a/pygerrit/models.py +++ b/pygerrit/models.py @@ -65,7 +65,7 @@ class Change(object): 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") + self.sortkey = from_json(json_data, "sortKey") def __repr__(self): return u"" % (self.number, self.project, self.branch) -- cgit v1.2.1