Mailman 3 November 2003 - Python-checkins

python/dist/src/Lib UserString.py, 1.18, 1.19 string.py, 1.69, 1.70
by rhettinger＠users.sourceforge.net Nov. 26, 2003

Nov. 26, 2003

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv11053/Lib Modified Files: UserString.py string.py Log Message: Add optional fillchar argument to ljust(), rjust(), and center() string methods. Index: UserString.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/UserString.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** UserString.py 27 Aug 2003 10:48:12 -0000 1.18 --- UserString.py 26 Nov 2003 08:21:33 -0000 1.19 *************** *** 61,65 **** # the following methods are defined in alphabetical order: def capitalize(self): return self.__class__(self.data.capitalize()) ! def center(self, width): return self.__class__(self.data.center(width)) def count(self, sub, start=0, end=sys.maxint): return self.data.count(sub, start, end) --- 61,66 ---- # the following methods are defined in alphabetical order: def capitalize(self): return self.__class__(self.data.capitalize()) ! def center(self, width, *args): ! return self.__class__(self.data.center(width, *args)) def count(self, sub, start=0, end=sys.maxint): return self.data.count(sub, start, end) *************** *** 98,102 **** def isupper(self): return self.data.isupper() def join(self, seq): return self.data.join(seq) ! def ljust(self, width): return self.__class__(self.data.ljust(width)) def lower(self): return self.__class__(self.data.lower()) def lstrip(self, chars=None): return self.__class__(self.data.lstrip(chars)) --- 99,104 ---- def isupper(self): return self.data.isupper() def join(self, seq): return self.data.join(seq) ! def ljust(self, width, *args): ! return self.__class__(self.data.ljust(width, *args)) def lower(self): return self.__class__(self.data.lower()) def lstrip(self, chars=None): return self.__class__(self.data.lstrip(chars)) *************** *** 107,111 **** def rindex(self, sub, start=0, end=sys.maxint): return self.data.rindex(sub, start, end) ! def rjust(self, width): return self.__class__(self.data.rjust(width)) def rstrip(self, chars=None): return self.__class__(self.data.rstrip(chars)) def split(self, sep=None, maxsplit=-1): --- 109,114 ---- def rindex(self, sub, start=0, end=sys.maxint): return self.data.rindex(sub, start, end) ! def rjust(self, width, *args): ! return self.__class__(self.data.rjust(width, *args)) def rstrip(self, chars=None): return self.__class__(self.data.rstrip(chars)) def split(self, sep=None, maxsplit=-1): Index: string.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/string.py,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** string.py 3 Oct 2003 14:05:26 -0000 1.69 --- string.py 26 Nov 2003 08:21:33 -0000 1.70 *************** *** 238,272 **** # Left-justify a string ! def ljust(s, width): ! """ljust(s, width) -> string Return a left-justified version of s, in a field of the specified width, padded with spaces as needed. The string is ! never truncated. """ ! return s.ljust(width) # Right-justify a string ! def rjust(s, width): ! """rjust(s, width) -> string Return a right-justified version of s, in a field of the specified width, padded with spaces as needed. The string is ! never truncated. """ ! return s.rjust(width) # Center a string ! def center(s, width): ! """center(s, width) -> string Return a center version of s, in a field of the specified width. padded with spaces as needed. The string is never ! truncated. """ ! return s.center(width) # Zero-fill a number, e.g., (12, 3) --> '012' and (-3, 3) --> '-03' --- 238,272 ---- # Left-justify a string ! def ljust(s, width, *args): ! """ljust(s, width[, fillchar]) -> string Return a left-justified version of s, in a field of the specified width, padded with spaces as needed. The string is ! never truncated. If specified the fillchar is used instead of spaces. """ ! return s.ljust(width, *args) # Right-justify a string ! def rjust(s, width, *args): ! """rjust(s, width[, fillchar]) -> string Return a right-justified version of s, in a field of the specified width, padded with spaces as needed. The string is ! never truncated. If specified the fillchar is used instead of spaces. """ ! return s.rjust(width, *args) # Center a string ! def center(s, width, *args): ! """center(s, width[, fillchar]) -> string Return a center version of s, in a field of the specified width. padded with spaces as needed. The string is never ! truncated. If specified the fillchar is used instead of spaces. """ ! return s.center(width, *args) # Zero-fill a number, e.g., (12, 3) --> '012' and (-3, 3) --> '-03'

