[Python-checkins] CVS: python/dist/src/Mac/Modules Nav.c,1.15,1.16 calldll.c,1.6,1.7 ctbmodule.c,1.11,1.12 hfsplusmodule.c,1.4,1.5 icgluemodule.c,1.6,1.7 macfsmodule.c,1.49,1.50 macmodule.c,1.49,1.50 macosmodule.c,1.57,1.58 macspeechmodule.c,1.12,1.13

Guido van Rossum gvanrossum@users.sourceforge.net
Sat, 08 Dec 2001 10:03:24 -0800


Update of /cvsroot/python/python/dist/src/Mac/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv14386/Mac/Modules

Modified Files:
	Nav.c calldll.c ctbmodule.c hfsplusmodule.c icgluemodule.c 
	macfsmodule.c macmodule.c macosmodule.c macspeechmodule.c 
Log Message:
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.



Index: Nav.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/Nav.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Nav.c	2001/09/04 22:20:39	1.15
--- Nav.c	2001/12/08 18:02:51	1.16
***************
*** 388,392 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"NavReplyRecord",			/*tp_name*/
  	sizeof(navrrobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
--- 388,392 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"Nav.NavReplyRecord",			/*tp_name*/
  	sizeof(navrrobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/

Index: calldll.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/calldll.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** calldll.c	2000/07/31 22:07:49	1.6
--- calldll.c	2001/12/08 18:02:51	1.7
***************
*** 566,570 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"routine",			/*tp_name*/
  	sizeof(cdrobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
--- 566,570 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"calldll.routine",		/*tp_name*/
  	sizeof(cdrobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
***************
*** 756,760 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"callable",			/*tp_name*/
  	sizeof(cdcobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
--- 756,760 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"calldll.callable",		/*tp_name*/
  	sizeof(cdcobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
***************
*** 965,969 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"fragment",			/*tp_name*/
  	sizeof(cdfobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
--- 965,969 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"calldll.fragment",		/*tp_name*/
  	sizeof(cdfobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/

Index: ctbmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/ctbmodule.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ctbmodule.c	2000/07/14 22:52:49	1.11
--- ctbmodule.c	2001/12/08 18:02:51	1.12
***************
*** 474,478 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,			/*ob_size*/
! 	"CTBConnectionMgr",	/*tp_name*/
  	sizeof(ctbcmobject),	/*tp_basicsize*/
  	0,			/*tp_itemsize*/
--- 474,478 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,			/*ob_size*/
! 	"ctb.CTBConnectionMgr",	/*tp_name*/
  	sizeof(ctbcmobject),	/*tp_basicsize*/
  	0,			/*tp_itemsize*/

Index: hfsplusmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/hfsplusmodule.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** hfsplusmodule.c	2001/12/05 23:27:58	1.4
--- hfsplusmodule.c	2001/12/08 18:02:51	1.5
***************
*** 332,336 ****
  	PyObject_HEAD_INIT(NULL)
  	0,			/*ob_size*/
! 	"openfile",			/*tp_name*/
  	sizeof(forkRefObject),	/*tp_basicsize*/
  	0,			/*tp_itemsize*/
--- 332,336 ----
  	PyObject_HEAD_INIT(NULL)
  	0,			/*ob_size*/
! 	"hfsplus.openfile",		/*tp_name*/
  	sizeof(forkRefObject),	/*tp_basicsize*/
  	0,			/*tp_itemsize*/
***************
*** 506,510 ****
  	PyObject_HEAD_INIT(NULL)
  	0,			/*ob_size*/
! 	"iterator",			/*tp_name*/
  	sizeof(iteratorObject),	/*tp_basicsize*/
  	0,			/*tp_itemsize*/
--- 506,510 ----
  	PyObject_HEAD_INIT(NULL)
  	0,			/*ob_size*/
! 	"hfsplus.iterator",		/*tp_name*/
  	sizeof(iteratorObject),	/*tp_basicsize*/
  	0,			/*tp_itemsize*/
***************
*** 1025,1029 ****
  	PyObject_HEAD_INIT(NULL)
  	0,			/*ob_size*/
! 	"fsref",			/*tp_name*/
  	sizeof(fsRefObject),	/*tp_basicsize*/
  	0,			/*tp_itemsize*/
--- 1025,1029 ----
  	PyObject_HEAD_INIT(NULL)
  	0,			/*ob_size*/
! 	"hfsplus.fsref",		/*tp_name*/
  	sizeof(fsRefObject),	/*tp_basicsize*/
  	0,			/*tp_itemsize*/

Index: icgluemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/icgluemodule.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** icgluemodule.c	2001/09/04 22:20:39	1.6
--- icgluemodule.c	2001/12/08 18:02:51	1.7
***************
*** 503,507 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"ic_instance",			/*tp_name*/
  	sizeof(iciobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
--- 503,507 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"icglue.ic_instance",		/*tp_name*/
  	sizeof(iciobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/

Index: macfsmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macfsmodule.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** macfsmodule.c	2001/12/05 23:27:52	1.49
--- macfsmodule.c	2001/12/08 18:02:51	1.50
***************
*** 234,238 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"Alias",			/*tp_name*/
  	sizeof(mfsaobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
--- 234,238 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"macfs.Alias",			/*tp_name*/
  	sizeof(mfsaobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
***************
*** 333,337 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"FInfo",			/*tp_name*/
  	sizeof(mfsiobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
--- 333,337 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"macfs.FInfo",			/*tp_name*/
  	sizeof(mfsiobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
***************
*** 736,740 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"FSSpec",			/*tp_name*/
  	sizeof(mfssobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
--- 736,740 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"macfs.FSSpec",			/*tp_name*/
  	sizeof(mfssobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
***************
*** 835,839 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"FSRef",			/*tp_name*/
  	sizeof(mfsrobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
--- 835,839 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"macfs.FSRef",			/*tp_name*/
  	sizeof(mfsrobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/

Index: macmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macmodule.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** macmodule.c	2001/11/30 14:16:31	1.49
--- macmodule.c	2001/12/08 18:02:51	1.50
***************
*** 487,491 ****
  
  static PyStructSequence_Desc stat_result_desc = {
! 	"stat_result",
  	stat_result__doc__,
  	stat_result_fields,
--- 487,491 ----
  
  static PyStructSequence_Desc stat_result_desc = {
! 	"mac.stat_result",
  	stat_result__doc__,
  	stat_result_fields,
***************
*** 505,509 ****
  
  static PyStructSequence_Desc xstat_result_desc = {
! 	"xstat_result",
  	stat_result__doc__,
  	xstat_result_fields,
--- 505,509 ----
  
  static PyStructSequence_Desc xstat_result_desc = {
! 	"mac.xstat_result",
  	stat_result__doc__,
  	xstat_result_fields,

Index: macosmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macosmodule.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** macosmodule.c	2001/09/10 22:00:39	1.57
--- macosmodule.c	2001/12/08 18:02:51	1.58
***************
*** 276,280 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"ResourceFork",			/*tp_name*/
  	sizeof(rfobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/
--- 276,280 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,				/*ob_size*/
! 	"MacOS.ResourceFork",		/*tp_name*/
  	sizeof(rfobject),		/*tp_basicsize*/
  	0,				/*tp_itemsize*/

Index: macspeechmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/macspeechmodule.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** macspeechmodule.c	2001/08/07 15:30:01	1.12
--- macspeechmodule.c	2001/12/08 18:02:51	1.13
***************
*** 259,263 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,			/*ob_size*/
! 	"MacSpeechChannel",			/*tp_name*/
  	sizeof(scobject),	/*tp_basicsize*/
  	0,			/*tp_itemsize*/
--- 259,263 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,			/*ob_size*/
! 	"macspeech.MacSpeechChannel", /*tp_name*/
  	sizeof(scobject),	/*tp_basicsize*/
  	0,			/*tp_itemsize*/
***************
*** 376,380 ****
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,			/*ob_size*/
! 	"MacVoice",			/*tp_name*/
  	sizeof(mvobject),	/*tp_basicsize*/
  	0,			/*tp_itemsize*/
--- 376,380 ----
  	PyObject_HEAD_INIT(&PyType_Type)
  	0,			/*ob_size*/
! 	"macspeech.MacVoice",	/*tp_name*/
  	sizeof(mvobject),	/*tp_basicsize*/
  	0,			/*tp_itemsize*/