Title: [273404] trunk/Tools
- Revision
- 273404
- Author
- aakash_j...@apple.com
- Date
- 2021-02-24 09:26:08 -0800 (Wed, 24 Feb 2021)
Log Message
[ews] Add python 3 support - part 3
https://bugs.webkit.org/show_bug.cgi?id=222355
Reviewed by Jonathan Bedard.
* CISupport/ews-build/steps.py:
(ValidateCommiterAndReviewer.load_contributors_from_disk): Ensure that the file is closed.
* CISupport/ews-build/steps_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/steps.py (273403 => 273404)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-02-24 17:25:15 UTC (rev 273403)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-02-24 17:26:08 UTC (rev 273404)
@@ -803,7 +803,8 @@
tools_dir_path = os.path.dirname(os.path.dirname(cwd))
contributors_path = os.path.join(tools_dir_path, 'Scripts/webkitpy/common/config/contributors.json')
try:
- return json.load(open(contributors_path))
+ with open(contributors_path, 'rb') as contributors_json:
+ return json.load(contributors_json)
except Exception as e:
self._addToLog('stdio', 'Failed to load {}\n'.format(contributors_path))
return {}
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (273403 => 273404)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-24 17:25:15 UTC (rev 273403)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-24 17:26:08 UTC (rev 273404)
@@ -2660,7 +2660,7 @@
yield self.runStep()
- buf = ''.join(buf)
+ buf = b''.join(buf)
self.assertEqual(len(buf), self.READ_LIMIT)
with open(__file__, 'rb') as masterFile:
data = ""
Modified: trunk/Tools/ChangeLog (273403 => 273404)
--- trunk/Tools/ChangeLog 2021-02-24 17:25:15 UTC (rev 273403)
+++ trunk/Tools/ChangeLog 2021-02-24 17:26:08 UTC (rev 273404)
@@ -1,5 +1,16 @@
2021-02-24 Aakash Jain <aakash_j...@apple.com>
+ [ews] Add python 3 support - part 3
+ https://bugs.webkit.org/show_bug.cgi?id=222355
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/ews-build/steps.py:
+ (ValidateCommiterAndReviewer.load_contributors_from_disk): Ensure that the file is closed.
+ * CISupport/ews-build/steps_unittest.py:
+
+2021-02-24 Aakash Jain <aakash_j...@apple.com>
+
[ews] Make unit-test compatible with latest buildbot
https://bugs.webkit.org/show_bug.cgi?id=222359
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
