Patch #994595: Recognize Basic auth even if other schemes are offered.
Will backport to 2.3.
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 8d38749..c525f8c 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -714,7 +714,7 @@
# XXX could be multiple headers
authreq = headers.get(authreq, None)
if authreq:
- mo = AbstractBasicAuthHandler.rx.match(authreq)
+ mo = AbstractBasicAuthHandler.rx.search(authreq)
if mo:
scheme, realm = mo.groups()
if scheme.lower() == 'basic':
diff --git a/Misc/NEWS b/Misc/NEWS
index edd5989..291cc77 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -72,6 +72,9 @@
Library
-------
+- urllib2 now recognizes Basic authentication even if other authentication
+ schemes are offered.
+
- Bug #1001053. wave.open() now accepts unicode filenames.
- gzip.GzipFile has a new fileno() method, to retrieve the handle of the