Mailman 3 July 2004 - Python-checkins

python/dist/src/Misc BeOS-setup.py,1.6,1.7
by nnorwitz＠users.sourceforge.net July 29, 2004

July 29, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25177/Misc Modified Files: BeOS-setup.py Log Message: SF bug #999776, zlib home page wrong Backport candidate. Index: BeOS-setup.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/BeOS-setup.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BeOS-setup.py 18 Jul 2004 06:04:36 -0000 1.6 --- BeOS-setup.py 29 Jul 2004 03:55:56 -0000 1.7 *************** *** 444,448 **** # Andrew Kuchling's zlib module. # This require zlib 1.1.3 (or later). ! # See http://www.cdrom.com/pub/infozip/zlib/ if (self.compiler.find_library_file(lib_dirs, 'z')): exts.append( Extension('zlib', ['zlibmodule.c'], --- 444,448 ---- # Andrew Kuchling's zlib module. # This require zlib 1.1.3 (or later). ! # See http://www.gzip.org/zlib/ if (self.compiler.find_library_file(lib_dirs, 'z')): exts.append( Extension('zlib', ['zlibmodule.c'],

1 0

python/dist/src/Doc/lib liblocale.tex,1.37,1.38
by nnorwitz＠users.sourceforge.net July 29, 2004

July 29, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24341/Doc/lib Modified Files: liblocale.tex Log Message: SF #998170, fix typo. Backport candidate Index: liblocale.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liblocale.tex,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** liblocale.tex 22 Jul 2004 18:43:59 -0000 1.37 --- liblocale.tex 29 Jul 2004 03:48:59 -0000 1.38 *************** *** 87,91 **** {Symbol used to annotate a positive monetary value.} \lineiii{}{\code{'negative_sign'}} ! {Symbol used to annotate a nnegative monetary value.} \lineiii{}{\code{'frac_digits'}} {Number of fractional digits used in local formatting --- 87,91 ---- {Symbol used to annotate a positive monetary value.} \lineiii{}{\code{'negative_sign'}} ! {Symbol used to annotate a negative monetary value.} \lineiii{}{\code{'frac_digits'}} {Number of fractional digits used in local formatting

1 0

python/dist/src/Include listobject.h,2.28,2.29
by tim_one＠users.sourceforge.net July 29, 2004

July 29, 2004

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22000/Include Modified Files: listobject.h Log Message: Document what the members of PyListObject are used for, and the crucial invariants they must satisfy. Index: listobject.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/listobject.h,v retrieving revision 2.28 retrieving revision 2.29 diff -C2 -d -r2.28 -r2.29 *** listobject.h 11 Mar 2004 09:13:12 -0000 2.28 --- listobject.h 29 Jul 2004 03:29:15 -0000 2.29 *************** *** 22,26 **** --- 22,35 ---- typedef struct { PyObject_VAR_HEAD + /* Vector of pointers to list elements. list[0] is ob_item{0], etc. */ PyObject **ob_item; + + /* ob_item contains space for 'allocated' elements. The number + * currently in use is ob_size. + * Invariants: + * 0 <= ob_size <= allocated + * len(list) == ob_size + * ob_item == NULL implies ob_size == allocated == 0 + */ int allocated; } PyListObject;

1 0

python/dist/src/Objects listobject.c,2.208,2.209
by tim_one＠users.sourceforge.net July 29, 2004

