Changeset b3e8629 in sasview for src/sas/qtgui/Utilities/ConnectionProxy.py

Timestamp:

Nov 9, 2017 6:41:54 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

cee5c78

Parents:

749b715

git-author:

Piotr Rozyczko <rozyczko@…> (10/26/17 01:13:05)

git-committer:

Piotr Rozyczko <rozyczko@…> (11/09/17 06:41:54)

Message:

Initial changes to make SasView? run with python3

File:

• src/sas/qtgui/Utilities/ConnectionProxy.py (modified) (10 diffs)

src/sas/qtgui/Utilities/ConnectionProxy.py

@@ -1 +1 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 import sys
 import json
@@ -33 +33 @@
         if sys.platform == 'win32':
             try:
-                import _winreg as winreg  # used from python 2.0-2.6
+                import winreg as winreg  # used from python 2.0-2.6
             except:
                 import winreg  # used from python 2.7 onwards
@@ -45 +45 @@
                 this_name, this_val, this_type = winreg.EnumValue(net, i)
                 subkeys[this_name] = this_val
-            if 'AutoConfigURL' in subkeys.keys() and len(subkeys['AutoConfigURL']) > 0:
+            if 'AutoConfigURL' in list(subkeys.keys()) and len(subkeys['AutoConfigURL']) > 0:
                 pac_files.append(subkeys['AutoConfigURL'])
         elif sys.platform == 'darwin':
@@ -53 +53 @@
             networks = sys_prefs['NetworkServices']
             # loop through each possible network (e.g. Ethernet, Airport...)
-            for network in networks.items():
+            for network in list(networks.items()):
                 # the first part is a long identifier
                 net_key, network = network
-                if 'ProxyAutoConfigURLString' in network['Proxies'].keys():
+                if 'ProxyAutoConfigURLString' in list(network['Proxies'].keys()):
                     pac_files.append(
                         network['Proxies']['ProxyAutoConfigURLString'])
@@ -73 +73 @@
             logging.debug('Trying pac file (%s)...' % this_pac_url)
             try:
-                response = urllib2.urlopen(
+                response = urllib.request.urlopen(
                     this_pac_url, timeout=self.timeout)
                 logging.debug('Succeeded (%s)...' % this_pac_url)
@@ -101 +101 @@
             # information is retrieved from the OS X System Configuration
             # Framework.
-            proxy = urllib2.ProxyHandler()
+            proxy = urllib.request.ProxyHandler()
         else:
             # If proxies is given, it must be a dictionary mapping protocol names to
             # URLs of proxies.
-            proxy = urllib2.ProxyHandler(proxy_dic)
-        opener = urllib2.build_opener(proxy)
-        urllib2.install_opener(opener)
+            proxy = urllib.request.ProxyHandler(proxy_dic)
+        opener = urllib.request.build_opener(proxy)
+        urllib.request.install_opener(opener)
 
     def connect(self):
@@ -114 +114 @@
         @return: response object from urllib2.urlopen
         '''
-        req = urllib2.Request(self.url)
+        req = urllib.request.Request(self.url)
         response = None
         try:
             logging.debug("Trying Direct connection to %s..."%self.url)
-            response = urllib2.urlopen(req, timeout=self.timeout)
-        except Exception, e:
+            response = urllib.request.urlopen(req, timeout=self.timeout)
+        except Exception as e:
             logging.debug("Failed!")
             logging.debug(e)
@@ -125 +125 @@
                 logging.debug("Trying to use system proxy if it exists...")
                 self._set_proxy()
-                response = urllib2.urlopen(req, timeout=self.timeout)
-            except Exception, e:
+                response = urllib.request.urlopen(req, timeout=self.timeout)
+            except Exception as e:
                 logging.debug("Failed!")
                 logging.debug(e)
@@ -135 +135 @@
                         logging.debug("Trying to use the proxy %s found in proxy.pac configuration"%proxy)
                         self._set_proxy(proxy)
-                        response = urllib2.urlopen(req, timeout=self.timeout)
-                    except Exception, e:
+                        response = urllib.request.urlopen(req, timeout=self.timeout)
+                    except Exception as e:
                         logging.debug("Failed!")
                         logging.debug(e)
@@ -151 +151 @@
     response = c.connect()
     if response is not None:
-        print 50 * '-'
+        print(50 * '-')
         content = json.loads(response.read().strip())
         pprint(content)