Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

depends: python: fix urllib on ios for real

  • Loading branch information...
commit 6cb46606c0c4b8624b3e83df100ca04647e46530 1 parent 3f27f97
Cory Fields authored
Showing with 27 additions and 14 deletions.
  1. +27 −14 tools/depends/target/python26/Python-2.6.5-urllib.diff
View
41 tools/depends/target/python26/Python-2.6.5-urllib.diff
@@ -1,15 +1,28 @@
--- Lib/urllib.py 2010-02-20 17:13:01.000000000 -0500
-+++ Lib/urllib.py 2013-03-14 01:11:49.000000000 -0400
-@@ -1401,10 +1401,10 @@
- if getproxies_environment():
- return proxy_bypass_environment(host)
- else:
-- return proxy_bypass_macosx_sysconf(host)
-+ return false
-
- def getproxies():
-- return getproxies_environment() or getproxies_macosx_sysconf()
-+ return getproxies_environment()
-
- elif os.name == 'nt':
- def getproxies_registry():
++++ Lib/urllib.py 2013-03-14 18:12:02.526251189 -0400
+@@ -1330,7 +1330,6 @@
+
+
+ if sys.platform == 'darwin':
+- from _scproxy import _get_proxy_settings, _get_proxies
+
+ def proxy_bypass_macosx_sysconf(host):
+ """
+@@ -1352,7 +1351,7 @@
+ parts = (parts + [0, 0, 0, 0])[:4]
+ return (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8) | parts[3]
+
+- proxy_settings = _get_proxy_settings()
++ return False
+
+ # Check for simple host names:
+ if '.' not in host:
+@@ -1393,7 +1392,7 @@
+ This function uses the MacOSX framework SystemConfiguration
+ to fetch the proxy information.
+ """
+- return _get_proxies()
++ return {}
+
+
+
Please sign in to comment.
Something went wrong with that request. Please try again.