summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_descr.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-06-07 23:15:56 (GMT)
committerGuido van Rossum <guido@python.org>2007-06-07 23:15:56 (GMT)
commit1325790b932c4bab4f8f94f5a36c09f4036ed9f8 (patch)
tree5f4c1d854783a4d082c5867094ec345f4772bf35 /Lib/test/test_descr.py
parent7b955bd125951db694f19a1b8648b806b14bd61f (diff)
downloadcpython-1325790b932c4bab4f8f94f5a36c09f4036ed9f8.zip
cpython-1325790b932c4bab4f8f94f5a36c09f4036ed9f8.tar.gz
cpython-1325790b932c4bab4f8f94f5a36c09f4036ed9f8.tar.bz2
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/test/test_descr.py')
-rw-r--r--Lib/test/test_descr.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index e8d94f4..f20f676 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4103,7 +4103,8 @@ def notimplemented():
N1 = sys.maxint + 1 # might trigger OverflowErrors instead of TypeErrors
N2 = sys.maxint # if sizeof(int) < sizeof(long), might trigger
# ValueErrors instead of TypeErrors
- for metaclass in [type, types.ClassType]:
+ if 1:
+ metaclass = type
for name, expr, iexpr in [
('__add__', 'x + y', 'x += y'),
('__sub__', 'x - y', 'x -= y'),