1 0

python/dist/src/Lib/test string_tests.py, 1.33, 1.34
by rhettinger＠users.sourceforge.net Nov. 26, 2003

Nov. 26, 2003

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv11053/Lib/test Modified Files: string_tests.py Log Message: Add optional fillchar argument to ljust(), rjust(), and center() string methods. Index: string_tests.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/string_tests.py,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** string_tests.py 27 Aug 2003 04:55:52 -0000 1.33 --- string_tests.py 26 Nov 2003 08:21:34 -0000 1.34 *************** *** 228,232 **** self.checkequal('abc', 'abc', 'ljust', 3) self.checkequal('abc', 'abc', 'ljust', 2) ! self.checkraises(TypeError, 'abc', 'ljust') --- 228,232 ---- self.checkequal('abc', 'abc', 'ljust', 3) self.checkequal('abc', 'abc', 'ljust', 2) ! self.checkequal('abc*******', 'abc', 'ljust', 10, '*') self.checkraises(TypeError, 'abc', 'ljust') *************** *** 236,240 **** self.checkequal('abc', 'abc', 'rjust', 3) self.checkequal('abc', 'abc', 'rjust', 2) ! self.checkraises(TypeError, 'abc', 'rjust') --- 236,240 ---- self.checkequal('abc', 'abc', 'rjust', 3) self.checkequal('abc', 'abc', 'rjust', 2) ! self.checkequal('*******abc', 'abc', 'rjust', 10, '*') self.checkraises(TypeError, 'abc', 'rjust') *************** *** 244,248 **** self.checkequal('abc', 'abc', 'center', 3) self.checkequal('abc', 'abc', 'center', 2) ! self.checkraises(TypeError, 'abc', 'center') --- 244,248 ---- self.checkequal('abc', 'abc', 'center', 3) self.checkequal('abc', 'abc', 'center', 2) ! self.checkequal('***abc****', 'abc', 'center', 10, '*') self.checkraises(TypeError, 'abc', 'center')

1 0

python/dist/src/Doc/lib libstdtypes.tex, 1.141, 1.142
by rhettinger＠users.sourceforge.net Nov. 26, 2003

Nov. 26, 2003

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv11053/Doc/lib Modified Files: libstdtypes.tex Log Message: Add optional fillchar argument to ljust(), rjust(), and center() string methods. Index: libstdtypes.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v retrieving revision 1.141 retrieving revision 1.142 diff -C2 -d -r1.141 -r1.142 *** libstdtypes.tex 24 Nov 2003 02:57:33 -0000 1.141 --- libstdtypes.tex 26 Nov 2003 08:21:32 -0000 1.142 *************** *** 547,553 **** \end{methoddesc} ! \begin{methoddesc}[string]{center}{width} Return centered in a string of length \var{width}. Padding is done ! using spaces. \end{methoddesc} --- 547,553 ---- \end{methoddesc} ! \begin{methoddesc}[string]{center}{width\optional{, fillchar}} Return centered in a string of length \var{width}. Padding is done ! using the specified \var{fillchar} (default is a space). \end{methoddesc} *************** *** 646,652 **** \end{methoddesc} ! \begin{methoddesc}[string]{ljust}{width} Return the string left justified in a string of length \var{width}. ! Padding is done using spaces. The original string is returned if \var{width} is less than \code{len(\var{s})}. \end{methoddesc} --- 646,653 ---- \end{methoddesc} ! \begin{methoddesc}[string]{ljust}{width\optional{, fillchar}} Return the string left justified in a string of length \var{width}. ! Padding is done using the specified \var{fillchar} (default is a ! space). The original string is returned if \var{width} is less than \code{len(\var{s})}. \end{methoddesc} *************** *** 684,690 **** \end{methoddesc} ! \begin{methoddesc}[string]{rjust}{width} Return the string right justified in a string of length \var{width}. ! Padding is done using spaces. The original string is returned if \var{width} is less than \code{len(\var{s})}. \end{methoddesc} --- 685,692 ---- \end{methoddesc} ! \begin{methoddesc}[string]{rjust}{width\optional{, fillchar}} Return the string right justified in a string of length \var{width}. ! Padding is done using the specified \var{fillchar} (default is a space). ! The original string is returned if \var{width} is less than \code{len(\var{s})}. \end{methoddesc}

