Changeset 5251ec6 in sasview for src/sas/sasgui/guiframe/proxy.py

Timestamp:

Oct 11, 2018 12:20:56 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

98b9f32

Parents:

67ed543

Message:

improved support for py37 in sasgui

File:

• src/sas/sasgui/guiframe/proxy.py (modified) (6 diffs)

src/sas/sasgui/guiframe/proxy.py

@@ -3 +3 @@
 from __future__ import print_function
 
-import urllib2
 import sys
 import json
@@ -9 +8 @@
 import re
 
+try:
+    # CRUFT: python 3 uses urllib.request instead of urllib2
+    import urllib2
+except ImportError:
+    from urllib import request as urllib2
 
 logger = logging.getLogger(__name__)
@@ -50 +54 @@
                 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 subkeys and len(subkeys['AutoConfigURL']) > 0:
                 pac_files.append(subkeys['AutoConfigURL'])
         elif sys.platform == 'darwin':
@@ -61 +65 @@
                 # the first part is a long identifier
                 net_key, network = network
-                if 'ProxyAutoConfigURLString' in network['Proxies'].keys():
+                if 'ProxyAutoConfigURLString' in network['Proxies']:
                     pac_files.append(
                         network['Proxies']['ProxyAutoConfigURLString'])
@@ -127 +131 @@
             logger.debug("Trying Direct connection to %s..."%self.url)
             response = urllib2.urlopen(req, timeout=self.timeout)
-        except Exception, e:
+        except Exception as exc:
             logger.debug("Failed!")
-            logger.debug(e)
+            logger.debug(exc)
             try:
                 logger.debug("Trying to use system proxy if it exists...")
                 self._set_proxy()
                 response = urllib2.urlopen(req, timeout=self.timeout)
-            except Exception, e:
+            except Exception as exc:
                 logger.debug("Failed!")
-                logger.debug(e)
+                logger.debug(exc)
                 pac_urls = self._get_addresses_of_proxy_pac()
                 proxy_urls = self._parse_proxy_pac(pac_urls)
@@ -144 +148 @@
                         self._set_proxy(proxy)
                         response = urllib2.urlopen(req, timeout=self.timeout)
-                    except Exception, e:
+                    except Exception as exc:
                         logger.debug("Failed!")
-                        logger.debug(e)
+                        logger.debug(exc)
         if response is not None:
             logger.debug("The connection to %s was successful."%self.url)