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

derive the same default base class.

Will backport.
This commit is contained in:
Amaury Forgeot d'Arc 2008-04-22 21:14:41 +00:00
parent d59fefb23a
commit 9686585a82
3 changed files with 12 additions and 3 deletions

View File

@ -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:

View File

@ -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)

View File

@ -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