[Python-checkins] r62231 - in python/trunk: Doc/library/types.rst Lib/types.py Makefile.pre.in Modules/_typesmodule.c Modules/config.c.in PC/VC6/pythoncore.dsp PC/VS7.1/pythoncore.vcproj PC/VS8.0/pythoncore.vcproj PC/config.c PCbuild/pythoncore.vcproj

Wed Apr 9 00:07:05 CEST 2008

Author: amaury.forgeotdarc
Date: Wed Apr 9 00:07:05 2008
New Revision: 62231
Removed:
 python/trunk/Modules/_typesmodule.c
Modified:
 python/trunk/Doc/library/types.rst
 python/trunk/Lib/types.py
 python/trunk/Makefile.pre.in
 python/trunk/Modules/config.c.in
 python/trunk/PC/VC6/pythoncore.dsp
 python/trunk/PC/VS7.1/pythoncore.vcproj
 python/trunk/PC/VS8.0/pythoncore.vcproj
 python/trunk/PC/config.c
 python/trunk/PCbuild/pythoncore.vcproj
Log:
Issue 2408: remove the _types module
It was only used as a helper in types.py to access types (GetSetDescriptorType and MemberDescriptorType),
when they can easily be obtained with python code.
These expressions even work with Jython.
I don't know what the future of the types module is; (cf. discussion in http://bugs.python.org/issue1605 )
at least this change makes it simpler.
Modified: python/trunk/Doc/library/types.rst
==============================================================================

--- python/trunk/Doc/library/types.rst	(original)
+++ python/trunk/Doc/library/types.rst	Wed Apr 9 00:07:05 2008
@@ -233,20 +233,22 @@
 
 .. data:: GetSetDescriptorType
 
- The type of objects defined in extension modules with ``PyGetSetDef``, such as
- ``FrameType.f_locals`` or ``array.array.typecode``. This constant is not
- defined in implementations of Python that do not have such extension types, so
- for portable code use ``hasattr(types, 'GetSetDescriptorType')``.
+ The type of objects defined in extension modules with ``PyGetSetDef``, such
+ as ``FrameType.f_locals`` or ``array.array.typecode``. This type is used as
+ descriptor for object attributes; it has the same purpose as the
+ :class:`property` type, but for classes defined in extension modules.
 
 .. versionadded:: 2.5
 
 
 .. data:: MemberDescriptorType
 
- The type of objects defined in extension modules with ``PyMemberDef``, such as
- ``datetime.timedelta.days``. This constant is not defined in implementations of
- Python that do not have such extension types, so for portable code use
- ``hasattr(types, 'MemberDescriptorType')``.
+ The type of objects defined in extension modules with ``PyMemberDef``, such
+ as ``datetime.timedelta.days``. This type is used as descriptor for simple C
+ data members which use standard conversion functions; it has the same purpose
+ as the :class:`property` type, but for classes defined in extension modules.
+ In other implementations of Python, this type may be identical to
+ ``GetSetDescriptorType``.
 
 .. versionadded:: 2.5
 
Modified: python/trunk/Lib/types.py
==============================================================================
--- python/trunk/Lib/types.py	(original)
+++ python/trunk/Lib/types.py	Wed Apr 9 00:07:05 2008
@@ -86,16 +86,8 @@
 DictProxyType = type(TypeType.__dict__)
 NotImplementedType = type(NotImplemented)
 
-# 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.
-try:
- import _types
-except ImportError:
- pass
-else:
- GetSetDescriptorType = type(_types.Helper.getter)
- MemberDescriptorType = type(_types.Helper.member)
- del _types
+# For Jython, the following two types are identical
+GetSetDescriptorType = type(FunctionType.func_code)
+MemberDescriptorType = type(FunctionType.func_globals)
 
 del sys, _f, _g, _C, _x # Not for export
Modified: python/trunk/Makefile.pre.in
==============================================================================
--- python/trunk/Makefile.pre.in	(original)
+++ python/trunk/Makefile.pre.in	Wed Apr 9 00:07:05 2008
@@ -333,7 +333,6 @@
 ##########################################################################
 # objects that get linked into the Python library
 LIBRARY_OBJS=	\
-		Modules/_typesmodule.o \
 		Modules/getbuildinfo.o \
 		$(PARSER_OBJS) \
 		$(OBJECT_OBJS) \
@@ -371,7 +370,6 @@
 $(LIBRARY): $(LIBRARY_OBJS)
 	-rm -f $@
 	$(AR) cr $@ Modules/getbuildinfo.o
-	$(AR) cr $@ Modules/_typesmodule.o
 	$(AR) cr $@ $(PARSER_OBJS)
 	$(AR) cr $@ $(OBJECT_OBJS)
 	$(AR) cr $@ $(PYTHON_OBJS)
