[Python-checkins] r62464 - in python/branches/release25-maint: Lib/test/test_urllib2.py Lib/urllib2.py Misc/NEWS

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Tue Apr 22 23:17:18 2008
New Revision: 62464

Log:
Issue #2670: urllib2.build_opener() failed when two handlers
derive the same default base class.

Backport of r62463.


Modified:
   python/branches/release25-maint/Lib/test/test_urllib2.py
   python/branches/release25-maint/Lib/urllib2.py
   python/branches/release25-maint/Misc/NEWS

Modified: python/branches/release25-maint/Lib/test/test_urllib2.py
==============================================================================
--- python/branches/release25-maint/Lib/test/test_urllib2.py	(original)
+++ python/branches/release25-maint/Lib/test/test_urllib2.py	Tue Apr 22 23:17:18 2008
@@ -1038,6 +1038,12 @@
         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:

Modified: python/branches/release25-maint/Lib/urllib2.py
==============================================================================
--- python/branches/release25-maint/Lib/urllib2.py	(original)
+++ python/branches/release25-maint/Lib/urllib2.py	Tue Apr 22 23:17:18 2008
@@ -447,14 +447,14 @@
                        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)
 

Modified: python/branches/release25-maint/Misc/NEWS
==============================================================================
--- python/branches/release25-maint/Misc/NEWS	(original)
+++ python/branches/release25-maint/Misc/NEWS	Tue Apr 22 23:17:18 2008
@@ -45,6 +45,9 @@
 Library
 -------
 
+- Issue #2670:  Fix a failure in urllib2.build_opener(), when passed two
+  handlers that derive the same default base class.
+
 - Issue #2495: tokenize.untokenize now inserts a space between two consecutive
   string literals; previously, ["" ""] was rendered as [""""], which is
   incorrect python code.