[Python-checkins] CVS: python/dist/src/Objects dictobject.c,2.116,2.117 typeobject.c,2.116,2.117

2001年10月29日 14:25:47 -0800

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv28201/python/Objects
Modified Files:
	dictobject.c typeobject.c 
Log Message:
Rename "dictionary" (type and constructor) to "dict".
Index: dictobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/dictobject.c,v
retrieving revision 2.116
retrieving revision 2.117
diff -C2 -d -r2.116 -r2.117
*** dictobject.c	2001年10月27日 18:27:48	2.116
--- dictobject.c	2001年10月29日 22:25:44	2.117
***************
*** 1785,1789 ****
 	int result = 0;

! 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:dictionary",
 					 kwlist, &arg))
 		result = -1;
--- 1785,1789 ----
 	int result = 0;

! 	if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:dict",
 					 kwlist, &arg))
 		result = -1;
***************
*** 1805,1812 ****

 static char dictionary_doc[] =
! "dictionary() -> new empty dictionary.\n"
! "dictionary(mapping) -> new dict initialized from a mapping object's\n"
 " (key, value) pairs.\n"
! "dictionary(seq) -> new dict initialized as if via:\n"
 " d = {}\n"
 " for k, v in seq:\n"
--- 1805,1812 ----

 static char dictionary_doc[] =
! "dict() -> new empty dictionary.\n"
! "dict(mapping) -> new dictionary initialized from a mapping object's\n"
 " (key, value) pairs.\n"
! "dict(seq) -> new dictionary initialized as if via:\n"
 " d = {}\n"
 " for k, v in seq:\n"
***************
*** 1816,1820 ****
 	PyObject_HEAD_INIT(&PyType_Type)
 	0,
! 	"dictionary",
 	sizeof(dictobject),
 	0,
--- 1816,1820 ----
 	PyObject_HEAD_INIT(&PyType_Type)
 	0,
! 	"dict",
 	sizeof(dictobject),
 	0,
Index: typeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/typeobject.c,v
retrieving revision 2.116
retrieving revision 2.117
diff -C2 -d -r2.116 -r2.117
*** typeobject.c	2001年10月29日 22:09:37	2.116
--- typeobject.c	2001年10月29日 22:25:44	2.117
***************
*** 2485,2489 ****

 	/* Check that the use doesn't do something silly and unsafe like
! 	 object.__new__(dictionary). To do this, we check that the
 	 most derived base that's not a heap type is this type. */
 	staticbase = subtype;
--- 2485,2489 ----

 	/* Check that the use doesn't do something silly and unsafe like
! 	 object.__new__(dict). To do this, we check that the
 	 most derived base that's not a heap type is this type. */
 	staticbase = subtype;