Deleted: /python/trunk/Modules/_typesmodule.c
==============================================================================
--- /python/trunk/Modules/_typesmodule.c	Wed Apr 9 00:07:05 2008
+++ (empty file)
@@ -1,93 +0,0 @@
-/* This extension module exposes some types that are only available at the
- * C level. It should not be used directly, but instead through the Python
- * level types modules, which imports this.
- */
-
-#include "Python.h"
-#include "structmember.h"
-
-typedef struct
-{
- PyObject_HEAD
- int member;
-} Helper;
-
-static PyMemberDef helper_members[] = {
- { "member", T_INT, offsetof(Helper, member), READONLY,
- PyDoc_STR("A member descriptor")
- },
- { NULL }
-};
-
-static PyObject *
-helper_getter(Helper *self, void *unused) 
-{
- Py_RETURN_NONE;
-}
-
-static PyGetSetDef helper_getset[] = {
- { "getter", (getter)helper_getter, NULL,
- PyDoc_STR("A getset descriptor"),
- },
- { NULL }
-};
-
-static PyTypeObject HelperType = {
- PyVarObject_HEAD_INIT(NULL, 0)
- "_types.Helper",				/* tp_name */
- sizeof(Helper), /* tp_basicsize */
- 0,						/* tp_itemsize */
- 0,						/* tp_dealloc */
- 0,						/* tp_print */
- 0,						/* tp_getattr */
- 0,						/* tp_setattr */
- 0,						/* tp_compare */
- 0, /* tp_repr */
- 0, /* tp_as_number */
- 0,						/* tp_as_sequence */
- 0,						/* tp_as_mapping */
- 0, /* tp_hash */
- 0, 				/* tp_call */
- 0, 				/* tp_str */
- 0, /* tp_getattro */
- 0,						/* tp_setattro */
- 0,						/* tp_as_buffer */
- Py_TPFLAGS_DEFAULT, /* tp_flags */
- 0, 					/* tp_doc */
- 0,						/* tp_traverse */
- 0,						/* tp_clear */
- 0, /* tp_richcompare */
- 0,						/* tp_weaklistoffset */
- 0,						/* tp_iter */
- 0,						/* tp_iternext */
- 0, 					/* tp_methods */
- helper_members, /* tp_members */
- helper_getset, /* tp_getset */
- 0,						/* tp_base */
- 0,						/* tp_dict */
- 0,						/* tp_descr_get */
- 0,						/* tp_descr_set */
- 0,						/* tp_dictoffset */
- 0,						/* tp_init */
- 0,						/* tp_alloc */
- 0, /* tp_new */
- 0,						/* tp_free */
-};
-
-PyMODINIT_FUNC
-init_types(void)
-{
- PyObject *m;
-
- m = Py_InitModule3("_types", NULL, "A types module helper");
- if (!m)
- return;
-
- if (PyType_Ready(&HelperType) < 0)
- return;
-
- Py_INCREF(&HelperType);
- PyModule_AddObject(m, "Helper", (PyObject *)&HelperType);
-}
-
- 
Modified: python/trunk/Modules/config.c.in
==============================================================================
--- python/trunk/Modules/config.c.in	(original)
+++ python/trunk/Modules/config.c.in	Wed Apr 9 00:07:05 2008
@@ -28,7 +28,6 @@
 extern void initimp(void);
 extern void initgc(void);
 extern void init_ast(void);
-extern void init_types(void);
 
 struct _inittab _PyImport_Inittab[] = {
 
@@ -43,9 +42,6 @@
 	/* This lives in Python/Python-ast.c */
 	{"_ast", init_ast},
 
-	/* This lives in Modules/_typesmodule.c */
-	{"_types", init_types},
-
 	/* These entries are here for sys.builtin_module_names */
 	{"__main__", NULL},
 	{"__builtin__", NULL},
Modified: python/trunk/PC/VC6/pythoncore.dsp
==============================================================================
--- python/trunk/PC/VC6/pythoncore.dsp	(original)
+++ python/trunk/PC/VC6/pythoncore.dsp	Wed Apr 9 00:07:05 2008
@@ -173,10 +173,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\_typesmodule.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\_weakref.c
 # End Source File
 # Begin Source File
Modified: python/trunk/PC/VS7.1/pythoncore.vcproj
==============================================================================
--- python/trunk/PC/VS7.1/pythoncore.vcproj	(original)
+++ python/trunk/PC/VS7.1/pythoncore.vcproj	Wed Apr 9 00:07:05 2008
@@ -398,9 +398,6 @@
 			RelativePath="..\..\Pc\_subprocess.c">
 		</File>
 		<File
-			RelativePath="..\..\Modules\_typesmodule.c">
-		</File>
-		<File
 			RelativePath="..\..\Modules\_weakref.c">
 		</File>
 		<File
Modified: python/trunk/PC/VS8.0/pythoncore.vcproj
==============================================================================
--- python/trunk/PC/VS8.0/pythoncore.vcproj	(original)
+++ python/trunk/PC/VS8.0/pythoncore.vcproj	Wed Apr 9 00:07:05 2008
@@ -1023,10 +1023,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Modules\_typesmodule.c"
-				>
-			</File>
-			<File
 				RelativePath="..\..\Modules\_weakref.c"
 				>
 			</File>
Modified: python/trunk/PC/config.c
==============================================================================
--- python/trunk/PC/config.c	(original)
+++ python/trunk/PC/config.c	Wed Apr 9 00:07:05 2008
@@ -66,7 +66,6 @@
 extern void init_subprocess(void);
 extern void init_lsprof(void);
 extern void init_ast(void);
-extern void init_types(void);
 
 /* tools/freeze/makeconfig.py marker for additional "extern" */
 /* -- ADDMODULE MARKER 1 -- */
@@ -161,8 +160,6 @@
 {"sys", NULL},
 	{"exceptions", NULL},
 
- {"_types", init_types},
-
 /* Sentinel */
 {0, 0}
 };
Modified: python/trunk/PCbuild/pythoncore.vcproj
==============================================================================
--- python/trunk/PCbuild/pythoncore.vcproj	(original)
+++ python/trunk/PCbuild/pythoncore.vcproj	Wed Apr 9 00:07:05 2008
@@ -1023,10 +1023,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_typesmodule.c"
-				>
-			</File>
-			<File
 				RelativePath="..\Modules\_weakref.c"
 				>
 			</File>