1 0

python/dist/src/Objects stringobject.c, 2.212, 2.213 unicodeobject.c, 2.201, 2.202
by rhettinger＠users.sourceforge.net Nov. 26, 2003

Nov. 26, 2003

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1:/tmp/cvs-serv11053/Objects Modified Files: stringobject.c unicodeobject.c Log Message: Add optional fillchar argument to ljust(), rjust(), and center() string methods. Index: stringobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v retrieving revision 2.212 retrieving revision 2.213 diff -C2 -d -r2.212 -r2.213 *** stringobject.c 22 Oct 2003 02:56:39 -0000 2.212 --- stringobject.c 26 Nov 2003 08:21:35 -0000 2.213 *************** *** 2618,2625 **** PyDoc_STRVAR(ljust__doc__, ! "S.ljust(width) -> string\n" "\n" "Return S left justified in a string of length width. Padding is\n" ! "done using spaces."); static PyObject * --- 2618,2625 ---- PyDoc_STRVAR(ljust__doc__, ! "S.ljust(width[, fillchar]) -> string\n" "\n" "Return S left justified in a string of length width. Padding is\n" ! "done using the specified fill character (default is a space)."); static PyObject * *************** *** 2627,2631 **** { int width; ! if (!PyArg_ParseTuple(args, "i:ljust", &width)) return NULL; --- 2627,2633 ---- { int width; ! char fillchar = ' '; ! ! if (!PyArg_ParseTuple(args, "i|c:ljust", &width, &fillchar)) return NULL; *************** *** 2635,2647 **** } ! return pad(self, 0, width - PyString_GET_SIZE(self), ' '); } PyDoc_STRVAR(rjust__doc__, ! "S.rjust(width) -> string\n" "\n" "Return S right justified in a string of length width. Padding is\n" ! "done using spaces."); static PyObject * --- 2637,2649 ---- } ! return pad(self, 0, width - PyString_GET_SIZE(self), fillchar); } PyDoc_STRVAR(rjust__doc__, ! "S.rjust(width[, fillchar]) -> string\n" "\n" "Return S right justified in a string of length width. Padding is\n" ! "done using the specified fill character (default is a space)"); static PyObject * *************** *** 2649,2653 **** { int width; ! if (!PyArg_ParseTuple(args, "i:rjust", &width)) return NULL; --- 2651,2657 ---- { int width; ! char fillchar = ' '; ! ! if (!PyArg_ParseTuple(args, "i|c:rjust", &width, &fillchar)) return NULL; *************** *** 2657,2669 **** } ! return pad(self, width - PyString_GET_SIZE(self), 0, ' '); } PyDoc_STRVAR(center__doc__, ! "S.center(width) -> string\n" "\n" ! "Return S centered in a string of length width. Padding is done\n" ! "using spaces."); static PyObject * --- 2661,2673 ---- } ! return pad(self, width - PyString_GET_SIZE(self), 0, fillchar); } PyDoc_STRVAR(center__doc__, ! "S.center(width[, fillchar]) -> string\n" "\n" ! "Return S centered in a string of length width. Padding is\n" ! "done using the specified fill character (default is a space)"); static PyObject * *************** *** 2672,2677 **** int marg, left; int width; ! if (!PyArg_ParseTuple(args, "i:center", &width)) return NULL; --- 2676,2682 ---- int marg, left; int width; + char fillchar = ' '; ! if (!PyArg_ParseTuple(args, "i|c:center", &width, &fillchar)) return NULL; *************** *** 2684,2688 **** left = marg / 2 + (marg & width & 1); ! return pad(self, left, marg - left, ' '); } --- 2689,2693 ---- left = marg / 2 + (marg & width & 1); ! return pad(self, left, marg - left, fillchar); } Index: unicodeobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v retrieving revision 2.201 retrieving revision 2.202 diff -C2 -d -r2.201 -r2.202 *** unicodeobject.c 24 Oct 2003 14:25:28 -0000 2.201 --- unicodeobject.c 26 Nov 2003 08:21:35 -0000 2.202 *************** *** 4405,4413 **** #endif PyDoc_STRVAR(center__doc__, ! "S.center(width) -> unicode\n\ \n\ ! Return S centered in a Unicode string of length width. Padding is done\n\ ! using spaces."); static PyObject * --- 4405,4440 ---- #endif + /* Argument converter. Coerces to a single unicode character */ + + static int + convert_uc(PyObject *obj, void *addr) + { + Py_UNICODE *fillcharloc = (Py_UNICODE *)addr; + PyObject *uniobj; + Py_UNICODE *unistr; + + uniobj = PyUnicode_FromObject(obj); + if (uniobj == NULL) { + PyErr_SetString(PyExc_TypeError, + "The fill character cannot be converted to Unicode"); + return 0; + } + if (PyUnicode_GET_SIZE(uniobj) != 1) { + PyErr_SetString(PyExc_TypeError, + "The fill character must be exactly one character long"); + Py_DECREF(uniobj); + return 0; + } + unistr = PyUnicode_AS_UNICODE(uniobj); + *fillcharloc = unistr[0]; + Py_DECREF(uniobj); + return 1; + } + PyDoc_STRVAR(center__doc__, ! "S.center(width[, fillchar]) -> unicode\n\ \n\ ! Return S centered in a Unicode string of length width. Padding is\n\ ! done using the specified fill character (default is a space)"); static PyObject * *************** *** 4416,4421 **** int marg, left; int width; ! if (!PyArg_ParseTuple(args, "i:center", &width)) return NULL; --- 4443,4449 ---- int marg, left; int width; + Py_UNICODE fillchar = ' '; ! if (!PyArg_ParseTuple(args, "i|O&:center", &width, convert_uc, &fillchar)) return NULL; *************** *** 4428,4432 **** left = marg / 2 + (marg & width & 1); ! return (PyObject*) pad(self, left, marg - left, ' '); } --- 4456,4460 ---- left = marg / 2 + (marg & width & 1); ! return (PyObject*) pad(self, left, marg - left, fillchar); } *************** *** 5171,5178 **** PyDoc_STRVAR(ljust__doc__, ! "S.ljust(width) -> unicode\n\ \n\ Return S left justified in a Unicode string of length width. Padding is\n\ ! done using spaces."); static PyObject * --- 5199,5206 ---- PyDoc_STRVAR(ljust__doc__, ! "S.ljust(width[, fillchar]) -> unicode\n\ \n\ Return S left justified in a Unicode string of length width. Padding is\n\ ! done using the specified fill character (default is a space)."); static PyObject * *************** *** 5180,5184 **** { int width; ! if (!PyArg_ParseTuple(args, "i:ljust", &width)) return NULL; --- 5208,5214 ---- { int width; ! Py_UNICODE fillchar = ' '; ! ! if (!PyArg_ParseTuple(args, "i|O&:ljust", &width, convert_uc, &fillchar)) return NULL; *************** *** 5188,5192 **** } ! return (PyObject*) pad(self, 0, width - self->length, ' '); } --- 5218,5222 ---- } ! return (PyObject*) pad(self, 0, width - self->length, fillchar); } *************** *** 5553,5560 **** PyDoc_STRVAR(rjust__doc__, ! "S.rjust(width) -> unicode\n\ \n\ Return S right justified in a Unicode string of length width. Padding is\n\ ! done using spaces."); static PyObject * --- 5583,5590 ---- PyDoc_STRVAR(rjust__doc__, ! "S.rjust(width[, fillchar]) -> unicode\n\ \n\ Return S right justified in a Unicode string of length width. Padding is\n\ ! done using the specified fill character (default is a space)."); static PyObject * *************** *** 5562,5566 **** { int width; ! if (!PyArg_ParseTuple(args, "i:rjust", &width)) return NULL; --- 5592,5598 ---- { int width; ! Py_UNICODE fillchar = ' '; ! ! if (!PyArg_ParseTuple(args, "i|O&:rjust", &width, convert_uc, &fillchar)) return NULL; *************** *** 5570,5574 **** } ! return (PyObject*) pad(self, width - self->length, 0, ' '); } --- 5602,5606 ---- } ! return (PyObject*) pad(self, width - self->length, 0, fillchar); }

