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.
This commit is contained in:
Guido van Rossum 2001-12-08 18:02:58 +00:00
parent 7745218c05
commit 146483964e
68 changed files with 116 additions and 113 deletions

View File

@ -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... */

View File

@ -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 */

View File

@ -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'

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -340,6 +340,7 @@ Amrit Prem
Paul Prescod
Donovan Preston
Brian Quinlan
Burton Radons
Eric Raymond
John Redford
Terry Reedy

View File

@ -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 */

View File

@ -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 */

View File

@ -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*/

View File

@ -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 */

View File

@ -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 */

View File

@ -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*/

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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*/

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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*/

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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);
}

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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 */

View File

@ -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,

View File

@ -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 */

View File

@ -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 */

View File

@ -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*/

View File

@ -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