Changeset 72635 in vbox for trunk/src/VBox/ValidationKit/common

Timestamp:

Jun 20, 2018 4:39:17 PM (6 years ago)

Author:

vboxsync

Message:

webutils.py: Changed downloadFile() to use urllib2 on python 2.x so we use an interface similar to the 3.x one.

File:

• trunk/src/VBox/ValidationKit/common/webutils.py (modified) (2 diffs)

trunk/src/VBox/ValidationKit/common/webutils.py

@@ -38 +38 @@
     from urllib2        import quote        as urllib_quote;        # pylint: disable=import-error,no-name-in-module
     from urllib         import urlencode    as urllib_urlencode;    # pylint: disable=import-error,no-name-in-module
-    from urllib         import urlopen      as urllib_urlopen;      # pylint: disable=import-error,no-name-in-module
+    from urllib2        import ProxyHandler as urllib_ProxyHandler; # pylint: disable=import-error,no-name-in-module
+    from urllib2        import build_opener as urllib_build_opener; # pylint: disable=import-error,no-name-in-module
 else:
     from urllib.parse   import quote        as urllib_quote;        # pylint: disable=import-error,no-name-in-module
     from urllib.parse   import urlencode    as urllib_urlencode;    # pylint: disable=import-error,no-name-in-module
-    from urllib.request import urlopen      as urllib_urlopen;      # pylint: disable=import-error,no-name-in-module
-    import urllib.request;                                          # pylint: disable=import-error,no-name-in-module
+    from urllib.request import ProxyHandler as urllib_ProxyHandler; # pylint: disable=import-error,no-name-in-module
+    from urllib.request import build_opener as urllib_build_opener; # pylint: disable=import-error,no-name-in-module
 
 # Validation Kit imports.
@@ -160 +161 @@
             ## @todo We get 404.html content instead of exceptions here, which is confusing and should be addressed.
             if not fNoProxies:
-                oSrc = urllib_urlopen(sUrlFile);
-            elif sys.version_info[0] < 3:
-                oSrc = urllib_urlopen(sUrlFile, proxies = dict());
+                oOpener = urllib_build_opener();
             else:
-                oProxyHandler = urllib.request.ProxyHandler(proxies = dict()); # pylint: disable=no-member
-                oOpener = urllib.request.build_opener(oProxyHandler)           # pylint: disable=no-member
-                oSrc = oOpener.open(sUrlFile);
+                oOpener = urllib_build_opener(urllib_ProxyHandler(proxies = dict()));
+            oSrc = oOpener.open(sUrlFile);
             oDst = utils.openNoInherit(sDstFile, 'wb');
             oDst.write(oSrc.read());