1 0

python/dist/src/Misc NEWS,1.898,1.899
by rhettinger＠users.sourceforge.net Nov. 26, 2003

Nov. 26, 2003

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv11053/Misc Modified Files: NEWS Log Message: Add optional fillchar argument to ljust(), rjust(), and center() string methods. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.898 retrieving revision 1.899 diff -C2 -d -r1.898 -r1.899 *** NEWS 25 Nov 2003 21:12:14 -0000 1.898 --- NEWS 26 Nov 2003 08:21:34 -0000 1.899 *************** *** 13,16 **** --- 13,20 ---- ----------------- + - For str and unicode objects, the ljust(), center(), and rjust() + methods now accept an optional argument specifying a fill + character other than a space. + - When method objects have an attribute that can be satisfied either by the function object or by the method object, the function

1 0

python/dist/src/Doc/lib libfuncs.tex,1.153,1.154
by rhettinger＠users.sourceforge.net Nov. 25, 2003

Nov. 25, 2003

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv32452 Modified Files: libfuncs.tex Log Message: As discussed on python-dev, banish apply(), buffer(), coerce(), and intern() to a separate region in the docs. Index: libfuncs.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libfuncs.tex,v retrieving revision 1.153 retrieving revision 1.154 diff -C2 -d -r1.153 -r1.154 *** libfuncs.tex 18 Nov 2003 19:48:57 -0000 1.153 --- libfuncs.tex 25 Nov 2003 21:48:21 -0000 1.154 *************** *** 61,84 **** \end{funcdesc} - \begin{funcdesc}{apply}{function, args\optional{, keywords}} - The \var{function} argument must be a callable object (a - user-defined or built-in function or method, or a class object) and - the \var{args} argument must be a sequence. The \var{function} is - called with \var{args} as the argument list; the number of arguments - is the length of the tuple. - If the optional \var{keywords} argument is present, it must be a - dictionary whose keys are strings. It specifies keyword arguments - to be added to the end of the argument list. - Calling \function{apply()} is different from just calling - \code{\var{function}(\var{args})}, since in that case there is always - exactly one argument. The use of \function{apply()} is equivalent - to \code{\var{function}(*\var{args}, **\var{keywords})}. - Use of \function{apply()} is not necessary since the ``extended call - syntax,'' as used in the last example, is completely equivalent. - - \deprecated{2.3}{Use the extended call syntax instead, as described - above.} - \end{funcdesc} - \begin{funcdesc}{basestring}{} This abstract type is the superclass for \class{str} and \class{unicode}. --- 61,64 ---- *************** *** 105,118 **** \end{funcdesc} - \begin{funcdesc}{buffer}{object\optional{, offset\optional{, size}}} - The \var{object} argument must be an object that supports the buffer - call interface (such as strings, arrays, and buffers). A new buffer - object will be created which references the \var{object} argument. - The buffer object will be a slice from the beginning of \var{object} - (or from the specified \var{offset}). The slice will extend to the - end of \var{object} (or will have a length given by the \var{size} - argument). - \end{funcdesc} - \begin{funcdesc}{callable}{object} Return true if the \var{object} argument appears callable, false if --- 85,88 ---- *************** *** 163,172 **** \end{funcdesc} - \begin{funcdesc}{coerce}{x, y} - Return a tuple consisting of the two numeric arguments converted to - a common type, using the same rules as used by arithmetic - operations. - \end{funcdesc} - \begin{funcdesc}{compile}{string, filename, kind\optional{, flags\optional{, dont_inherit}}} --- 133,136 ---- *************** *** 583,601 **** \end{funcdesc} - \begin{funcdesc}{intern}{string} - Enter \var{string} in the table of ``interned'' strings and return - the interned string -- which is \var{string} itself or a copy. - Interning strings is useful to gain a little performance on - dictionary lookup -- if the keys in a dictionary are interned, and - the lookup key is interned, the key comparisons (after hashing) can - be done by a pointer compare instead of a string compare. Normally, - the names used in Python programs are automatically interned, and - the dictionaries used to hold module, class or instance attributes - have interned keys. \versionchanged[Interned strings are not - immortal (like they used to be in Python 2.2 and before); - you must keep a reference to the return value of \function{intern()} - around to benefit from it]{2.3} - \end{funcdesc} - \begin{funcdesc}{isinstance}{object, classinfo} Return true if the \var{object} argument is an instance of the --- 547,550 ---- *************** *** 1116,1118 **** --- 1065,1135 ---- and \code{zip()} raised a \exception{TypeError} instead of returning \code{[]}]{2.4} + \end{funcdesc} + + + % --------------------------------------------------------------------------- + + + \section{Non-essential Built-in Functions \label{non-essential-built-in-funcs}} + + There are several built-in functions that are no longer essential to learn, + know or use in modern Python programming. They have been kept here to + maintain backwards compatability with programs written for older versions + of Python. + + Python programmers, trainers, students and bookwriters should feel free to + bypass these functions without concerns about missing something important. + + + \setindexsubitem{(non-essential built-in functions)} + + \begin{funcdesc}{apply}{function, args\optional{, keywords}} + The \var{function} argument must be a callable object (a + user-defined or built-in function or method, or a class object) and + the \var{args} argument must be a sequence. The \var{function} is + called with \var{args} as the argument list; the number of arguments + is the length of the tuple. + If the optional \var{keywords} argument is present, it must be a + dictionary whose keys are strings. It specifies keyword arguments + to be added to the end of the argument list. + Calling \function{apply()} is different from just calling + \code{\var{function}(\var{args})}, since in that case there is always + exactly one argument. The use of \function{apply()} is equivalent + to \code{\var{function}(*\var{args}, **\var{keywords})}. + Use of \function{apply()} is not necessary since the ``extended call + syntax,'' as used in the last example, is completely equivalent. + + \deprecated{2.3}{Use the extended call syntax instead, as described + above.} + \end{funcdesc} + + \begin{funcdesc}{buffer}{object\optional{, offset\optional{, size}}} + The \var{object} argument must be an object that supports the buffer + call interface (such as strings, arrays, and buffers). A new buffer + object will be created which references the \var{object} argument. + The buffer object will be a slice from the beginning of \var{object} + (or from the specified \var{offset}). The slice will extend to the + end of \var{object} (or will have a length given by the \var{size} + argument). + \end{funcdesc} + + \begin{funcdesc}{coerce}{x, y} + Return a tuple consisting of the two numeric arguments converted to + a common type, using the same rules as used by arithmetic + operations. + \end{funcdesc} + + \begin{funcdesc}{intern}{string} + Enter \var{string} in the table of ``interned'' strings and return + the interned string -- which is \var{string} itself or a copy. + Interning strings is useful to gain a little performance on + dictionary lookup -- if the keys in a dictionary are interned, and + the lookup key is interned, the key comparisons (after hashing) can + be done by a pointer compare instead of a string compare. Normally, + the names used in Python programs are automatically interned, and + the dictionaries used to hold module, class or instance attributes + have interned keys. \versionchanged[Interned strings are not + immortal (like they used to be in Python 2.2 and before); + you must keep a reference to the return value of \function{intern()} + around to benefit from it]{2.3} \end{funcdesc}

