Fix for #779167: use InternetConfig proxy settings on MacOSX (in addition
to unix-style).
diff --git a/Lib/urllib.py b/Lib/urllib.py
index 8234296..f472d42 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -1187,8 +1187,8 @@
proxies[name[:-6]] = value
return proxies
-if os.name == 'mac':
- def getproxies():
+if sys.platform == 'darwin':
+ def getproxies_internetconfig():
"""Return a dictionary of scheme -> proxy server URL mappings.
By convention the mac uses Internet Config to store
@@ -1221,6 +1221,9 @@
def proxy_bypass(x):
return 0
+ def getproxies():
+ return getproxies_environment() or getproxies_internetconfig()
+
elif os.name == 'nt':
def getproxies_registry():
"""Return a dictionary of scheme -> proxy server URL mappings.