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/plat-mac/gensuitemodule.py b/Lib/plat-mac/gensuitemodule.py
index 6d1ceae..10a996f 100644
--- a/Lib/plat-mac/gensuitemodule.py
+++ b/Lib/plat-mac/gensuitemodule.py
@@ -279,9 +279,9 @@
def simplify(item):
"""Recursively replace singleton tuples by their constituent item"""
- if type(item) is types.ListType:
+ if isinstance(item, list):
return map(simplify, item)
- elif type(item) == types.TupleType and len(item) == 2:
+ elif isinstance(item, tuple) and len(item) == 2:
return simplify(item[1])
else:
return item
@@ -352,7 +352,7 @@
def generic(what, f, *args):
if type(what) == types.FunctionType:
return what(f, *args)
- if type(what) == types.ListType:
+ if isinstance(what, list):
record = []
for thing in what:
item = generic(thing[:1], f, *thing[1:])