From df6eca7eb7b6ac1b00ba524f1d9565881a93b9ea Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Thu, 4 Apr 2002 20:41:34 +0000 Subject: [PATCH] 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. --- Lib/urllib.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Lib/urllib.py b/Lib/urllib.py index d028d7a591..2d53c12588 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -63,15 +63,20 @@ else: # Shortcut for basic usage _urlopener = None -def urlopen(url, data=None): +def urlopen(url, data=None, proxies=None): """urlopen(url [, data]) -> open file-like object""" global _urlopener - if not _urlopener: - _urlopener = FancyURLopener() + if proxies is not None: + opener = FancyURLopener(proxies=proxies) + elif not _urlopener: + opener = FancyURLopener() + _urlopener = opener + else: + opener = _urlopener if data is None: - return _urlopener.open(url) + return opener.open(url) else: - return _urlopener.open(url, data) + return opener.open(url, data) def urlretrieve(url, filename=None, reporthook=None, data=None): global _urlopener if not _urlopener: -- 2.50.1