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.
........
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
index e041211..6471e81 100644
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -287,7 +287,7 @@
def _proxify(self, obj):
if isinstance(obj, RemoteProxy):
return RPCProxy(self, obj.oid)
- if isinstance(obj, types.ListType):
+ if isinstance(obj, list):
return map(self._proxify, obj)
# XXX Check for other types -- not currently needed
return obj
@@ -574,7 +574,7 @@
attr = getattr(obj, name)
if hasattr(attr, '__call__'):
methods[name] = 1
- if type(obj) == types.ClassType:
+ if isinstance(obj, type):
for super in obj.__bases__:
_getmethods(super, methods)