diff options
| author | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-12-19 12:33:35 (GMT) |
|---|---|---|
| committer | Andrew Svetlov <andrew.svetlov@gmail.com> | 2012-12-19 12:33:35 (GMT) |
| commit | 2606a6f197a49f04611cb5cb0d67404d1ab14481 (patch) | |
| tree | 35c228625105050ec2f593e6b362ce9e2498c760 /Lib/urllib | |
| parent | 8a045cb93bded97220422a957941bb68341429d1 (diff) | |
| download | cpython-2606a6f197a49f04611cb5cb0d67404d1ab14481.zip cpython-2606a6f197a49f04611cb5cb0d67404d1ab14481.tar.gz cpython-2606a6f197a49f04611cb5cb0d67404d1ab14481.tar.bz2 | |
Issue #16719: Get rid of WindowsError. Use OSError instead
Patch by Serhiy Storchaka.
Diffstat (limited to 'Lib/urllib')
| -rw-r--r-- | Lib/urllib/request.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 6757bc6..2ebd892 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2573,7 +2573,7 @@ elif os.name == 'nt': proxies['https'] = 'https://%s' % proxyServer proxies['ftp'] = 'ftp://%s' % proxyServer internetSettings.Close() - except (WindowsError, ValueError, TypeError): + except (OSError, ValueError, TypeError): # Either registry key not found etc, or the value in an # unexpected format. # proxies already set up to be empty so nothing to do @@ -2603,7 +2603,7 @@ elif os.name == 'nt': proxyOverride = str(winreg.QueryValueEx(internetSettings, 'ProxyOverride')[0]) # ^^^^ Returned as Unicode but problems if not converted to ASCII - except WindowsError: + except OSError: return 0 if not proxyEnable or not proxyOverride: return 0 |