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/dis.py b/Lib/dis.py
index dac7cae..1ef4b33 100644
--- a/Lib/dis.py
+++ b/Lib/dis.py
@@ -26,7 +26,7 @@
         items = sorted(x.__dict__.items())
         for name, x1 in items:
             if isinstance(x1, (types.MethodType, types.FunctionType,
-                               types.CodeType, types.ClassType, type)):
+                               types.CodeType, type)):
                 print("Disassembly of %s:" % name)
                 try:
                     dis(x1)