diff options
| author | Tim Peters <tim.peters@gmail.com> | 2001-08-02 04:15:00 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2001-08-02 04:15:00 (GMT) |
| commit | 6d6c1a35e08b95a83dbe47dbd9e6474daff00354 (patch) | |
| tree | 542089077b9c2650dcf5c52d6bfcef1baf12d176 /Lib/types.py | |
| parent | 52d55a392600011d3edfe85c694744ec550ad1fe (diff) | |
| download | cpython-6d6c1a35e08b95a83dbe47dbd9e6474daff00354.zip cpython-6d6c1a35e08b95a83dbe47dbd9e6474daff00354.tar.gz cpython-6d6c1a35e08b95a83dbe47dbd9e6474daff00354.tar.bz2 | |
Merge of descr-branch back into trunk.
Diffstat (limited to 'Lib/types.py')
| -rw-r--r-- | Lib/types.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Lib/types.py b/Lib/types.py index 95600a3..d60ee56d 100644 --- a/Lib/types.py +++ b/Lib/types.py @@ -7,7 +7,8 @@ from __future__ import generators import sys NoneType = type(None) -TypeType = type(NoneType) +TypeType = type +ObjectType = object IntType = type(0) LongType = type(0L) @@ -22,8 +23,8 @@ UnicodeType = type(u'') BufferType = type(buffer('')) TupleType = type(()) -ListType = type([]) -DictType = DictionaryType = type({}) +ListType = list +DictType = DictionaryType = dictionary def _f(): pass FunctionType = type(_f) @@ -71,4 +72,9 @@ except TypeError: SliceType = type(slice(0)) EllipsisType = type(Ellipsis) +DictIterType = type(iter({})) +SequenceIterType = type(iter([])) +FunctionIterType = type(iter(lambda: 0, 0)) +DictProxyType = type(TypeType.__dict__) + del sys, _f, _C, _x # Not for export |