July 29, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13944/Objects Modified Files: listobject.c Log Message: Trimmed trailing whitespace. Index: listobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v retrieving revision 2.208 retrieving revision 2.209 diff -C2 -d -r2.208 -r2.209 *** listobject.c 29 Jul 2004 02:28:42 -0000 2.208 --- listobject.c 29 Jul 2004 02:29:26 -0000 2.209 *************** *** 160,164 **** return -1; } ! if (list_resize(self, n+1) == -1) return -1; --- 160,164 ---- return -1; } ! if (list_resize(self, n+1) == -1) return -1; *************** *** 239,244 **** if (num_free_lists < MAXFREELISTS && PyList_CheckExact(op)) free_lists[num_free_lists++] = op; ! else ! op->ob_type->tp_free((PyObject *)op); Py_TRASHCAN_SAFE_END(op) } --- 239,244 ---- if (num_free_lists < MAXFREELISTS && PyList_CheckExact(op)) free_lists[num_free_lists++] = op; ! else ! op->ob_type->tp_free((PyObject *)op); Py_TRASHCAN_SAFE_END(op) } *************** *** 546,550 **** p += ihigh - ilow; if (d < 0) { ! memmove(&item[ihigh+d], &item[ihigh], (a->ob_size - ihigh)*sizeof(PyObject *)); list_resize(a, a->ob_size + d); --- 546,550 ---- p += ihigh - ilow; if (d < 0) { ! memmove(&item[ihigh+d], &item[ihigh], (a->ob_size - ihigh)*sizeof(PyObject *)); list_resize(a, a->ob_size + d); *************** *** 618,622 **** } ! if (list_resize(self, size*n) == -1) return NULL; --- 618,622 ---- } ! if (list_resize(self, size*n) == -1) return NULL; *************** *** 683,688 **** /* Special cases: ! 1) lists and tuples which can use PySequence_Fast ops ! 2) extending self to self requires making a copy first */ if (PyList_CheckExact(b) || PyTuple_CheckExact(b) || (PyObject *)self == b) { --- 683,688 ---- /* Special cases: ! 1) lists and tuples which can use PySequence_Fast ops ! 2) extending self to self requires making a copy first */ if (PyList_CheckExact(b) || PyTuple_CheckExact(b) || (PyObject *)self == b) { *************** *** 1722,1728 **** /* Special wrapper to support stable sorting using the decorate-sort-undecorate pattern. Holds a key which is used for comparisions and the original record ! which is returned during the undecorate phase. By exposing only the key ! during comparisons, the underlying sort stability characteristics are left ! unchanged. Also, if a custom comparison function is used, it will only see the key instead of a full record. */ --- 1722,1728 ---- /* Special wrapper to support stable sorting using the decorate-sort-undecorate pattern. Holds a key which is used for comparisions and the original record ! which is returned during the undecorate phase. By exposing only the key ! during comparisons, the underlying sort stability characteristics are left ! unchanged. Also, if a custom comparison function is used, it will only see the key instead of a full record. */ *************** *** 1739,1743 **** { if (!PyObject_TypeCheck(b, &sortwrapper_type)) { ! PyErr_SetString(PyExc_TypeError, "expected a sortwrapperobject"); return NULL; --- 1739,1743 ---- { if (!PyObject_TypeCheck(b, &sortwrapper_type)) { ! PyErr_SetString(PyExc_TypeError, "expected a sortwrapperobject"); return NULL; *************** *** 1778,1782 **** 0, /* tp_setattro */ 0, /* tp_as_buffer */ ! Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_RICHCOMPARE, /* tp_flags */ sortwrapper_doc, /* tp_doc */ --- 1778,1782 ---- 0, /* tp_setattro */ 0, /* tp_as_buffer */ ! Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_RICHCOMPARE, /* tp_flags */ sortwrapper_doc, /* tp_doc */ *************** *** 1793,1797 **** { sortwrapperobject *so; ! so = PyObject_New(sortwrapperobject, &sortwrapper_type); if (so == NULL) --- 1793,1797 ---- { sortwrapperobject *so; ! so = PyObject_New(sortwrapperobject, &sortwrapper_type); if (so == NULL) *************** *** 1809,1813 **** if (!PyObject_TypeCheck(so, &sortwrapper_type)) { ! PyErr_SetString(PyExc_TypeError, "expected a sortwrapperobject"); return NULL; --- 1809,1813 ---- if (!PyObject_TypeCheck(so, &sortwrapper_type)) { ! PyErr_SetString(PyExc_TypeError, "expected a sortwrapperobject"); return NULL; *************** *** 1843,1847 **** if (!PyObject_TypeCheck(x, &sortwrapper_type) || !PyObject_TypeCheck(y, &sortwrapper_type)) { ! PyErr_SetString(PyExc_TypeError, "expected a sortwrapperobject"); return NULL; --- 1843,1847 ---- if (!PyObject_TypeCheck(x, &sortwrapper_type) || !PyObject_TypeCheck(y, &sortwrapper_type)) { ! PyErr_SetString(PyExc_TypeError, "expected a sortwrapperobject"); return NULL; *************** *** 1884,1888 **** { cmpwrapperobject *co; ! co = PyObject_New(cmpwrapperobject, &cmpwrapper_type); if (co == NULL) --- 1884,1888 ---- { cmpwrapperobject *co; ! co = PyObject_New(cmpwrapperobject, &cmpwrapper_type); if (co == NULL) *************** *** 1949,1953 **** for (i=0 ; i < saved_ob_size ; i++) { value = saved_ob_item[i]; ! key = PyObject_CallFunctionObjArgs(keyfunc, value, NULL); if (key == NULL) { --- 1949,1953 ---- for (i=0 ; i < saved_ob_size ; i++) { value = saved_ob_item[i]; ! key = PyObject_CallFunctionObjArgs(keyfunc, value, NULL); if (key == NULL) { *************** *** 1958,1962 **** Py_DECREF(kvpair); } ! if (self->ob_item != empty_ob_item || self->ob_size) { /* If the list changed *as well* we --- 1958,1962 ---- Py_DECREF(kvpair); } ! if (self->ob_item != empty_ob_item || self->ob_size) { /* If the list changed *as well* we *************** *** 1969,1973 **** (PyObject *)NULL); } ! goto dsu_fail; } --- 1969,1973 ---- (PyObject *)NULL); } ! goto dsu_fail; } *************** *** 2503,2507 **** } ! memmove(self->ob_item + cur - i, self->ob_item + cur + 1, lim * sizeof(PyObject *)); --- 2503,2507 ---- } ! memmove(self->ob_item + cur - i, self->ob_item + cur + 1, lim * sizeof(PyObject *)); *************** *** 2535,2539 **** } else { ! seq = PySequence_Fast(value, "must assign iterable to extended slice"); if (!seq) --- 2535,2539 ---- } else { ! seq = PySequence_Fast(value, "must assign iterable to extended slice"); if (!seq)

1 0

python/dist/src/Doc/api concrete.tex, 1.25.10.9, 1.25.10.10
by montanaro＠users.sourceforge.net July 29, 2004

July 29, 2004

Update of /cvsroot/python/python/dist/src/Doc/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13933 Modified Files: Tag: release23-maint concrete.tex Log Message: backport relevant bits of the bool api docs Index: concrete.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/api/concrete.tex,v retrieving revision 1.25.10.9 retrieving revision 1.25.10.10 diff -C2 -d -r1.25.10.9 -r1.25.10.10 *** concrete.tex 23 Jul 2004 14:51:06 -0000 1.25.10.9 --- concrete.tex 29 Jul 2004 02:29:24 -0000 1.25.10.10 *************** *** 190,193 **** --- 190,226 ---- + \subsubsection{Boolean Objects \label{boolObjects}} + + Booleans in Python are implemented as a subclass of integers. There + are only two booleans, \constant{Py_False} and \constant{Py_True}. As + such, the normal creation and deletion functions don't apply to + booleans. The following macros are available, however. + + \begin{cfuncdesc}{int}{PyBool_Check}{PyObject* o} + Returns true if \var{o} is of type \cdata{PyBool_Type}. + \versionadded{2.3} + \end{cfuncdesc} + + \begin{cvardesc}{PyObject*}{Py_False} + The Python \code{False} object. This object has no methods. It needs to + be treated just like any other object with respect to reference counts. + \end{cvardesc} + + \begin{cvardesc}{PyObject*}{Py_True} + The Python \code{True} object. This object has no methods. It needs to + be treated just like any other object with respect to reference counts. + \end{cvardesc} + + \begin{cfuncdesc}{int}{PyBool_Check}{PyObject* o} + Returns true if \var{o} is of type \cdata{PyBool_Type}. + \versionadded{2.3} + \end{cfuncdesc} + + \begin{cfuncdesc}{int}{PyBool_FromLong}{long v} + Returns \constant{Py_True} or \constant{Py_False} depending on the + truth value of \var{v}. + \versionadded{2.3} + \end{cfuncdesc} + \subsection{Long Integer Objects \label{longObjects}}

1 0

python/dist/src/Objects listobject.c,2.207,2.208
by tim_one＠users.sourceforge.net July 29, 2004

July 29, 2004

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13639/Objects Modified Files: listobject.c Log Message: PyList_New(): we went to all the trouble of computing and bounds-checking the size_t nbytes, and passed nbytes to malloc, so it was confusing to effectively recompute the same thing from scratch in the memset call. Index: listobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v retrieving revision 2.207 retrieving revision 2.208 diff -C2 -d -r2.207 -r2.208 *** listobject.c 15 Jul 2004 15:54:05 -0000 2.207 --- listobject.c 29 Jul 2004 02:28:42 -0000 2.208 *************** *** 60,63 **** --- 60,64 ---- PyListObject *op; size_t nbytes; + if (size < 0) { PyErr_BadInternalCall(); *************** *** 83,87 **** if (op->ob_item == NULL) return PyErr_NoMemory(); ! memset(op->ob_item, 0, sizeof(*op->ob_item) * size); } op->ob_size = size; --- 84,88 ---- if (op->ob_item == NULL) return PyErr_NoMemory(); ! memset(op->ob_item, 0, nbytes); } op->ob_size = size;

1 0

python/dist/src/Doc/api concrete.tex,1.49,1.50
by montanaro＠users.sourceforge.net July 29, 2004

July 29, 2004

Update of /cvsroot/python/python/dist/src/Doc/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12401 Modified Files: concrete.tex Log Message: Add missing doc for Py_True/Py_False. Use the correct macro to define Py_RETURN_FALSE and Py_RETURN_TRUE. Index: concrete.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/api/concrete.tex,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** concrete.tex 28 Jul 2004 14:17:04 -0000 1.49 --- concrete.tex 29 Jul 2004 02:16:04 -0000 1.50 *************** *** 205,219 **** \end{cfuncdesc} ! \begin{cfuncdesc}{Py_RETURN_FALSE} ! Return Py_False from a function, properly incrementing its reference ! count. \versionadded{2.4} ! \end{cfuncdesc} ! \begin{cfuncdesc}{Py_RETURN_TRUE} Return Py_True from a function, properly incrementing its reference count. \versionadded{2.4} ! \end{cfuncdesc} \begin{cfuncdesc}{int}{PyBool_Check}{PyObject* o} --- 205,229 ---- \end{cfuncdesc} ! \begin{cvardesc}{PyObject*}{Py_False} ! The Python \code{False} object. This object has no methods. It needs to ! be treated just like any other object with respect to reference counts. ! \end{cvardesc} ! ! \begin{cvardesc}{PyObject*}{Py_True} ! The Python \code{True} object. This object has no methods. It needs to ! be treated just like any other object with respect to reference counts. ! \end{cvardesc} ! ! \begin{csimplemacrodesc}{Py_RETURN_FALSE} ! Return \constant{Py_False} from a function, properly incrementing its ! reference count. \versionadded{2.4} ! \end{csimplemacrodesc} ! \begin{csimplemacrodesc}{Py_RETURN_TRUE} Return Py_True from a function, properly incrementing its reference count. \versionadded{2.4} ! \end{csimplemacrodesc} \begin{cfuncdesc}{int}{PyBool_Check}{PyObject* o}

1 0

python/dist/src/PC msvcrtmodule.c,1.8,1.8.16.1
by theller＠users.sourceforge.net July 28, 2004

July 28, 2004

Update of /cvsroot/python/python/dist/src/PC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17709 Modified Files: Tag: release23-maint msvcrtmodule.c Log Message: Use PyMODINIT_FUNC. Index: msvcrtmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/msvcrtmodule.c,v retrieving revision 1.8 retrieving revision 1.8.16.1 diff -C2 -d -r1.8 -r1.8.16.1 *** msvcrtmodule.c 31 Mar 2002 14:37:44 -0000 1.8 --- msvcrtmodule.c 28 Jul 2004 20:04:37 -0000 1.8.16.1 *************** *** 218,222 **** }; ! __declspec(dllexport) void initmsvcrt(void) { --- 218,222 ---- }; ! PyMODINIT_FUNC initmsvcrt(void) {

1 0

python/dist/src/PC msvcrtmodule.c,1.8,1.9
by theller＠users.sourceforge.net July 28, 2004

July 28, 2004

Update of /cvsroot/python/python/dist/src/PC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17311 Modified Files: msvcrtmodule.c Log Message: Use PyMODINIT_FUNC. Index: msvcrtmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/msvcrtmodule.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** msvcrtmodule.c 31 Mar 2002 14:37:44 -0000 1.8 --- msvcrtmodule.c 28 Jul 2004 20:02:52 -0000 1.9 *************** *** 218,222 **** }; ! __declspec(dllexport) void initmsvcrt(void) { --- 218,222 ---- }; ! PyMODINIT_FUNC initmsvcrt(void) {

1 0

python/dist/src/Misc ACKS,1.274,1.275
by lemburg＠users.sourceforge.net July 28, 2004

July 28, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31769/Misc Modified Files: ACKS Log Message: New codec: [ 996067 ] hp-roman8 codec Index: ACKS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/ACKS,v retrieving revision 1.274 retrieving revision 1.275 diff -C2 -d -r1.274 -r1.275 *** ACKS 27 Jul 2004 05:07:19 -0000 1.274 --- ACKS 28 Jul 2004 15:37:54 -0000 1.275 *************** *** 73,76 **** --- 73,77 ---- Dave Brennan Tom Bridgman + Richard Brodie Gary S. Brown Daniel Brotsky

1 0