Get rid of 'file' built-in. Get rid of types.StringType and friends.

This commit is contained in:
Guido van Rossum 2007-05-08 17:20:32 +00:00
parent 317e774965
commit 74302dbd3c
3 changed files with 0 additions and 15 deletions

View file

@ -414,9 +414,7 @@ class open:
def __new__(cls, *args, **kwds):
return io.open(*args, **kwds)
__builtin__.classic_open = __builtin__.open
__builtin__.classic_file = __builtin__.file
__builtin__.open = open
__builtin__.file = open
sys.stdin = io.open(0, "r")
sys.stdout = io.open(1, "w")
sys.stderr = io.open(2, "w")

View file

@ -22,17 +22,6 @@
except NameError:
pass
StringType = str
# StringTypes is already outdated. Instead of writing "type(x) in
# types.StringTypes", you should use "isinstance(x, basestring)". But
# we keep around for compatibility with Python 2.2.
try:
UnicodeType = str
StringTypes = (StringType, UnicodeType)
except NameError:
StringTypes = (StringType,)
BufferType = buffer
TupleType = tuple
@ -62,7 +51,6 @@ def _m(self): pass
BuiltinMethodType = type([].append) # Same as BuiltinFunctionType
ModuleType = type(sys)
FileType = file
try:
raise TypeError

View file

@ -2040,7 +2040,6 @@ _PyBuiltin_Init(void)
#endif
SETBUILTIN("dict", &PyDict_Type);
SETBUILTIN("enumerate", &PyEnum_Type);
SETBUILTIN("file", &PyFile_Type);
SETBUILTIN("float", &PyFloat_Type);
SETBUILTIN("frozenset", &PyFrozenSet_Type);
SETBUILTIN("property", &PyProperty_Type);