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

Timestamp:

Jun 20, 2018 3:42:03 PM (6 years ago)

Author:

vboxsync

Message:

webutils.py: Fixed the fNoProxies parameter for downloadFile().

File:

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

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

@@ -43 +43 @@
     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
 
 # Validation Kit imports.
@@ -147 +148 @@
           http_proxy, ftp_proxy, no_proxy environment variables.
 
-    @todo Fixed build burn here. Please set default value for fNoProxies
-          to appropriate one.
     """
     if fnError is None:
@@ -160 +159 @@
         try:
             ## @todo We get 404.html content instead of exceptions here, which is confusing and should be addressed.
-            if fNoProxies:
+            if not fNoProxies:
                 oSrc = urllib_urlopen(sUrlFile);
+            elif sys.version_info[0] < 3:
+                oSrc = urllib_urlopen(sUrlFile, proxies = dict());
             else:
-                oSrc = urllib_urlopen(sUrlFile, proxies = dict());
+                oProxyHandler = urllib.request.ProxyHandler(proxies = dict()); # p?ylint: disable=???
+                oOpener = urllib.request.build_opener(oProxyHandler)           # p?ylint: disable=???
+                oSrc = oOpener.open(sUrlFile);
             oDst = utils.openNoInherit(sDstFile, 'wb');
             oDst.write(oSrc.read());