1 0

python/nondist/sandbox/rational Rational.py, 1.1, 1.2
by rhettinger＠users.sourceforge.net Nov. 25, 2003

Nov. 25, 2003

Update of /cvsroot/python/python/nondist/sandbox/rational In directory sc8-pr-cvs1:/tmp/cvs-serv26901 Modified Files: Rational.py Log Message: SF patch #848793: Rational bug (Submitted by Oren Tirosh) * Fix a cut-and-paste typo. Index: Rational.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/rational/Rational.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Rational.py 27 Mar 2001 16:50:10 -0000 1.1 --- Rational.py 25 Nov 2003 21:20:42 -0000 1.2 *************** *** 419,423 **** if isinstance(n, type(1.0)): n = _float_to_ratio(n) ! if isinstance(n, type(1.0)): d = _float_to_ratio(d) for arg in (n, d): --- 419,423 ---- if isinstance(n, type(1.0)): n = _float_to_ratio(n) ! if isinstance(d, type(1.0)): d = _float_to_ratio(d) for arg in (n, d):

1 0

python/dist/src/Misc NEWS,1.897,1.898
by rhettinger＠users.sourceforge.net Nov. 25, 2003

Nov. 25, 2003

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1:/tmp/cvs-serv24958/Misc Modified Files: NEWS Log Message: Expose dict_contains() and PyDict_Contains() with is about 10% faster than PySequence_Contains() and more clearly applicable to dicts. Apply the new function in setobject.c where __contains__ checking is ubiquitous. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.897 retrieving revision 1.898 diff -C2 -d -r1.897 -r1.898 *** NEWS 22 Nov 2003 23:55:50 -0000 1.897 --- NEWS 25 Nov 2003 21:12:14 -0000 1.898 *************** *** 232,235 **** --- 232,239 ---- ----- + - Added a new function, PyDict_Contains(d, k) which is like + PySequence_Contains() but is specific to dictionaries and executes + about 10% faster. + - Added three new macros: Py_RETURN_NONE, Py_RETURN_TRUE, and Py_RETURN_FALSE. Each return the singleton they mention after Py_INCREF()ing them.

