Patch #994595: Recognize Basic auth even if other schemes are offered.

Will backport to 2.3.

Lib/urllib2.py

@@ -714,7 +714,7 @@ class AbstractBasicAuthHandler:
         # 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':

Misc/NEWS

@@ -72,6 +72,9 @@ Extension modules
 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