Skip to content
This repository
Browse code

depends: python: fix urllib on ios for real

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

0 notes on commit 6cb4660

Please sign in to comment.
Something went wrong with that request. Please try again.