Modified: trunk/Tools/CISupport/download-built-product (269987 => 269988)
--- trunk/Tools/CISupport/download-built-product 2020-11-18 22:34:56 UTC (rev 269987)
+++ trunk/Tools/CISupport/download-built-product 2020-11-18 22:41:41 UTC (rev 269988)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (C) 2009 Apple Inc. All rights reserved.
+# Copyright (C) 2009, 2020 Apple Inc. All rights reserved.
# Copyright (C) 2012 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -8,10 +8,10 @@
# are met:
#
# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
+# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
+# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -29,9 +29,15 @@
import os
import subprocess
import sys
-import urllib
+if sys.version_info > (3, 0):
+ from urllib.request import urlretrieve as urllib_urlretrieve
+ from urllib.parse import quote as urllib_quote
+else:
+ from urllib import quote as urllib_quote
+ from urllib import urlretrieve as urllib_urlretrieve
+
def main():
parser = optparse.OptionParser("usage: %prog [options] [url]")
parser.add_option("--platform", dest="platform")
@@ -46,10 +52,10 @@
archivePath = os.path.join(archiveDir, "%s.zip" % options.configuration)
if sys.platform == 'win32': # curl is not availble on Windows (outside of cygwin)
- urllib.urlretrieve(url, archivePath)
+ urllib_urlretrieve(url, archivePath)
return 0
- return subprocess.call(["curl", "--fail", "--output", archivePath, url])
+ return subprocess.call(["curl", "--fail", "--output", archivePath, urllib_quote(url, safe=':/')])
if __name__ == '__main__':
Modified: trunk/Tools/ChangeLog (269987 => 269988)
--- trunk/Tools/ChangeLog 2020-11-18 22:34:56 UTC (rev 269987)
+++ trunk/Tools/ChangeLog 2020-11-18 22:41:41 UTC (rev 269988)
@@ -1,3 +1,16 @@
+2020-11-18 Matt Lewis <jlew...@apple.com>
+
+ Big Sur testers failing to download build products
+ https://bugs.webkit.org/show_bug.cgi?id=219095
+
+ Reviewed by Aakash Jain.
+
+ Fixing the url parsing to deal with special characters. Also
+ reworking the imports to help with transition to python3.
+
+ * CISupport/download-built-product:
+ (main):
+
2020-11-18 Chris Dumez <cdu...@apple.com>
[iOS] beforeunload event does not fire in MobileSafari
