Author: christian.heimes
Date: Thu Nov 29 17:21:13 2007
New Revision: 59217
Modified:
python/branches/py3k/Doc/library/types.rst
python/branches/py3k/Lib/_abcoll.py
python/branches/py3k/Lib/types.py
Log:
Removed more types from the types module
Modified: python/branches/py3k/Doc/library/types.rst
==============================================================================
--- python/branches/py3k/Doc/library/types.rst (original)
+++ python/branches/py3k/Doc/library/types.rst Thu Nov 29 17:21:13 2007
@@ -85,11 +85,6 @@
traceback object.
-.. data:: DictProxyType
-
- The type of dict proxies, such as ``type.__dict__``.
-
-
.. data:: GetSetDescriptorType
The type of objects defined in extension modules with ``PyGetSetDef``, such
as
Modified: python/branches/py3k/Lib/_abcoll.py
==============================================================================
--- python/branches/py3k/Lib/_abcoll.py (original)
+++ python/branches/py3k/Lib/_abcoll.py Thu Nov 29 17:21:13 2007
@@ -18,7 +18,7 @@
"Sequence", "MutableSequence",
"ByteString",
"bytearray_iterator", "bytes_iterator", "dict_itemiterator",
- "dict_items", "dict_keyiterator", "dict_keys",
+ "dict_items", "dict_keyiterator", "dict_keys", "dict_proxy",
"dict_valueiterator", "dict_values", "list_iterator",
"list_reverseiterator", "range_iterator", "set_iterator",
"str_iterator", "tuple_iterator", "zip_iterator",
@@ -44,6 +44,8 @@
dict_keys = type({}.keys())
dict_values = type({}.values())
dict_items = type({}.items())
+## misc ##
+dict_proxy = type(type.__dict__)
### ONE-TRICK PONIES ###
Modified: python/branches/py3k/Lib/types.py
==============================================================================
--- python/branches/py3k/Lib/types.py (original)
+++ python/branches/py3k/Lib/types.py Thu Nov 29 17:21:13 2007
@@ -20,7 +20,6 @@
class _C:
def _m(self): pass
-ClassType = type
MethodType = type(_C()._m)
BuiltinFunctionType = type(len)
@@ -36,8 +35,6 @@
FrameType = type(tb.tb_frame)
tb = None; del tb
-DictProxyType = type(type.__dict__)
-
# Extension types defined in a C helper module. XXX There may be no
# equivalent in implementations other than CPython, so it seems better to
# leave them undefined then to set them to e.g. None.
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
