simplify check, since now there are only new-style classes
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 5995cbe..65a3aeb 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -511,9 +511,6 @@
If any of the handlers passed as arguments are subclasses of the
default handlers, the default handlers will not be used.
"""
- def isclass(obj):
- return isinstance(obj, type) or hasattr(obj, "__bases__")
-
opener = OpenerDirector()
default_classes = [ProxyHandler, UnknownHandler, HTTPHandler,
HTTPDefaultErrorHandler, HTTPRedirectHandler,
@@ -524,7 +521,7 @@
skip = set()
for klass in default_classes:
for check in handlers:
- if isclass(check):
+ if instance(check, type):
if issubclass(check, klass):
skip.add(klass)
elif isinstance(check, klass):
@@ -536,7 +533,7 @@
opener.add_handler(klass())
for h in handlers:
- if isclass(h):
+ if isinstance(h, type):
h = h()
opener.add_handler(h)
return opener