Title: [273838] trunk/Tools
- Revision
- 273838
- Author
- aakash_j...@apple.com
- Date
- 2021-03-03 14:00:22 -0800 (Wed, 03 Mar 2021)
Log Message
[ews] Add python 3 support - part 4
https://bugs.webkit.org/show_bug.cgi?id=222672
Reviewed by Jonathan Bedard.
* CISupport/ews-build/events.py:
(JSONProducer): Use implementer (python 3 compatible) instead of implements.
(JSONProducer.__init__): Encode data as utf-8 explicitly.
(Events):
(Events.sendData):
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/events.py (273837 => 273838)
--- trunk/Tools/CISupport/ews-build/events.py 2021-03-03 21:56:50 UTC (rev 273837)
+++ trunk/Tools/CISupport/ews-build/events.py 2021-03-03 22:00:22 UTC (rev 273838)
@@ -34,18 +34,18 @@
from twisted.web.client import Agent
from twisted.web.http_headers import Headers
from twisted.web.iweb import IBodyProducer
-from zope.interface import implements
+from zope.interface import implementer
+@implementer(IBodyProducer)
class JSONProducer(object):
"""
Perform JSON asynchronously as to not lock the buildbot main event loop
"""
- implements(IBodyProducer)
def __init__(self, data):
try:
- self.body = json.dumps(data, default=self.json_serialize_datetime)
+ self.body = json.dumps(data, default=self.json_serialize_datetime).encode('utf-8')
except TypeError:
self.body = ''
self.length = len(self.body)
@@ -73,7 +73,7 @@
class Events(service.BuildbotService):
- EVENT_SERVER_ENDPOINT = 'https://ews.webkit.org/results/'
+ EVENT_SERVER_ENDPOINT = b'https://ews.webkit.org/results/'
def __init__(self, master_hostname, type_prefix='', name='Events'):
"""
@@ -95,7 +95,7 @@
agent = Agent(reactor)
body = JSONProducer(data)
- agent.request('POST', self.EVENT_SERVER_ENDPOINT, Headers({'Content-Type': ['application/json']}), body)
+ agent.request(b'POST', self.EVENT_SERVER_ENDPOINT, Headers({'Content-Type': ['application/json']}), body)
def getBuilderName(self, build):
if not (build and 'properties' in build):
Modified: trunk/Tools/ChangeLog (273837 => 273838)
--- trunk/Tools/ChangeLog 2021-03-03 21:56:50 UTC (rev 273837)
+++ trunk/Tools/ChangeLog 2021-03-03 22:00:22 UTC (rev 273838)
@@ -1,3 +1,16 @@
+2021-03-03 Aakash Jain <aakash_j...@apple.com>
+
+ [ews] Add python 3 support - part 4
+ https://bugs.webkit.org/show_bug.cgi?id=222672
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/ews-build/events.py:
+ (JSONProducer): Use implementer (python 3 compatible) instead of implements.
+ (JSONProducer.__init__): Encode data as utf-8 explicitly.
+ (Events):
+ (Events.sendData):
+
2021-03-03 Robert Jenner <jen...@apple.com>
Adding myself as a committer in the contributors file.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
