[Python-checkins] python/dist/src/Lib urllib.py,1.162,1.163

jackjansen at users.sourceforge.net jackjansen at users.sourceforge.net
Fri Jul 16 13:45:02 CEST 2004


Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24498

Modified Files:
	urllib.py 
Log Message:
Fix for #779167: use InternetConfig proxy settings on MacOSX (in addition
to unix-style).


Index: urllib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/urllib.py,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** urllib.py	23 Mar 2004 23:50:17 -0000	1.162
--- urllib.py	16 Jul 2004 11:45:00 -0000	1.163
***************
*** 1188,1193 ****
      return proxies
  
! if os.name == 'mac':
!     def getproxies():
          """Return a dictionary of scheme -> proxy server URL mappings.
  
--- 1188,1193 ----
      return proxies
  
! if sys.platform == 'darwin':
!     def getproxies_internetconfig():
          """Return a dictionary of scheme -> proxy server URL mappings.
  
***************
*** 1222,1225 ****
--- 1222,1228 ----
          return 0
  
+     def getproxies():
+         return getproxies_environment() or getproxies_internetconfig()
+         
  elif os.name == 'nt':
      def getproxies_registry():



More information about the Python-checkins mailing list