1 0

python/dist/src/Doc/api concrete.tex,1.32,1.33
by rhettinger＠users.sourceforge.net Nov. 25, 2003

Nov. 25, 2003

Update of /cvsroot/python/python/dist/src/Doc/api In directory sc8-pr-cvs1:/tmp/cvs-serv24958/Doc/API Modified Files: concrete.tex Log Message: Expose dict_contains() and PyDict_Contains() with is about 10% faster than PySequence_Contains() and more clearly applicable to dicts. Apply the new function in setobject.c where __contains__ checking is ubiquitous. Index: concrete.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/api/concrete.tex,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** concrete.tex 10 Nov 2003 14:48:48 -0000 1.32 --- concrete.tex 25 Nov 2003 21:12:14 -0000 1.33 *************** *** 1809,1812 **** --- 1809,1820 ---- \end{cfuncdesc} + \begin{cfuncdesc}{int}{PyDict_Contains}{PyObject *p, PyObject *key} + Determine if dictionary \var{p} contains \var{key}. If an item + in \var{p} is matches \var{key}, return \code{1}, otherwise return + \code{0}. On error, return \code{-1}. This is equivalent to the + Python expression \samp{\var{key} in \var{p}}. + \versionadded{2.4} + \end{cfuncdesc} + \begin{cfuncdesc}{PyObject*}{PyDict_Copy}{PyObject *p} Returns a new dictionary that contains the same key-value pairs as

