Issue #2670: urllib2.build_opener() failed when two handlers

derive the same default base class.

Will backport.

diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index 58cb2a8b5d31fb20c5eda7470c3e07fd2def463f..8d17e05725d7191c0d1f17da041540b9f7859ca1 100644 (file)
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -1063,6 +1063,12 @@ class MiscTests(unittest.TestCase):
         o = build_opener(urllib2.HTTPHandler())
         self.opener_has_handler(o, urllib2.HTTPHandler)
 
+        # Issue2670: multiple handlers sharing the same base class
+        class MyOtherHTTPHandler(urllib2.HTTPHandler): pass
+        o = build_opener(MyHTTPHandler, MyOtherHTTPHandler)
+        self.opener_has_handler(o, MyHTTPHandler)
+        self.opener_has_handler(o, MyOtherHTTPHandler)
+
     def opener_has_handler(self, opener, handler_class):
         for h in opener.handlers:
             if h.__class__ == handler_class:

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index a20e5522c69666e610f9f99737b1058070f65ea4..817c5a7d8b861bd823af07f1bfbc7b79677f3eea 100644 (file)
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -446,14 +446,14 @@ def build_opener(*handlers):
                        FTPHandler, FileHandler, HTTPErrorProcessor]
     if hasattr(httplib, 'HTTPS'):
         default_classes.append(HTTPSHandler)
-    skip = []
+    skip = set()
     for klass in default_classes:
         for check in handlers:
             if isclass(check):
                 if issubclass(check, klass):
-                    skip.append(klass)
+                    skip.add(klass)
             elif isinstance(check, klass):
-                skip.append(klass)
+                skip.add(klass)
     for klass in skip:
         default_classes.remove(klass)
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 6a0e9246291083e6ebe9a4226f51536deb6169ec..3930929267db1f2d706763a01a44a7f7dd7074e9 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,9 @@ Core and builtins
 Extensions Modules
 ------------------
 
+- Issue #2670:  Fix a failure in urllib2.build_opener(), when passed two
+  handlers that derive the same default base class.
+
 - Added kill, terminate and send_signal(sig) to subprocess.Popen.
 
 - Added phase(z) -> phi, polar(z) -> r, phi and rect(r, phi) -> z to the cmath