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/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 @@
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'),
diff --git a/Lib/test/test_isinstance.py b/Lib/test/test_isinstance.py
index 57aea0d..c10fd32 100644
--- a/Lib/test/test_isinstance.py
+++ b/Lib/test/test_isinstance.py
@@ -15,7 +15,7 @@
# (leading to an "undetected error" in the debug build). Set up is,
# isinstance(inst, cls) where:
#
- # - cls isn't a ClassType, a TypeType, or a TupleType
+ # - cls isn't a a type, or a tuple
# - cls has a __bases__ attribute
# - inst has a __class__ attribute
# - inst.__class__ as no __bases__ attribute
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index c8e77e8..953acad 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -25,7 +25,7 @@
"""
import select
-import os, sys, struct, types, pickle, cStringIO
+import os, sys, struct, pickle, cStringIO
import socket, tempfile, threading, time
import logging, logging.handlers, logging.config
from test.test_support import run_with_locale
diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py
index 751f7a2..b196ec9 100644
--- a/Lib/test/test_optparse.py
+++ b/Lib/test/test_optparse.py
@@ -12,7 +12,6 @@
import os
import re
import copy
-import types
import unittest
from StringIO import StringIO
@@ -171,7 +170,7 @@
except InterceptedError as err:
self.assert_(
- type(output) is types.StringType,
+ isinstance(output, str),
"expected output to be an ordinary string, not %r"
% type(output))
@@ -432,18 +431,12 @@
self.parser.add_option("-s", type="str")
self.assertEquals(self.parser.get_option("-s").type, "string")
- def test_new_type_object(self):
+ def test_type_object(self):
self.parser.add_option("-s", type=str)
self.assertEquals(self.parser.get_option("-s").type, "string")
self.parser.add_option("-x", type=int)
self.assertEquals(self.parser.get_option("-x").type, "int")
- def test_old_type_object(self):
- self.parser.add_option("-s", type=types.StringType)
- self.assertEquals(self.parser.get_option("-s").type, "string")
- self.parser.add_option("-x", type=types.IntType)
- self.assertEquals(self.parser.get_option("-x").type, "int")
-
# Custom type for testing processing of default values.
_time_units = { 's' : 1, 'm' : 60, 'h' : 60*60, 'd' : 60*60*24 }
@@ -1470,7 +1463,7 @@
os.environ['COLUMNS'] = orig_columns
def assertHelpEquals(self, expected_output):
- if type(expected_output) is types.UnicodeType:
+ if isinstance(expected_output, unicode):
encoding = self.parser._get_encoding(sys.stdout)
expected_output = expected_output.encode(encoding, "replace")
diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index 749c568..899e344 100644
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -4,7 +4,7 @@
'''
from test.test_support import run_unittest
import unittest, sys
-from types import ClassType, FunctionType, MethodType, BuiltinFunctionType
+from types import FunctionType, MethodType, BuiltinFunctionType
import pyclbr
from unittest import TestCase
@@ -95,7 +95,7 @@
continue # skip functions that came from somewhere else
self.assertEquals(py_item.__module__, value.module)
else:
- self.failUnless(isinstance(py_item, (ClassType, type)))
+ self.failUnless(isinstance(py_item, type))
if py_item.__module__ != moduleName:
continue # skip classes that came from somewhere else
@@ -133,14 +133,14 @@
# Now check for missing stuff.
def defined_in(item, module):
- if isinstance(item, ClassType):
+ if isinstance(item, type):
return item.__module__ == module.__name__
if isinstance(item, FunctionType):
return item.__globals__ is module.__dict__
return False
for name in dir(module):
item = getattr(module, name)
- if isinstance(item, (ClassType, FunctionType)):
+ if isinstance(item, (type, FunctionType)):
if defined_in(item, module):
self.assertHaskey(dict, name, ignore)