diff options
| author | Guido van Rossum <guido@python.org> | 2007-06-07 23:15:56 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-06-07 23:15:56 (GMT) |
| commit | 1325790b932c4bab4f8f94f5a36c09f4036ed9f8 (patch) | |
| tree | 5f4c1d854783a4d082c5867094ec345f4772bf35 /Lib/urllib2.py | |
| parent | 7b955bd125951db694f19a1b8648b806b14bd61f (diff) | |
| download | cpython-1325790b932c4bab4f8f94f5a36c09f4036ed9f8.zip cpython-1325790b932c4bab4f8f94f5a36c09f4036ed9f8.tar.gz cpython-1325790b932c4bab4f8f94f5a36c09f4036ed9f8.tar.bz2 | |
Merged revisions 55795-55816 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
........
r55797 | neal.norwitz | 2007-06-07 00:00:57 -0700 (Thu, 07 Jun 2007) | 3 lines
Get rid of some remnants of classic classes. types.ClassType == type.
Also get rid of almost all uses of the types module and use the builtin name.
........
r55798 | neal.norwitz | 2007-06-07 00:12:36 -0700 (Thu, 07 Jun 2007) | 1 line
Remove a use of types, verify commit hook works
........
r55809 | guido.van.rossum | 2007-06-07 11:11:29 -0700 (Thu, 07 Jun 2007) | 2 lines
Fix syntax error introduced by Neal in last checkin.
........
Diffstat (limited to 'Lib/urllib2.py')
| -rw-r--r-- | Lib/urllib2.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py index 8d44a0d..4321c36 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -428,9 +428,8 @@ def build_opener(*handlers): If any of the handlers passed as arguments are subclasses of the default handlers, the default handlers will not be used. """ - import types def isclass(obj): - return isinstance(obj, types.ClassType) or hasattr(obj, "__bases__") + return isinstance(obj, type) or hasattr(obj, "__bases__") opener = OpenerDirector() default_classes = [ProxyHandler, UnknownHandler, HTTPHandler, |