Title: [271102] trunk/Tools
- Revision
- 271102
- Author
- [email protected]
- Date
- 2020-12-28 09:33:44 -0800 (Mon, 28 Dec 2020)
Log Message
built-product-archive should work with Python 3
https://bugs.webkit.org/show_bug.cgi?id=220157
Reviewed by Aakash Jain.
* CISupport/built-product-archive:
(webkitBuildDirectoryForConfigurationAndPlatform): Decode result as a string,
because the directory is then used in string manipulation.
(createZipFromList): Use Python 3 compatible 'except' syntax. The new syntax works
in Python 2.6 and newer.
(createZip): Ditto.
Modified Paths
Diff
Modified: trunk/Tools/CISupport/built-product-archive (271101 => 271102)
--- trunk/Tools/CISupport/built-product-archive 2020-12-28 06:44:54 UTC (rev 271101)
+++ trunk/Tools/CISupport/built-product-archive 2020-12-28 17:33:44 UTC (rev 271102)
@@ -84,7 +84,7 @@
command += ['--top-level']
else:
command += ['--configuration']
- return subprocess.Popen(command, stdout=subprocess.PIPE).communicate()[0].strip()
+ return subprocess.Popen(command, stdout=subprocess.PIPE).communicate()[0].strip().decode('utf-8')
def determineWebKitBuildDirectories(platform, fullPlatform, configuration):
@@ -116,7 +116,7 @@
try:
os.unlink(archiveFile)
- except OSError, e:
+ except OSError as e:
if e.errno != errno.ENOENT:
raise
@@ -151,7 +151,7 @@
try:
os.unlink(archiveFile)
- except OSError, e:
+ except OSError as e:
if e.errno != errno.ENOENT:
raise
Modified: trunk/Tools/ChangeLog (271101 => 271102)
--- trunk/Tools/ChangeLog 2020-12-28 06:44:54 UTC (rev 271101)
+++ trunk/Tools/ChangeLog 2020-12-28 17:33:44 UTC (rev 271102)
@@ -1,3 +1,17 @@
+2020-12-28 Alexey Proskuryakov <[email protected]>
+
+ built-product-archive should work with Python 3
+ https://bugs.webkit.org/show_bug.cgi?id=220157
+
+ Reviewed by Aakash Jain.
+
+ * CISupport/built-product-archive:
+ (webkitBuildDirectoryForConfigurationAndPlatform): Decode result as a string,
+ because the directory is then used in string manipulation.
+ (createZipFromList): Use Python 3 compatible 'except' syntax. The new syntax works
+ in Python 2.6 and newer.
+ (createZip): Ditto.
+
2020-12-23 Dean Jackson <[email protected]>
Simulated Python crash during test runs
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
