aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-06-07 23:15:56 +0000
committerGuido van Rossum <guido@python.org>2007-06-07 23:15:56 +0000
commit1325790b932c4bab4f8f94f5a36c09f4036ed9f8 (patch)
tree5f4c1d854783a4d082c5867094ec345f4772bf35 /Lib/dis.py
parentFix pdb help command. (diff)
downloadcpython-1325790b932c4bab4f8f94f5a36c09f4036ed9f8.tar.gz
cpython-1325790b932c4bab4f8f94f5a36c09f4036ed9f8.tar.bz2
cpython-1325790b932c4bab4f8f94f5a36c09f4036ed9f8.zip
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/dis.py')
-rw-r--r--Lib/dis.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/dis.py b/Lib/dis.py
index dac7cae2c81..1ef4b338814 100644
--- a/Lib/dis.py
+++ b/Lib/dis.py
@@ -26,7 +26,7 @@ def dis(x=None):
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)