diff options
author | 2007-06-07 23:15:56 +0000 | |
---|---|---|
committer | 2007-06-07 23:15:56 +0000 | |
commit | 1325790b932c4bab4f8f94f5a36c09f4036ed9f8 (patch) | |
tree | 5f4c1d854783a4d082c5867094ec345f4772bf35 /Lib/types.py | |
parent | Fix pdb help command. (diff) | |
download | cpython-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/types.py')
-rw-r--r-- | Lib/types.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/types.py b/Lib/types.py index 1c396fa2c1d..4c49ba39397 100644 --- a/Lib/types.py +++ b/Lib/types.py @@ -39,7 +39,7 @@ GeneratorType = type(_g()) class _C: def _m(self): pass -ClassType = type(_C) +ClassType = type UnboundMethodType = type(_C._m) # Same as MethodType MethodType = type(_C()._m) |