[arch-commits] Commit in buildbot/trunk (buildbot-python38.diff)

[Chih-Hsuan Yen]

    Date: Sunday, November 3, 2019 @ 18:55:38
  Author: yan12125
Revision: 522562

buildbot: add forgotten patch

Added:
  buildbot/trunk/buildbot-python38.diff

------------------------+
 buildbot-python38.diff |   38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

Added: buildbot-python38.diff
===================================================================
--- buildbot-python38.diff	                        (rev 0)
+++ buildbot-python38.diff	2019-11-03 18:55:38 UTC (rev 522562)
@@ -0,0 +1,38 @@
+diff --git a/master/buildbot/changes/bitbucket.py b/master/buildbot/changes/bitbucket.py
+index 8a3c2067d..5e8d43954 100644
+--- a/master/buildbot/changes/bitbucket.py
++++ b/master/buildbot/changes/bitbucket.py
+@@ -89,7 +89,7 @@ class BitbucketPullrequestPoller(base.PollingChangeSource):
+ 
+     @defer.inlineCallbacks
+     def _processChanges(self, page):
+-        result = json.loads(page, encoding=self.encoding)
++        result = json.loads(page)
+         for pr in result['values']:
+             branch = pr['source']['branch']['name']
+             nr = int(pr['id'])
+@@ -106,7 +106,7 @@ class BitbucketPullrequestPoller(base.PollingChangeSource):
+                 if not current or current[0:12] != revision[0:12]:
+                     # parse pull request api page (required for the filter)
+                     page = yield client.getPage(str(pr['links']['self']['href']))
+-                    pr_json = json.loads(page, encoding=self.encoding)
++                    pr_json = json.loads(page)
+ 
+                     # filter pull requests by user function
+                     if not self.pullrequest_filter(pr_json):
+@@ -127,13 +127,13 @@ class BitbucketPullrequestPoller(base.PollingChangeSource):
+                     title = pr['title']
+                     # parse commit api page
+                     page = yield client.getPage(str(pr['source']['commit']['links']['self']['href']))
+-                    commit_json = json.loads(page, encoding=self.encoding)
++                    commit_json = json.loads(page)
+                     # use the full-length hash from now on
+                     revision = commit_json['hash']
+                     revlink = commit_json['links']['html']['href']
+                     # parse repo api page
+                     page = yield client.getPage(str(pr['source']['repository']['links']['self']['href']))
+-                    repo_json = json.loads(page, encoding=self.encoding)
++                    repo_json = json.loads(page)
+                     repo = repo_json['links']['html']['href']
+ 
+                     # update database