1 0

python/dist/src/Objects dictobject.c, 2.147, 2.148 setobject.c, 1.13, 1.14
by rhettinger＠users.sourceforge.net Nov. 25, 2003

Nov. 25, 2003

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1:/tmp/cvs-serv24958/Objects Modified Files: dictobject.c setobject.c Log Message: Expose dict_contains() and PyDict_Contains() with is about 10% faster than PySequence_Contains() and more clearly applicable to dicts. Apply the new function in setobject.c where __contains__ checking is ubiquitous. Index: dictobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/dictobject.c,v retrieving revision 2.147 retrieving revision 2.148 diff -C2 -d -r2.147 -r2.148 *** dictobject.c 1 Sep 2003 22:12:08 -0000 2.147 --- dictobject.c 25 Nov 2003 21:12:14 -0000 2.148 *************** *** 1815,1822 **** }; ! static int ! dict_contains(dictobject *mp, PyObject *key) { long hash; if (!PyString_CheckExact(key) || --- 1815,1823 ---- }; ! int ! PyDict_Contains(PyObject *op, PyObject *key) { long hash; + dictobject *mp = (dictobject *)op; if (!PyString_CheckExact(key) || *************** *** 1838,1842 **** 0, /* sq_ass_item */ 0, /* sq_ass_slice */ ! (objobjproc)dict_contains, /* sq_contains */ 0, /* sq_inplace_concat */ 0, /* sq_inplace_repeat */ --- 1839,1843 ---- 0, /* sq_ass_item */ 0, /* sq_ass_slice */ ! (objobjproc)PyDict_Contains, /* sq_contains */ 0, /* sq_inplace_concat */ 0, /* sq_inplace_repeat */ Index: setobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/setobject.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** setobject.c 24 Nov 2003 22:18:49 -0000 1.13 --- setobject.c 25 Nov 2003 21:12:14 -0000 1.14 *************** *** 144,148 **** int result; ! result = PySequence_Contains(so->data, key); if (result == -1 && PyAnySet_Check(key)) { PyErr_Clear(); --- 144,148 ---- int result; ! result = PyDict_Contains(so->data, key); if (result == -1 && PyAnySet_Check(key)) { PyErr_Clear(); *************** *** 150,154 **** if (tmp == NULL) return -1; ! result = PySequence_Contains(so->data, tmp); Py_DECREF(tmp); } --- 150,154 ---- if (tmp == NULL) return -1; ! result = PyDict_Contains(so->data, tmp); Py_DECREF(tmp); } *************** *** 253,257 **** while ((item = PyIter_Next(it)) != NULL) { ! if (PySequence_Contains(selfdata, item)) { if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { Py_DECREF(it); --- 253,257 ---- while ((item = PyIter_Next(it)) != NULL) { ! if (PyDict_Contains(selfdata, item)) { if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { Py_DECREF(it); *************** *** 293,297 **** selfdata = so->data; while ((item = PyIter_Next(it)) != NULL) { ! if (PySequence_Contains(selfdata, item)) { if (PyDict_SetItem(newdict, item, Py_True) == -1) { Py_DECREF(newdict); --- 293,297 ---- selfdata = so->data; while ((item = PyIter_Next(it)) != NULL) { ! if (PyDict_Contains(selfdata, item)) { if (PyDict_SetItem(newdict, item, Py_True) == -1) { Py_DECREF(newdict); *************** *** 376,380 **** while ((item = PyIter_Next(it)) != NULL) { ! if (!PySequence_Contains(otherdata, item)) { if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { Py_XDECREF(otherset); --- 376,380 ---- while ((item = PyIter_Next(it)) != NULL) { ! if (!PyDict_Contains(otherdata, item)) { if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { Py_XDECREF(otherset); *************** *** 482,486 **** while ((item = PyIter_Next(it)) != NULL) { ! if (PySequence_Contains(selfdata, item)) { if (PyDict_DelItem(selfdata, item) == -1) { Py_XDECREF(otherset); --- 482,486 ---- while ((item = PyIter_Next(it)) != NULL) { ! if (PyDict_Contains(selfdata, item)) { if (PyDict_DelItem(selfdata, item) == -1) { Py_XDECREF(otherset); *************** *** 542,546 **** } while ((item = PyIter_Next(it)) != NULL) { ! if (!PySequence_Contains(selfdata, item)) { if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { Py_DECREF(it); --- 542,546 ---- } while ((item = PyIter_Next(it)) != NULL) { ! if (!PyDict_Contains(selfdata, item)) { if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { Py_DECREF(it); *************** *** 563,567 **** } while ((item = PyIter_Next(it)) != NULL) { ! if (!PySequence_Contains(otherdata, item)) { if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { Py_DECREF(it); --- 563,567 ---- } while ((item = PyIter_Next(it)) != NULL) { ! if (!PyDict_Contains(otherdata, item)) { if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { Py_DECREF(it); *************** *** 635,639 **** otherdata = ((PySetObject *)other)->data; while ((item = PyIter_Next(it)) != NULL) { ! if (!PySequence_Contains(otherdata, item)) { Py_DECREF(it); Py_DECREF(item); --- 635,639 ---- otherdata = ((PySetObject *)other)->data; while ((item = PyIter_Next(it)) != NULL) { ! if (!PyDict_Contains(otherdata, item)) { Py_DECREF(it); Py_DECREF(item);

1 0