Patch supplied by Burton Radons for his own SF bug #487390: Modifying

type.__module__ behavior.

This adds the module name and a dot in front of the type name in every
type object initializer, except for built-in types (and those that
already had this).  Note that it touches lots of Mac modules -- I have
no way to test these but the changes look right.  Apologies if they're
not.  This also touches the weakref docs, which contains a sample type
object initializer.  It also touches the mmap test output, because the
mmap type's repr is included in that output.  It touches object.h to
put the correct description in a comment.

diff --git a/Doc/lib/libweakref.tex b/Doc/lib/libweakref.tex
index d56f1cbaadcf5b04bcbb84bdcd5874eb12876935..fda27d2a0c22b3834c42104881d041eb498f4f9f 100644 (file)
--- a/Doc/lib/libweakref.tex
+++ b/Doc/lib/libweakref.tex
@@ -234,7 +234,7 @@ The statically-declared type object for instances is defined this way:
 PyTypeObject PyInstance_Type = {
     PyObject_HEAD_INIT(&PyType_Type)
     0,
-    "instance",
+    "module.instance",
 
     /* Lots of stuff omitted for brevity... */
 

diff --git a/Include/object.h b/Include/object.h
index 52d6dbf6288d3e7230271f56e09cbf0935b8bd5a..347f9c4c02ba2c81232a94526f1d8bf581f32efc 100644 (file)
--- a/Include/object.h
+++ b/Include/object.h
@@ -219,7 +219,7 @@ typedef PyObject *(*allocfunc)(struct _typeobject *, int);
 
 typedef struct _typeobject {
        PyObject_VAR_HEAD
-       char *tp_name; /* For printing */
+       char *tp_name; /* For printing, in format "<module>.<name>" */
        int tp_basicsize, tp_itemsize; /* For allocation */
        
        /* Methods to implement standard operations */

diff --git a/Lib/test/output/test_mmap b/Lib/test/output/test_mmap
index f1a25a97259635c3808d0f3477c4123feafc97dc..4adf7027b78fb8f4a5c373700d6fcd12dc89e1ad 100644 (file)
--- a/Lib/test/output/test_mmap
+++ b/Lib/test/output/test_mmap
@@ -1,5 +1,5 @@
 test_mmap
-<type 'mmap'>
+<type 'mmap.mmap'>
   Position of foo: 1.0 pages
   Length of file: 2.0 pages
   Contents of byte 0: '\x00'

diff --git a/Mac/Lib/test/mkcwproj/mkcwtestmodule.c b/Mac/Lib/test/mkcwproj/mkcwtestmodule.c
index 3271df96b923d31f0582723b75ae12d7475a09d7..ad8099b37936b1998f39509f9ffde14799267a04 100644 (file)
--- a/Mac/Lib/test/mkcwproj/mkcwtestmodule.c
+++ b/Mac/Lib/test/mkcwproj/mkcwtestmodule.c
@@ -98,7 +98,7 @@ statichere PyTypeObject Xxo_Type = {
         * to be portable to Windows without using C++. */
        PyObject_HEAD_INIT(NULL)
        0,                      /*ob_size*/
-       "Xxo",                  /*tp_name*/
+       "Xxmodule.Xxo",         /*tp_name*/
        sizeof(XxoObject),      /*tp_basicsize*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c
index 15cec8bdf39436880e82f4f91dbed577b25abcdd..aa843c758a90608e0c394baca10ec81bec91d87f 100644 (file)
--- a/Mac/Modules/Nav.c
+++ b/Mac/Modules/Nav.c
@@ -387,7 +387,7 @@ static char Navrrtype__doc__[] =
 static PyTypeObject Navrrtype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "NavReplyRecord",                       /*tp_name*/
+       "Nav.NavReplyRecord",                   /*tp_name*/
        sizeof(navrrobject),            /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/ae/_AEmodule.c b/Mac/Modules/ae/_AEmodule.c
index 537388ed704bba84f9e08d9b4a411551525eafa0..426f4ebf70ad8a60dcbe7d7196dd6ed8fbd8755d 100644 (file)
--- a/Mac/Modules/ae/_AEmodule.c
+++ b/Mac/Modules/ae/_AEmodule.c
@@ -782,7 +782,7 @@ static PyObject *AEDesc_getattr(AEDescObject *self, char *name)
 PyTypeObject AEDesc_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "AEDesc", /*tp_name*/
+       "_AE.AEDesc", /*tp_name*/
        sizeof(AEDescObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/calldll.c b/Mac/Modules/calldll.c
index e8d4736ee039459695990de9598f72bbf19f541e..8d130ceb7ee38555e32ccf2fb861a621e18910f4 100644 (file)
--- a/Mac/Modules/calldll.c
+++ b/Mac/Modules/calldll.c
@@ -565,7 +565,7 @@ static char Cdrtype__doc__[] =
 static PyTypeObject Cdrtype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "routine",                      /*tp_name*/
+       "calldll.routine",              /*tp_name*/
        sizeof(cdrobject),              /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */
@@ -755,7 +755,7 @@ static char Cdctype__doc__[] =
 static PyTypeObject Cdctype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "callable",                     /*tp_name*/
+       "calldll.callable",             /*tp_name*/
        sizeof(cdcobject),              /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */
@@ -964,7 +964,7 @@ static char Cdftype__doc__[] =
 static PyTypeObject Cdftype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "fragment",                     /*tp_name*/
+       "calldll.fragment",             /*tp_name*/
        sizeof(cdfobject),              /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/carbonevt/_CarbonEvt.c b/Mac/Modules/carbonevt/_CarbonEvt.c
index aab735b08c15ee402afe8e00096bccba6d1bec3a..731a2fa04369039f09ace7363bc130f58a647225 100644 (file)
--- a/Mac/Modules/carbonevt/_CarbonEvt.c
+++ b/Mac/Modules/carbonevt/_CarbonEvt.c
@@ -356,7 +356,7 @@ static PyObject *EventRef_getattr(EventRefObject *self, char *name)
 PyTypeObject EventRef_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0, /*ob_size*/
-       "EventRef", /*tp_name*/
+       "CarbonEvents.EventRef", /*tp_name*/
        sizeof(EventRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -539,7 +539,7 @@ static PyObject *EventQueueRef_getattr(EventQueueRefObject *self, char *name)
 PyTypeObject EventQueueRef_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0, /*ob_size*/
-       "EventQueueRef", /*tp_name*/
+       "CarbonEvents.EventQueueRef", /*tp_name*/
        sizeof(EventQueueRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -631,7 +631,7 @@ static PyObject *EventLoopRef_getattr(EventLoopRefObject *self, char *name)
 PyTypeObject EventLoopRef_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0, /*ob_size*/
-       "EventLoopRef", /*tp_name*/
+       "CarbonEvents.EventLoopRef", /*tp_name*/
        sizeof(EventLoopRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -741,7 +741,7 @@ static PyObject *EventLoopTimerRef_getattr(EventLoopTimerRefObject *self, char *
 PyTypeObject EventLoopTimerRef_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0, /*ob_size*/
-       "EventLoopTimerRef", /*tp_name*/
+       "CarbonEvents.EventLoopTimerRef", /*tp_name*/
        sizeof(EventLoopTimerRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -875,7 +875,7 @@ static PyObject *EventHandlerRef_getattr(EventHandlerRefObject *self, char *name
 PyTypeObject EventHandlerRef_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0, /*ob_size*/
-       "EventHandlerRef", /*tp_name*/
+       "CarbonEvents.EventHandlerRef", /*tp_name*/
        sizeof(EventHandlerRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -970,7 +970,7 @@ static PyObject *EventHandlerCallRef_getattr(EventHandlerCallRefObject *self, ch
 PyTypeObject EventHandlerCallRef_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0, /*ob_size*/
-       "EventHandlerCallRef", /*tp_name*/
+       "CarbonEvents.EventHandlerCallRef", /*tp_name*/
        sizeof(EventHandlerCallRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -1085,7 +1085,7 @@ static PyObject *EventTargetRef_getattr(EventTargetRefObject *self, char *name)
 PyTypeObject EventTargetRef_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0, /*ob_size*/
-       "EventTargetRef", /*tp_name*/
+       "CarbonEvents.EventTargetRef", /*tp_name*/
        sizeof(EventTargetRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -1162,7 +1162,7 @@ static PyObject *EventHotKeyRef_getattr(EventHotKeyRefObject *self, char *name)
 PyTypeObject EventHotKeyRef_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0, /*ob_size*/
-       "EventHotKeyRef", /*tp_name*/
+       "CarbonEvents.EventHotKeyRef", /*tp_name*/
        sizeof(EventHotKeyRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/cf/_CFmodule.c b/Mac/Modules/cf/_CFmodule.c
index fbdabbb03c3b29a7e6f18ab47f8c89eab2af52c5..167fddab3c2e1e234a0202bcf57d0b6372b0d197 100644 (file)
--- a/Mac/Modules/cf/_CFmodule.c
+++ b/Mac/Modules/cf/_CFmodule.c
@@ -336,7 +336,7 @@ static int CFTypeRefObj_hash(CFTypeRefObject *self)
 PyTypeObject CFTypeRef_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "CFTypeRef", /*tp_name*/
+       "_CF.CFTypeRef", /*tp_name*/
        sizeof(CFTypeRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -488,7 +488,7 @@ static int CFArrayRefObj_hash(CFArrayRefObject *self)
 PyTypeObject CFArrayRef_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "CFArrayRef", /*tp_name*/
+       "_CF.CFArrayRef", /*tp_name*/
        sizeof(CFArrayRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -647,7 +647,7 @@ static int CFMutableArrayRefObj_hash(CFMutableArrayRefObject *self)
 PyTypeObject CFMutableArrayRef_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "CFMutableArrayRef", /*tp_name*/
+       "_CF.CFMutableArrayRef", /*tp_name*/
        sizeof(CFMutableArrayRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -781,7 +781,7 @@ static int CFDictionaryRefObj_hash(CFDictionaryRefObject *self)
 PyTypeObject CFDictionaryRef_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "CFDictionaryRef", /*tp_name*/
+       "_CF.CFDictionaryRef", /*tp_name*/
        sizeof(CFDictionaryRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -899,7 +899,7 @@ static int CFMutableDictionaryRefObj_hash(CFMutableDictionaryRefObject *self)
 PyTypeObject CFMutableDictionaryRef_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "CFMutableDictionaryRef", /*tp_name*/
+       "_CF.CFMutableDictionaryRef", /*tp_name*/
        sizeof(CFMutableDictionaryRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -1051,7 +1051,7 @@ static int CFDataRefObj_hash(CFDataRefObject *self)
 PyTypeObject CFDataRef_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "CFDataRef", /*tp_name*/
+       "_CF.CFDataRef", /*tp_name*/
        sizeof(CFDataRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -1257,7 +1257,7 @@ static int CFMutableDataRefObj_hash(CFMutableDataRefObject *self)
 PyTypeObject CFMutableDataRef_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "CFMutableDataRef", /*tp_name*/
+       "_CF.CFMutableDataRef", /*tp_name*/
        sizeof(CFMutableDataRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -1890,7 +1890,7 @@ static int CFStringRefObj_hash(CFStringRefObject *self)
 PyTypeObject CFStringRef_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "CFStringRef", /*tp_name*/
+       "_CF.CFStringRef", /*tp_name*/
        sizeof(CFStringRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -2197,7 +2197,7 @@ static int CFMutableStringRefObj_hash(CFMutableStringRefObject *self)
 PyTypeObject CFMutableStringRef_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "CFMutableStringRef", /*tp_name*/
+       "_CF.CFMutableStringRef", /*tp_name*/
        sizeof(CFMutableStringRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -2601,7 +2601,7 @@ static int CFURLRefObj_hash(CFURLRefObject *self)
 PyTypeObject CFURLRef_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "CFURLRef", /*tp_name*/
+       "_CF.CFURLRef", /*tp_name*/
        sizeof(CFURLRefObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/cm/_Cmmodule.c b/Mac/Modules/cm/_Cmmodule.c
index 3e66716362fd163a959426103450974002cf3528..3de6497d33339766ef562f43f47843331c419e97 100644 (file)
--- a/Mac/Modules/cm/_Cmmodule.c
+++ b/Mac/Modules/cm/_Cmmodule.c
@@ -289,7 +289,7 @@ static PyObject *CmpInstObj_getattr(ComponentInstanceObject *self, char *name)
 PyTypeObject ComponentInstance_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "ComponentInstance", /*tp_name*/
+       "_Cm.ComponentInstance", /*tp_name*/
        sizeof(ComponentInstanceObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -616,7 +616,7 @@ static PyObject *CmpObj_getattr(ComponentObject *self, char *name)
 PyTypeObject Component_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "Component", /*tp_name*/
+       "_Cm.Component", /*tp_name*/
        sizeof(ComponentObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/ctbmodule.c b/Mac/Modules/ctbmodule.c
index dea35b76b8cc92ba4d4a5d64e65ef1c100b1536f..129896e3e654f8dd09d553f9e72107d8ac827c71 100644 (file)
--- a/Mac/Modules/ctbmodule.c
+++ b/Mac/Modules/ctbmodule.c
@@ -473,7 +473,7 @@ ctbcm_setattr(self, name, v)
 statichere PyTypeObject ctbcmtype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                      /*ob_size*/
-       "CTBConnectionMgr",     /*tp_name*/
+       "ctb.CTBConnectionMgr", /*tp_name*/
        sizeof(ctbcmobject),    /*tp_basicsize*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/ctl/_Ctlmodule.c b/Mac/Modules/ctl/_Ctlmodule.c
index 16c4a324d190698d8fcfb0db69d62940639938cd..1b60da83972f5ace8e1a5fddb25d43515ff471c3 100644 (file)
--- a/Mac/Modules/ctl/_Ctlmodule.c
+++ b/Mac/Modules/ctl/_Ctlmodule.c
@@ -2313,7 +2313,7 @@ static long CtlObj_hash(ControlObject *self)
 PyTypeObject Control_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "Control", /*tp_name*/
+       "_Ctl.Control", /*tp_name*/
        sizeof(ControlObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/dlg/_Dlgmodule.c b/Mac/Modules/dlg/_Dlgmodule.c
index f4f2a2481bb0ef65a14fd73559da41507a768771..8a0dd4fb0c32326cd7a2cfb26ec20f69a907e673 100644 (file)
--- a/Mac/Modules/dlg/_Dlgmodule.c
+++ b/Mac/Modules/dlg/_Dlgmodule.c
@@ -1008,7 +1008,7 @@ static int DlgObj_hash(DialogObject *self)
 PyTypeObject Dialog_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "Dialog", /*tp_name*/
+       "_Dlg.Dialog", /*tp_name*/
        sizeof(DialogObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/drag/_Dragmodule.c b/Mac/Modules/drag/_Dragmodule.c
index 3da0adea2071fa41d4ada04f11fdffb3745ef01e..6e35e03aa5974679b342e2902ae2d7dfba328416 100644 (file)
--- a/Mac/Modules/drag/_Dragmodule.c
+++ b/Mac/Modules/drag/_Dragmodule.c
@@ -673,7 +673,7 @@ static PyObject *DragObj_getattr(DragObjObject *self, char *name)
 PyTypeObject DragObj_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "DragObj", /*tp_name*/
+       "_Drag.DragObj", /*tp_name*/
        sizeof(DragObjObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/hfsplusmodule.c b/Mac/Modules/hfsplusmodule.c
index 425bdb8f8c9704abf0313f0198506e31484ed72c..4135cd086eb448c347ead1cf620b1e2596944ba6 100644 (file)
--- a/Mac/Modules/hfsplusmodule.c
+++ b/Mac/Modules/hfsplusmodule.c
@@ -331,7 +331,7 @@ statichere PyTypeObject forkRefObject_Type = {
         * to be portable to Windows without using C++. */
        PyObject_HEAD_INIT(NULL)
        0,                      /*ob_size*/
-       "openfile",                     /*tp_name*/
+       "hfsplus.openfile",             /*tp_name*/
        sizeof(forkRefObject),  /*tp_basicsize*/
        0,                      /*tp_itemsize*/
        /* methods */
@@ -505,7 +505,7 @@ statichere PyTypeObject iteratorObject_Type = {
         * to be portable to Windows without using C++. */
        PyObject_HEAD_INIT(NULL)
        0,                      /*ob_size*/
-       "iterator",                     /*tp_name*/
+       "hfsplus.iterator",             /*tp_name*/
        sizeof(iteratorObject), /*tp_basicsize*/
        0,                      /*tp_itemsize*/
        /* methods */
@@ -1024,7 +1024,7 @@ statichere PyTypeObject fsRefObject_Type = {
         * to be portable to Windows without using C++. */
        PyObject_HEAD_INIT(NULL)
        0,                      /*ob_size*/
-       "fsref",                        /*tp_name*/
+       "hfsplus.fsref",                /*tp_name*/
        sizeof(fsRefObject),    /*tp_basicsize*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/htmlrender/HtmlRendermodule.c b/Mac/Modules/htmlrender/HtmlRendermodule.c
index afd5805776b4b46c8cdc7f4459055a8827813cad..8015ab80c4a3264b12b16e3c24c7c499a67aab47 100644 (file)
--- a/Mac/Modules/htmlrender/HtmlRendermodule.c
+++ b/Mac/Modules/htmlrender/HtmlRendermodule.c
@@ -588,7 +588,7 @@ static PyObject *HtmlObj_getattr(self, name)
 PyTypeObject HtmlObject_Type = {
        PyObject_HEAD_INIT(&PyType_Type)
        0, /*ob_size*/
-       "HtmlObject", /*tp_name*/
+       "HtmlRender.HtmlObject", /*tp_name*/
        sizeof(HtmlObjectObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/icgluemodule.c b/Mac/Modules/icgluemodule.c
index 88e34b560e8f98c67b2a63be85e741937b07e311..c0e56afe61cc89c5c926da8b1bf568c3d609f903 100644 (file)
--- a/Mac/Modules/icgluemodule.c
+++ b/Mac/Modules/icgluemodule.c
@@ -502,7 +502,7 @@ static char Icitype__doc__[] =
 static PyTypeObject Icitype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "ic_instance",                  /*tp_name*/
+       "icglue.ic_instance",           /*tp_name*/
        sizeof(iciobject),              /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/list/_Listmodule.c b/Mac/Modules/list/_Listmodule.c
index 71a86740ada4fc097e76e454c2338a45aee12a56..06e63de3ee0a59aa507cf0c9270a5df75348e13e 100644 (file)
--- a/Mac/Modules/list/_Listmodule.c
+++ b/Mac/Modules/list/_Listmodule.c
@@ -649,7 +649,7 @@ ListObj_setattr(ListObject *self, char *name, PyObject *value)
 PyTypeObject List_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "List", /*tp_name*/
+       "_List.List", /*tp_name*/
        sizeof(ListObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/macfsmodule.c b/Mac/Modules/macfsmodule.c
index 26d7d7f750d2898ce78b2fe168bde7ff7c1d36f1..9684def74ae546a3a62dc417f675590733ed6b51 100644 (file)
--- a/Mac/Modules/macfsmodule.c
+++ b/Mac/Modules/macfsmodule.c
@@ -233,7 +233,7 @@ mfsa_dealloc(mfsaobject *self)
 statichere PyTypeObject Mfsatype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "Alias",                        /*tp_name*/
+       "macfs.Alias",                  /*tp_name*/
        sizeof(mfsaobject),             /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */
@@ -332,7 +332,7 @@ mfsi_setattr(mfsiobject *self, char *name, PyObject *v)
 static PyTypeObject Mfsitype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "FInfo",                        /*tp_name*/
+       "macfs.FInfo",                  /*tp_name*/
        sizeof(mfsiobject),             /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */
@@ -735,7 +735,7 @@ mfss_compare(mfssobject *v, mfssobject *w)
 statichere PyTypeObject Mfsstype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "FSSpec",                       /*tp_name*/
+       "macfs.FSSpec",                 /*tp_name*/
        sizeof(mfssobject),             /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */
@@ -834,7 +834,7 @@ mfsr_dealloc(mfsrobject *self)
 statichere PyTypeObject Mfsrtype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "FSRef",                        /*tp_name*/
+       "macfs.FSRef",                  /*tp_name*/
        sizeof(mfsrobject),             /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/macmodule.c b/Mac/Modules/macmodule.c
index c71d8a9bb86aa996e3be1df1245af37ecd9620fd..7f80b19f4c8cf36d794c873d85d1920fe697ee25 100644 (file)
--- a/Mac/Modules/macmodule.c
+++ b/Mac/Modules/macmodule.c
@@ -486,7 +486,7 @@ static PyStructSequence_Field stat_result_fields[] = {
 };
 
 static PyStructSequence_Desc stat_result_desc = {
-       "stat_result",
+       "mac.stat_result",
        stat_result__doc__,
        stat_result_fields,
        10
@@ -504,7 +504,7 @@ static PyStructSequence_Field xstat_result_fields[] = {
 };
 
 static PyStructSequence_Desc xstat_result_desc = {
-       "xstat_result",
+       "mac.xstat_result",
        stat_result__doc__,
        xstat_result_fields,
        13

diff --git a/Mac/Modules/macosmodule.c b/Mac/Modules/macosmodule.c
index 6b8b87def3722ba87eba1d76999a4277d3a98979..d84040da0f1ef25e07b3318ac27e834a29071185 100644 (file)
--- a/Mac/Modules/macosmodule.c
+++ b/Mac/Modules/macosmodule.c
@@ -275,7 +275,7 @@ static char Rftype__doc__[] =
 static PyTypeObject Rftype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "ResourceFork",                 /*tp_name*/
+       "MacOS.ResourceFork",           /*tp_name*/
        sizeof(rfobject),               /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/macspeechmodule.c b/Mac/Modules/macspeechmodule.c
index b6c6c2c00d0260eed424c2c0225cfe0df77c1ef4..9b6a1f719962dbb1335a4a18e15cd1c4975a8872 100644 (file)
--- a/Mac/Modules/macspeechmodule.c
+++ b/Mac/Modules/macspeechmodule.c
@@ -258,7 +258,7 @@ sc_getattr(self, name)
 static PyTypeObject sctype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                      /*ob_size*/
-       "MacSpeechChannel",                     /*tp_name*/
+       "macspeech.MacSpeechChannel", /*tp_name*/
        sizeof(scobject),       /*tp_basicsize*/
        0,                      /*tp_itemsize*/
        /* methods */
@@ -375,7 +375,7 @@ mv_getattr(self, name)
 static PyTypeObject mvtype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                      /*ob_size*/
-       "MacVoice",                     /*tp_name*/
+       "macspeech.MacVoice",   /*tp_name*/
        sizeof(mvobject),       /*tp_basicsize*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/menu/_Menumodule.c b/Mac/Modules/menu/_Menumodule.c
index f4a2ca845ce9472a9feaf0fe08de06fe6c389c16..8e94feff22173ff46c87a367557b95815854892c 100644 (file)
--- a/Mac/Modules/menu/_Menumodule.c
+++ b/Mac/Modules/menu/_Menumodule.c
@@ -2156,7 +2156,7 @@ static PyObject *MenuObj_getattr(MenuObject *self, char *name)
 PyTypeObject Menu_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "Menu", /*tp_name*/
+       "_Menu.Menu", /*tp_name*/
        sizeof(MenuObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/mlte/_Mltemodule.c b/Mac/Modules/mlte/_Mltemodule.c
index 712599ee6dbc47f09da026e42a46c67c97b4a8b5..c0819d29e3a93bf723bf8e473777d961f60fb3df 100644 (file)
--- a/Mac/Modules/mlte/_Mltemodule.c
+++ b/Mac/Modules/mlte/_Mltemodule.c
@@ -1148,7 +1148,7 @@ static PyObject *TXNObj_getattr(TXNObjectObject *self, char *name)
 PyTypeObject TXNObject_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "TXNObject", /*tp_name*/
+       "_Mlte.TXNObject", /*tp_name*/
        sizeof(TXNObjectObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -1264,7 +1264,7 @@ static PyObject *TXNFontMenuObj_getattr(TXNFontMenuObjectObject *self, char *nam
 PyTypeObject TXNFontMenuObject_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "TXNFontMenuObject", /*tp_name*/
+       "_Mlte.TXNFontMenuObject", /*tp_name*/
        sizeof(TXNFontMenuObjectObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/qd/_Qdmodule.c b/Mac/Modules/qd/_Qdmodule.c
index a753b15de4d34d67e39f542a52bbda574ccbe7bc..7c176d8e6f9ae405cdd229fa24ccd15c22483aac 100644 (file)
--- a/Mac/Modules/qd/_Qdmodule.c
+++ b/Mac/Modules/qd/_Qdmodule.c
@@ -371,7 +371,7 @@ static PyObject *GrafObj_getattr(GrafPortObject *self, char *name)
 PyTypeObject GrafPort_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "GrafPort", /*tp_name*/
+       "_Qd.GrafPort", /*tp_name*/
        sizeof(GrafPortObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -502,7 +502,7 @@ static PyObject *BMObj_getattr(BitMapObject *self, char *name)
 PyTypeObject BitMap_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "BitMap", /*tp_name*/
+       "_Qd.BitMap", /*tp_name*/
        sizeof(BitMapObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -630,7 +630,7 @@ static PyObject *QDGA_getattr(QDGlobalsAccessObject *self, char *name)
 staticforward PyTypeObject QDGlobalsAccess_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "QDGlobalsAccess", /*tp_name*/
+       "_Qd.QDGlobalsAccess", /*tp_name*/
        sizeof(QDGlobalsAccessObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/qdoffs/_Qdoffsmodule.c b/Mac/Modules/qdoffs/_Qdoffsmodule.c
index 24c7fc9c329142731682393f6657250a7fe41281..5af63ef96b518401b649ab52194a24818674f39c 100644 (file)
--- a/Mac/Modules/qdoffs/_Qdoffsmodule.c
+++ b/Mac/Modules/qdoffs/_Qdoffsmodule.c
@@ -136,7 +136,7 @@ static PyObject *GWorldObj_getattr(GWorldObject *self, char *name)
 PyTypeObject GWorld_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "GWorld", /*tp_name*/
+       "_Qdoffs.GWorld", /*tp_name*/
        sizeof(GWorldObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/qt/_Qtmodule.c b/Mac/Modules/qt/_Qtmodule.c
index bd387ceb6f021d8fea1a1ecfc528d0bf1633abb5..962ee2ae1126e4992aad1eb87c4f14b68676b383 100644 (file)
--- a/Mac/Modules/qt/_Qtmodule.c
+++ b/Mac/Modules/qt/_Qtmodule.c
@@ -932,7 +932,7 @@ static PyObject *MovieCtlObj_getattr(MovieControllerObject *self, char *name)
 PyTypeObject MovieController_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "MovieController", /*tp_name*/
+       "_Qt.MovieController", /*tp_name*/
        sizeof(MovieControllerObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -1326,7 +1326,7 @@ static PyObject *TimeBaseObj_getattr(TimeBaseObject *self, char *name)
 PyTypeObject TimeBase_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "TimeBase", /*tp_name*/
+       "_Qt.TimeBase", /*tp_name*/
        sizeof(TimeBaseObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -1603,7 +1603,7 @@ static PyObject *UserDataObj_getattr(UserDataObject *self, char *name)
 PyTypeObject UserData_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "UserData", /*tp_name*/
+       "_Qt.UserData", /*tp_name*/
        sizeof(UserDataObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -2637,7 +2637,7 @@ static PyObject *MediaObj_getattr(MediaObject *self, char *name)
 PyTypeObject Media_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "Media", /*tp_name*/
+       "_Qt.Media", /*tp_name*/
        sizeof(MediaObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -3724,7 +3724,7 @@ static PyObject *TrackObj_getattr(TrackObject *self, char *name)
 PyTypeObject Track_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "Track", /*tp_name*/
+       "_Qt.Track", /*tp_name*/
        sizeof(TrackObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -5796,7 +5796,7 @@ static PyObject *MovieObj_getattr(MovieObject *self, char *name)
 PyTypeObject Movie_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "Movie", /*tp_name*/
+       "_Qt.Movie", /*tp_name*/
        sizeof(MovieObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/res/_Resmodule.c b/Mac/Modules/res/_Resmodule.c
index 3d596414ff97a68c9ce85677d2bb1c29e6a919a1..b29e8523a66ffed5a8027e86cd936394371a8f4b 100644 (file)
--- a/Mac/Modules/res/_Resmodule.c
+++ b/Mac/Modules/res/_Resmodule.c
@@ -548,7 +548,7 @@ ResObj_setattr(ResourceObject *self, char *name, PyObject *value)
 PyTypeObject Resource_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "Resource", /*tp_name*/
+       "_Res.Resource", /*tp_name*/
        sizeof(ResourceObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/snd/_Sndmodule.c b/Mac/Modules/snd/_Sndmodule.c
index 338943631a82994b86c62fdc4c4bc899de0ce879..381250787ce13fe79d9ddf329d9b7b8f9529ce09 100644 (file)
--- a/Mac/Modules/snd/_Sndmodule.c
+++ b/Mac/Modules/snd/_Sndmodule.c
@@ -314,7 +314,7 @@ static PyObject *SndCh_getattr(SndChannelObject *self, char *name)
 staticforward PyTypeObject SndChannel_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "SndChannel", /*tp_name*/
+       "_Snd.SndChannel", /*tp_name*/
        sizeof(SndChannelObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -442,7 +442,7 @@ static int SPBObj_setattr(SPBObject *self, char *name, PyObject *value)
 staticforward PyTypeObject SPB_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "SPB", /*tp_name*/
+       "_Snd.SPB", /*tp_name*/
        sizeof(SPBObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/te/_TEmodule.c b/Mac/Modules/te/_TEmodule.c
index 2b064840985fb18fc615a7e228f00e149f15260e..2f78e67c92a79fcaca87f266a74625c1a24d70cc 100644 (file)
--- a/Mac/Modules/te/_TEmodule.c
+++ b/Mac/Modules/te/_TEmodule.c
@@ -791,7 +791,7 @@ static PyObject *TEObj_getattr(TEObject *self, char *name)
 PyTypeObject TE_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "TE", /*tp_name*/
+       "_TE.TE", /*tp_name*/
        sizeof(TEObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/waste/wastemodule.c b/Mac/Modules/waste/wastemodule.c
index 921f297ad3a25dd06e7360ef832929947693d02e..734a2e7f32988ba30d56e7204671f2544d1941d4 100644 (file)
--- a/Mac/Modules/waste/wastemodule.c
+++ b/Mac/Modules/waste/wastemodule.c
@@ -346,7 +346,7 @@ static PyObject *WEOObj_getattr(WEOObject *self, char *name)
 PyTypeObject WEO_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "WEO", /*tp_name*/
+       "waste.WEO", /*tp_name*/
        sizeof(WEOObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */
@@ -1711,7 +1711,7 @@ static PyObject *wasteObj_getattr(wasteObject *self, char *name)
 PyTypeObject waste_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "waste", /*tp_name*/
+       "waste.waste", /*tp_name*/
        sizeof(wasteObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Mac/Modules/win/_Winmodule.c b/Mac/Modules/win/_Winmodule.c
index 8dc9fad641beaf4ad00c15f4df540e6741cbcb0f..fa0cfebad45b8c80274f95eb8600dc7b9573f322 100644 (file)
--- a/Mac/Modules/win/_Winmodule.c
+++ b/Mac/Modules/win/_Winmodule.c
@@ -2469,7 +2469,7 @@ static int WinObj_hash(WindowObject *self)
 PyTypeObject Window_Type = {
        PyObject_HEAD_INIT(NULL)
        0, /*ob_size*/
-       "Window", /*tp_name*/
+       "_Win.Window", /*tp_name*/
        sizeof(WindowObject), /*tp_basicsize*/
        0, /*tp_itemsize*/
        /* methods */

diff --git a/Misc/ACKS b/Misc/ACKS
index e110f15ee6dc02fd5706d2713f50acbe93c33a22..24d5d84eba71b486cd146dfa9834e0ceaa1d621b 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -340,6 +340,7 @@ Amrit Prem
 Paul Prescod
 Donovan Preston
 Brian Quinlan
+Burton Radons
 Eric Raymond
 John Redford
 Terry Reedy

diff --git a/Modules/_curses_panel.c b/Modules/_curses_panel.c
index feecfccde879a0f34331f16e1ffffe2c2121130b..11bf5c8ff4c00ad6d06bcadbca1fb98be358da3d 100644 (file)
--- a/Modules/_curses_panel.c
+++ b/Modules/_curses_panel.c
@@ -352,7 +352,7 @@ PyCursesPanel_GetAttr(PyCursesPanelObject *self, char *name)
 PyTypeObject PyCursesPanel_Type = {
     PyObject_HEAD_INIT(NULL)
     0,                 /*ob_size*/
-    "curses panel",    /*tp_name*/
+    "_curses_panel.curses panel",      /*tp_name*/
     sizeof(PyCursesPanelObject),       /*tp_basicsize*/
     0,                 /*tp_itemsize*/
     /* methods */

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index c22b500e8d5ce8178e1c356d16727a852f1f82ea..5a7a642691dcd758de507e69cbc6b730d8db998f 100644 (file)
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1511,7 +1511,7 @@ PyCursesWindow_GetAttr(PyCursesWindowObject *self, char *name)
 PyTypeObject PyCursesWindow_Type = {
        PyObject_HEAD_INIT(NULL)
        0,                      /*ob_size*/
-       "curses window",        /*tp_name*/
+       "_curses.curses window",        /*tp_name*/
        sizeof(PyCursesWindowObject),   /*tp_basicsize*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Modules/_sre.c b/Modules/_sre.c
index d01f087cde031e1698bcb31f8d87eb4671c65da5..b62b17f23f5b2c0faea08de5a1242adaa243318e 100644 (file)
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -2403,7 +2403,7 @@ pattern_getattr(PatternObject* self, char* name)
 
 statichere PyTypeObject Pattern_Type = {
     PyObject_HEAD_INIT(NULL)
-    0, "SRE_Pattern",
+    0, "_sre.SRE_Pattern",
     sizeof(PatternObject), sizeof(SRE_CODE),
     (destructor)pattern_dealloc, /*tp_dealloc*/
     0, /*tp_print*/
@@ -2866,7 +2866,7 @@ match_getattr(MatchObject* self, char* name)
 
 statichere PyTypeObject Match_Type = {
     PyObject_HEAD_INIT(NULL)
-    0, "SRE_Match",
+    0, "_sre.SRE_Match",
     sizeof(MatchObject), sizeof(int),
     (destructor)match_dealloc, /*tp_dealloc*/
     0, /*tp_print*/
@@ -2974,7 +2974,7 @@ scanner_getattr(ScannerObject* self, char* name)
 
 statichere PyTypeObject Scanner_Type = {
     PyObject_HEAD_INIT(NULL)
-    0, "SRE_Scanner",
+    0, "_sre.SRE_Scanner",
     sizeof(ScannerObject), 0,
     (destructor)scanner_dealloc, /*tp_dealloc*/
     0, /*tp_print*/

diff --git a/Modules/almodule.c b/Modules/almodule.c
index e9b2114695f27dd2912240a0c78cff3c26771fc6..31af258fb1e3a13a190ee3b4d62ee356b22f72e0 100644 (file)
--- a/Modules/almodule.c
+++ b/Modules/almodule.c
@@ -597,7 +597,7 @@ static char Alctype__doc__[] =
 static PyTypeObject Alctype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "config",                       /*tp_name*/
+       "al.config",                    /*tp_name*/
        sizeof(alcobject),              /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */
@@ -1321,7 +1321,7 @@ static char Alptype__doc__[] =
 static PyTypeObject Alptype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "port",                 /*tp_name*/
+       "al.port",                      /*tp_name*/
        sizeof(alpobject),              /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index 11d0723b97b352bb628c108599096aef7a9afacf..7c89ce045fb3255e33811a4b4cc4aa2928462016 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -1528,7 +1528,7 @@ itemsize -- the length in bytes of one array item\n\
 statichere PyTypeObject Arraytype = {
        PyObject_HEAD_INIT(NULL)
        0,
-       "array",
+       "array.array",
        sizeof(arrayobject),
        0,
        (destructor)array_dealloc,              /* tp_dealloc */

diff --git a/Modules/bsddbmodule.c b/Modules/bsddbmodule.c
index be50208b631166ee4969d2c6206689ea464b9b73..05d2bf1dedc4d1f76deebcf6e2ff14ad56f687f8 100644 (file)
--- a/Modules/bsddbmodule.c
+++ b/Modules/bsddbmodule.c
@@ -677,7 +677,7 @@ bsddb_getattr(PyObject *dp, char *name)
 static PyTypeObject Bsddbtype = {
        PyObject_HEAD_INIT(NULL)
        0,
-       "bsddb",
+       "bsddb.bsddb",
        sizeof(bsddbobject),
        0,
        (destructor)bsddb_dealloc, /*tp_dealloc*/

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 85fb7cc6ea6e57f3cee7fa718234d85288d558f1..425ff10bb0eae21acd9fedc8b01306351ab34dd5 100644 (file)
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -167,7 +167,7 @@ Pdata_dealloc(Pdata *self) {
 }
 
 static PyTypeObject PdataType = {
-    PyObject_HEAD_INIT(NULL) 0, "Pdata", sizeof(Pdata), 0,
+    PyObject_HEAD_INIT(NULL) 0, "cPickle.Pdata", sizeof(Pdata), 0,
     (destructor)Pdata_dealloc,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0L,0L,0L,0L, ""
 };
@@ -2479,7 +2479,7 @@ static char Picklertype__doc__[] =
 static PyTypeObject Picklertype = {
     PyObject_HEAD_INIT(NULL)
     0,                            /*ob_size*/
-    "Pickler",                    /*tp_name*/
+    "cPickle.Pickler",            /*tp_name*/
     sizeof(Picklerobject),              /*tp_basicsize*/
     0,
     (destructor)Pickler_dealloc,       /* tp_dealloc */
@@ -4478,7 +4478,7 @@ static char Unpicklertype__doc__[] =
 static PyTypeObject Unpicklertype = {
     PyObject_HEAD_INIT(NULL)
     0,                            /*ob_size*/
-    "Unpickler",                  /*tp_name*/
+    "cPickle.Unpickler",                  /*tp_name*/
     sizeof(Unpicklerobject),              /*tp_basicsize*/
     0,                            /*tp_itemsize*/
     /* methods */

diff --git a/Modules/cStringIO.c b/Modules/cStringIO.c
index 094804c16c688983a0613da166f2d3985e18b97a..f85d60ac2b045844de6095d1ee51341a453cb7b8 100644 (file)
--- a/Modules/cStringIO.c
+++ b/Modules/cStringIO.c
@@ -543,7 +543,7 @@ static char Otype__doc__[] =
 static PyTypeObject Otype = {
   PyObject_HEAD_INIT(NULL)
   0,                   /*ob_size*/
-  "StringO",                   /*tp_name*/
+  "cStringIO.StringO",                 /*tp_name*/
   sizeof(Oobject),             /*tp_basicsize*/
   0,                   /*tp_itemsize*/
   /* methods */
@@ -677,7 +677,7 @@ static char Itype__doc__[] =
 static PyTypeObject Itype = {
   PyObject_HEAD_INIT(NULL)
   0,                                   /*ob_size*/
-  "StringI",                           /*tp_name*/
+  "cStringIO.StringI",                 /*tp_name*/
   sizeof(Iobject),                     /*tp_basicsize*/
   0,                                   /*tp_itemsize*/
   /* methods */

diff --git a/Modules/cdmodule.c b/Modules/cdmodule.c
index ee58c5efbd38fb60dec317e7e04a424784493cb7..f0dd599c03702a5fe0bafadd79c6a12d1c98e671 100644 (file)
--- a/Modules/cdmodule.c
+++ b/Modules/cdmodule.c
@@ -395,7 +395,7 @@ cdplayer_getattr(cdplayerobject *self, char *name)
 PyTypeObject CdPlayertype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                      /*ob_size*/
-       "cdplayer",             /*tp_name*/
+       "cd.cdplayer",  /*tp_name*/
        sizeof(cdplayerobject), /*tp_size*/
        0,                      /*tp_itemsize*/
        /* methods */
@@ -692,7 +692,7 @@ cdparser_getattr(cdparserobject *self, char *name)
 PyTypeObject CdParsertype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                      /*ob_size*/
-       "cdparser",             /*tp_name*/
+       "cd.cdparser",          /*tp_name*/
        sizeof(cdparserobject), /*tp_size*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Modules/clmodule.c b/Modules/clmodule.c
index 2ff184cce615864b1a47cd472f6a9cd9105b9115..13011d2195d153b07068f858f34ad85f354a6940 100644 (file)
--- a/Modules/clmodule.c
+++ b/Modules/clmodule.c
@@ -658,7 +658,7 @@ cl_getattr(PyObject *self, char *name)
 static PyTypeObject Cltype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                      /*ob_size*/
-       "cl",                   /*tp_name*/
+       "cl.cl",                /*tp_name*/
        sizeof(clobject),       /*tp_size*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Modules/dbmmodule.c b/Modules/dbmmodule.c
index bd14df6b20ba0f375cd798fe420cc57b294958a5..233487d6122462669997fa8b7da97b98f270777e 100644 (file)
--- a/Modules/dbmmodule.c
+++ b/Modules/dbmmodule.c
@@ -287,7 +287,7 @@ dbm_getattr(dbmobject *dp, char *name)
 static PyTypeObject Dbmtype = {
        PyObject_HEAD_INIT(NULL)
        0,
-       "dbm",
+       "dbm.dbm",
        sizeof(dbmobject),
        0,
        (destructor)dbm_dealloc,  /*tp_dealloc*/

diff --git a/Modules/dlmodule.c b/Modules/dlmodule.c
index 8c771335961df5207be6b63c471a8518b01c72a2..18b97d8584e3231b2b39c5916a1a15267d82ff74 100644 (file)
--- a/Modules/dlmodule.c
+++ b/Modules/dlmodule.c
@@ -136,7 +136,7 @@ dl_getattr(dlobject *xp, char *name)
 static PyTypeObject Dltype = {
        PyObject_HEAD_INIT(NULL)
        0,                      /*ob_size*/
-       "dl",                   /*tp_name*/
+       "dl.dl",                /*tp_name*/
        sizeof(dlobject),       /*tp_basicsize*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Modules/flmodule.c b/Modules/flmodule.c
index 25037bf7f2b2b95c2b838583b4db6680bbba9d13..ee1f068244d1e4ba2e1baabb23bb08f25fce37e9 100644 (file)
--- a/Modules/flmodule.c
+++ b/Modules/flmodule.c
@@ -378,7 +378,7 @@ generic_repr(genericobject *g)
 static PyTypeObject GenericObjecttype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "FORMS_object",                 /*tp_name*/
+       "fl.FORMS_object",              /*tp_name*/
        sizeof(genericobject),          /*tp_size*/
        0,                              /*tp_itemsize*/
        /* methods */
@@ -1588,7 +1588,7 @@ form_repr(formobject *f)
 static PyTypeObject Formtype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "FORMS_form",                   /*tp_name*/
+       "fl.FORMS_form",                /*tp_name*/
        sizeof(formobject),             /*tp_size*/
        0,                              /*tp_itemsize*/
        /* methods */

diff --git a/Modules/fmmodule.c b/Modules/fmmodule.c
index 065aed60045984329279dfc644f87918616546a6..a2eb9c64b3e17a7262d994ebf397caaa14b3cfa7 100644 (file)
--- a/Modules/fmmodule.c
+++ b/Modules/fmmodule.c
@@ -154,7 +154,7 @@ fh_dealloc(fhobject *fhp)
 static PyTypeObject Fhtype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "font handle",                  /*tp_name*/
+       "fm.font handle",               /*tp_name*/
        sizeof(fhobject),               /*tp_size*/
        0,                              /*tp_itemsize*/
        /* methods */

diff --git a/Modules/gdbmmodule.c b/Modules/gdbmmodule.c
index 505ce929c1776c933f87067a50bd869d0b45d4de..72d76eaafa0cae23c76dca02f96d9339270d89f3 100644 (file)
--- a/Modules/gdbmmodule.c
+++ b/Modules/gdbmmodule.c
@@ -382,7 +382,7 @@ dbm_getattr(dbmobject *dp, char *name)
 static PyTypeObject Dbmtype = {
     PyObject_HEAD_INIT(0)
     0,
-    "gdbm",
+    "gdbm.gdbm",
     sizeof(dbmobject),
     0,
     (destructor)dbm_dealloc,            /*tp_dealloc*/

diff --git a/Modules/linuxaudiodev.c b/Modules/linuxaudiodev.c
index e0f144bb8578a974a99a20907935a1868cf3df5d..dd462efbf12370ae3f2e8b2e617deee005cf7f5f 100644 (file)
--- a/Modules/linuxaudiodev.c
+++ b/Modules/linuxaudiodev.c
@@ -455,7 +455,7 @@ lad_getattr(lad_t *xp, char *name)
 static PyTypeObject Ladtype = {
     PyObject_HEAD_INIT(&PyType_Type)
     0,                         /*ob_size*/
-    "linux_audio_device",      /*tp_name*/
+    "linuxaudiodev.linux_audio_device", /*tp_name*/
     sizeof(lad_t),             /*tp_size*/
     0,                         /*tp_itemsize*/
     /* methods */

diff --git a/Modules/md5module.c b/Modules/md5module.c
index beb743f765afeebbfd8549f2bbf63e81f8141885..3ddacf54d3a29ead97f6535873ec992d2072ba61 100644 (file)
--- a/Modules/md5module.c
+++ b/Modules/md5module.c
@@ -202,7 +202,7 @@ copy() -- return a copy of the current md5 object\n\
 statichere PyTypeObject MD5type = {
        PyObject_HEAD_INIT(NULL)
        0,                        /*ob_size*/
-       "md5",                    /*tp_name*/
+       "md5.md5",                /*tp_name*/
        sizeof(md5object),        /*tp_size*/
        0,                        /*tp_itemsize*/
        /* methods */

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index a4ec2d0fe553a4cfbf20af60ccbc715db58c691c..933e9722a3dba2bbfa09f92c21b537e0c52c8500 100644 (file)
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -772,7 +772,7 @@ static PyBufferProcs mmap_as_buffer = {
 static PyTypeObject mmap_object_type = {
        PyObject_HEAD_INIT(0) /* patched in module init */
        0,                                      /* ob_size */
-       "mmap",                                 /* tp_name */
+       "mmap.mmap",                            /* tp_name */
        sizeof(mmap_object),                    /* tp_size */
        0,                                      /* tp_itemsize */
        /* methods */

diff --git a/Modules/mpzmodule.c b/Modules/mpzmodule.c
index bcbd238cfa44b50f09e3d7d1e5fdc053fd45e988..04057f1fa5614b48e156eb9f480adf6b12ed411d 100644 (file)
--- a/Modules/mpzmodule.c
+++ b/Modules/mpzmodule.c
@@ -1591,7 +1591,7 @@ static PyNumberMethods mpz_as_number = {
 static PyTypeObject MPZtype = {
        PyObject_HEAD_INIT(NULL)
        0,                      /*ob_size*/
-       "mpz",                  /*tp_name*/
+       "mpz.mpz",              /*tp_name*/
        sizeof(mpzobject),      /*tp_size*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index 2b6dfa5b863afc5f3cdfc2ef4a5bd7f53c50d598..ca0531d6b0f6b53eddc69f12817b47811d706b31 100644 (file)
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -174,7 +174,7 @@ static
 PyTypeObject PyST_Type = {
     PyObject_HEAD_INIT(NULL)
     0,
-    "st",                               /* tp_name              */
+    "parser.st",                        /* tp_name              */
     (int) sizeof(PyST_Object),          /* tp_basicsize         */
     0,                                  /* tp_itemsize          */
     (destructor)parser_free,            /* tp_dealloc           */

diff --git a/Modules/pcremodule.c b/Modules/pcremodule.c
index 7a8900d889f9052defef7aba3cb931230f81affa..d08d4ea1dd37a365bf4126e9c2beaed4bd8a38e9 100644 (file)
--- a/Modules/pcremodule.c
+++ b/Modules/pcremodule.c
@@ -128,7 +128,7 @@ PyPcre_getattr(PcreObject *self, char *name)
 staticforward PyTypeObject Pcre_Type = {
        PyObject_HEAD_INIT(NULL)
        0,                      /*ob_size*/
-       "Pcre",                 /*tp_name*/
+       "pcre.Pcre",            /*tp_name*/
        sizeof(PcreObject),     /*tp_basicsize*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index ebda8bf909d412b954fe1cd39d56939016019529..08b0c4675d6a5f45c7bf79b5686f0d0f2073d474 100644 (file)
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -6002,9 +6002,11 @@ INITFUNC(void)
                posix_putenv_garbage = PyDict_New();
 #endif
 
+       stat_result_desc.name = MODNAME ".stat_result";
        PyStructSequence_InitType(&StatResultType, &stat_result_desc);
        PyDict_SetItemString(d, "stat_result", (PyObject*) &StatResultType);
 
+       statvfs_result_desc.name = MODNAME ".statvfs_result";
        PyStructSequence_InitType(&StatVFSResultType, &statvfs_result_desc);
        PyDict_SetItemString(d, "statvfs_result", (PyObject*) &StatResultType);
 }

diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 90e53b61a1fd2b77fec77a86985484a8486a6cbc..3ea022a778d648c4f3ad3f51588e132ee4184ccb 100644 (file)
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1380,7 +1380,7 @@ static char Xmlparsetype__doc__[] =
 static PyTypeObject Xmlparsetype = {
        PyObject_HEAD_INIT(NULL)
        0,                              /*ob_size*/
-       "xmlparser",                    /*tp_name*/
+       "pyexpat.xmlparser",            /*tp_name*/
        sizeof(xmlparseobject) + PyGC_HEAD_SIZE,/*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */

diff --git a/Modules/regexmodule.c b/Modules/regexmodule.c
index c0e465aadb72efc5a6f4eaeaab182094d92faf99..c3711e6839e519c232698fa47cf584dc5682c075 100644 (file)
--- a/Modules/regexmodule.c
+++ b/Modules/regexmodule.c
@@ -340,7 +340,7 @@ regobj_getattr(regexobject *re, char *name)
 static PyTypeObject Regextype = {
        PyObject_HEAD_INIT(NULL)
        0,                                   /*ob_size*/
-       "regex",                             /*tp_name*/
+       "regex.regex",                       /*tp_name*/
        sizeof(regexobject),                 /*tp_size*/
        0,                                   /*tp_itemsize*/
        /* methods */

diff --git a/Modules/rotormodule.c b/Modules/rotormodule.c
index cc2592422ac908ec2098cf4c747e53f2ad5a2de5..7c1131c9ca8f8ec2495344937ef1eeac5918837c 100644 (file)
--- a/Modules/rotormodule.c
+++ b/Modules/rotormodule.c
@@ -578,7 +578,7 @@ rotorobj_getattr(Rotorobj *s, char *name)
 statichere PyTypeObject Rotor_Type = {
        PyObject_HEAD_INIT(NULL)
        0,                              /*ob_size*/
-       "rotor",                        /*tp_name*/
+       "rotor.rotor",                  /*tp_name*/
        sizeof(Rotorobj),               /*tp_size*/
        0,                              /*tp_itemsize*/
        /* methods */

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 348987b6030aa29210da4bf59eea5f78daa193bf..e5aa6eb8fcd5ffa05b5394950bfcd302c4d14afa 100644 (file)
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -567,7 +567,7 @@ statichere PyTypeObject poll_Type = {
         * to be portable to Windows without using C++. */
        PyObject_HEAD_INIT(NULL)
        0,                      /*ob_size*/
-       "poll",                 /*tp_name*/
+       "select.poll",          /*tp_name*/
        sizeof(pollObject),     /*tp_basicsize*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Modules/shamodule.c b/Modules/shamodule.c
index b3831b961829c6ffa5a718885dc4688f5e2874ac..f33f9074e7aa58df7d37daecc09b692b4006892b 100644 (file)
--- a/Modules/shamodule.c
+++ b/Modules/shamodule.c
@@ -467,7 +467,7 @@ SHA_getattr(PyObject *self, char *name)
 static PyTypeObject SHAtype = {
     PyObject_HEAD_INIT(NULL)
     0,                 /*ob_size*/
-    "SHA",             /*tp_name*/
+    "sha.SHA",         /*tp_name*/
     sizeof(SHAobject), /*tp_size*/
     0,                 /*tp_itemsize*/
     /* methods */

diff --git a/Modules/sunaudiodev.c b/Modules/sunaudiodev.c
index e4c4c9f42aa3123bbfe34d30cd184c5e7cddd493..e9ffd1f31dbfc94c05e65422badfe646beb46480 100644 (file)
--- a/Modules/sunaudiodev.c
+++ b/Modules/sunaudiodev.c
@@ -434,7 +434,7 @@ sads_setattr(sadstatusobject *xp, char *name, PyObject *v)
 static PyTypeObject Sadtype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "sun_audio_device",             /*tp_name*/
+       "sunaudiodev.sun_audio_device", /*tp_name*/
        sizeof(sadobject),              /*tp_size*/
        0,                              /*tp_itemsize*/
        /* methods */
@@ -449,7 +449,7 @@ static PyTypeObject Sadtype = {
 static PyTypeObject Sadstatustype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "sun_audio_device_status",      /*tp_name*/
+       "sunaudiodev.sun_audio_device_status", /*tp_name*/
        sizeof(sadstatusobject),        /*tp_size*/
        0,                              /*tp_itemsize*/
        /* methods */

diff --git a/Modules/svmodule.c b/Modules/svmodule.c
index ead0ca589ff57b6e80ea2006967755ce3ec5bc65..1e254ad8bbe94b25ed8cc33557dfc465afc5c1de 100644 (file)
--- a/Modules/svmodule.c
+++ b/Modules/svmodule.c
@@ -294,7 +294,7 @@ capture_getattr(svobject *self, char *name)
 PyTypeObject Capturetype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "capture",                      /*tp_name*/
+       "sv.capture",                   /*tp_name*/
        sizeof(captureobject),          /*tp_size*/
        0,                              /*tp_itemsize*/
        /* methods */
@@ -898,7 +898,7 @@ svideo_getattr(svobject *self, char *name)
 PyTypeObject Svtype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                      /*ob_size*/
-       "sv",                   /*tp_name*/
+       "sv.sv",                /*tp_name*/
        sizeof(svobject),       /*tp_size*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
index bdc7932c6e06041eab640896fbc6ae99adc40a41..dfc5cbe7920c29962e0aa71c43b88774eedad8f4 100644 (file)
--- a/Modules/threadmodule.c
+++ b/Modules/threadmodule.c
@@ -156,7 +156,7 @@ lock_getattr(lockobject *self, char *name)
 static PyTypeObject Locktype = {
        PyObject_HEAD_INIT(&PyType_Type)
        0,                              /*ob_size*/
-       "lock",                         /*tp_name*/
+       "thread.lock",                  /*tp_name*/
        sizeof(lockobject),             /*tp_size*/
        0,                              /*tp_itemsize*/
        /* methods */

diff --git a/Modules/timemodule.c b/Modules/timemodule.c
index a9b7a03b3832b05c0f6aac4e9ec0a6313919a139..bcc53e0ec156bc178c548326fbad6a091c4d047e 100644 (file)
--- a/Modules/timemodule.c
+++ b/Modules/timemodule.c
@@ -223,7 +223,7 @@ static PyStructSequence_Field struct_time_type_fields[] = {
 };
 
 static PyStructSequence_Desc struct_time_type_desc = {
-       "struct_time",
+       "time.struct_time",
        NULL,
        struct_time_type_fields,
        9,

diff --git a/Modules/xreadlinesmodule.c b/Modules/xreadlinesmodule.c
index efc3de515fe9ee58c16bee0ae3575e789346373a..4511f17f67e18e8d8627971180c631d8f4387718 100644 (file)
--- a/Modules/xreadlinesmodule.c
+++ b/Modules/xreadlinesmodule.c
@@ -135,7 +135,7 @@ static PySequenceMethods xreadlines_as_sequence = {
 static PyTypeObject XReadlinesObject_Type = {
        PyObject_HEAD_INIT(NULL)
        0,
-       "xreadlines",
+       "xreadlines.xreadlines",
        sizeof(PyXReadlinesObject),
        0,
        (destructor)xreadlines_dealloc,         /* tp_dealloc */

diff --git a/Modules/xxmodule.c b/Modules/xxmodule.c
index 29b874b6097da96f27c9b47f9befed5cdfa00c6b..0ee9f7a8baad72035dc5cfceee5d2105f4f82b8c 100644 (file)
--- a/Modules/xxmodule.c
+++ b/Modules/xxmodule.c
@@ -98,7 +98,7 @@ statichere PyTypeObject Xxo_Type = {
         * to be portable to Windows without using C++. */
        PyObject_HEAD_INIT(NULL)
        0,                      /*ob_size*/
-       "Xxo",                  /*tp_name*/
+       "xxmodule.Xxo",         /*tp_name*/
        sizeof(XxoObject),      /*tp_basicsize*/
        0,                      /*tp_itemsize*/
        /* methods */

diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index 2df7f6fa03d7703fc7502036120d707b3fd7d5c3..3f2fd80a464e4a35bb7b5abb8485913a30d44bea 100644 (file)
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -798,7 +798,7 @@ static PyMethodDef zlib_methods[] =
 statichere PyTypeObject Comptype = {
     PyObject_HEAD_INIT(0)
     0,
-    "Compress",
+    "zlib.Compress",
     sizeof(compobject),
     0,
     (destructor)Comp_dealloc,       /*tp_dealloc*/
@@ -815,7 +815,7 @@ statichere PyTypeObject Comptype = {
 statichere PyTypeObject Decomptype = {
     PyObject_HEAD_INIT(0)
     0,
-    "Decompress",
+    "zlib.Decompress",
     sizeof(compobject),
     0,
     (destructor)Decomp_dealloc,     /*tp_dealloc*/

diff --git a/RISCOS/Modules/riscosmodule.c b/RISCOS/Modules/riscosmodule.c
index c4410173eb6bd4c2b134744aaf706806bd105035..cb4289db3e3238adb2b85629e514a20af14dcf1f 100644 (file)
--- a/RISCOS/Modules/riscosmodule.c
+++ b/RISCOS/Modules/riscosmodule.c
@@ -148,7 +148,7 @@ static PyStructSequence_Field stat_result_fields[] = {
 };
 
 static PyStructSequence_Desc stat_result_desc = {
-       "stat_result",
+       "riscos.stat_result",
        stat_result__doc__,
        stat_result_fields,
        13