[Python-checkins] CVS: python/dist/src/Lib urllib.py,1.141,1.142
Andrew MacIntyre
andymac@bullseye.apana.org.au
Fri, 5 Apr 2002 21:48:16 +1000 (est)
On Thu, 4 Apr 2002, Fred L. Drake wrote:
> Update of /cvsroot/python/python/dist/src/Lib
> In directory usw-pr-cvs1:/tmp/cvs-serv6623/Lib
>
> Modified Files:
> urllib.py
> Log Message:
> Support manual proxy configuration for simple urlopen() operations.
> This change is similar to the supplied patch, but does not save the opener
> when a proxy configuration is specified.
> This closes SF patch #523415.
>
>
> Index: urllib.py
> ===================================================================
> RCS file: /cvsroot/python/python/dist/src/Lib/urllib.py,v
> retrieving revision 1.141
> retrieving revision 1.142
> diff -C2 -d -r1.141 -r1.142
> *** urllib.py 2 Apr 2002 14:38:16 -0000 1.141
> --- urllib.py 4 Apr 2002 20:41:34 -0000 1.142
> ***************
> *** 64,76 ****
> # Shortcut for basic usage
> _urlopener = None
> ! def urlopen(url, data=None):
> """urlopen(url [, data]) -> open file-like object"""
> global _urlopener
> ! if not _urlopener:
> ! _urlopener = FancyURLopener()
> if data is None:
> ! return _urlopener.open(url)
> else:
> ! return _urlopener.open(url, data)
> def urlretrieve(url, filename=None, reporthook=None, data=None):
> global _urlopener
> --- 64,81 ----
> # Shortcut for basic usage
> _urlopener = None
> ! def urlopen(url, data=None, proxies=None):
> """urlopen(url [, data]) -> open file-like object"""
> global _urlopener
> ! if proxies is not None:
> ! opener = FancyURLopener(proxies=proxies)
> ! elif not _urlopener:
> ! opener = FancyURLopener()
> ! _urlopener = opener
> ! else:
> ! opener = _urlopener
> if data is None:
> ! return opener.open(url)
> else:
> ! return opener.open(url, data)
> def urlretrieve(url, filename=None, reporthook=None, data=None):
> global _urlopener
Accepting this part of #523415 wasn't what I expected. I just expected
the docs only change to be applied (the most recent diff), based on my
review comments to Andy.
Not that I have any in-principle objection to this part of the patch.
--
Andrew I MacIntyre "These thoughts are mine alone..."
E-mail: andymac@bullseye.apana.org.au | Snail: PO Box 370
andymac@pcug.org.au | Belconnen ACT 2616
Web: http://www.andymac.org/ | Australia