Mailman 3 October 2003 - Python-checkins

python/dist/src/Objects listobject.c,2.160,2.161
by rhettinger＠users.sourceforge.net 29 Oct '03

29 Oct '03

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1:/tmp/cvs-serv6236/Objects Modified Files: listobject.c Log Message: Add list.sorted() classmethod. Index: listobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v retrieving revision 2.160 retrieving revision 2.161 diff -C2 -d -r2.160 -r2.161 *** listobject.c 16 Oct 2003 17:16:30 -0000 2.160 --- listobject.c 29 Oct 2003 06:54:43 -0000 2.161 *************** *** 2002,2005 **** --- 2002,2037 ---- static PyObject * + listsorted(PyObject *cls, PyObject *args, PyObject *kwds) + { + PyObject *newlist, *v, *seq, *compare=NULL, *keyfunc=NULL, *newargs; + static char *kwlist[] = {"iterable", "cmp", "key", "reverse", 0}; + long reverse; + + if (args != NULL) { + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|OOi:sorted", + kwlist, &seq, &compare, &keyfunc, &reverse)) + return NULL; + } + + newlist = PyObject_CallFunctionObjArgs(cls, seq, NULL); + if (newlist == NULL) + return NULL; + + newargs = PyTuple_GetSlice(args, 1, 4); + if (newargs == NULL) { + Py_DECREF(newlist); + return NULL; + } + v = listsort((PyListObject *)newlist, newargs, kwds); + Py_DECREF(newargs); + if (v == NULL) { + Py_DECREF(newlist); + return NULL; + } + Py_DECREF(v); + return newlist; + } + + static PyObject * listreverse(PyListObject *self) { *************** *** 2336,2339 **** --- 2368,2374 ---- "L.sort(cmp=None, key=None, reverse=False) -- stable sort *IN PLACE*;\n\ cmp(x, y) -> -1, 0, 1"); + PyDoc_STRVAR(sorted_doc, + "list.sorted(iterable, cmp=None, key=None, reverse=False) --> new sorted list;\n\ + cmp(x, y) -> -1, 0, 1"); static PyMethodDef list_methods[] = { *************** *** 2347,2350 **** --- 2382,2387 ---- {"reverse", (PyCFunction)listreverse, METH_NOARGS, reverse_doc}, {"sort", (PyCFunction)listsort, METH_VARARGS | METH_KEYWORDS, sort_doc}, + {"sorted", (PyCFunction)listsorted, + METH_VARARGS | METH_KEYWORDS | METH_CLASS, sorted_doc}, {NULL, NULL} /* sentinel */ };

1 0

python/dist/src/Lib/test test_sort.py,1.5,1.6
by rhettinger＠users.sourceforge.net 29 Oct '03

29 Oct '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv6236/Lib/test Modified Files: test_sort.py Log Message: Add list.sorted() classmethod. Index: test_sort.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_sort.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** test_sort.py 16 Oct 2003 03:41:09 -0000 1.5 --- test_sort.py 29 Oct 2003 06:54:42 -0000 1.6 *************** *** 1,4 **** --- 1,6 ---- from test.test_support import verbose import random + from UserList import UserList + from sets import Set nerrors = 0 *************** *** 191,194 **** --- 193,197 ---- data.sort(reverse=True) self.assertEqual(data, range(99,-1,-1)) + self.assertRaises(TypeError, data.sort, "wrong type") def test_reverse_stability(self): *************** *** 202,205 **** --- 205,262 ---- self.assertEqual(data, copy2) + class TestSorted(unittest.TestCase): + + def test_basic(self): + data = range(100) + copy = data[:] + random.shuffle(copy) + self.assertEqual(data, list.sorted(copy)) + self.assertNotEqual(data, copy) + + data.reverse() + random.shuffle(copy) + self.assertEqual(data, list.sorted(copy, cmp=lambda x, y: cmp(y,x))) + self.assertNotEqual(data, copy) + random.shuffle(copy) + self.assertEqual(data, list.sorted(copy, key=lambda x: -x)) + self.assertNotEqual(data, copy) + random.shuffle(copy) + self.assertEqual(data, list.sorted(copy, reverse=1)) + self.assertNotEqual(data, copy) + + def test_inputtypes(self): + s = 'abracadabra' + for T in [unicode, list, tuple]: + self.assertEqual(list.sorted(s), list.sorted(T(s))) + + s = ''.join(dict.fromkeys(s).keys()) # unique letters only + for T in [unicode, Set, list, tuple, dict.fromkeys]: + self.assertEqual(list.sorted(s), list.sorted(T(s))) + + def test_baddecorator(self): + data = 'The quick Brown fox Jumped over The lazy Dog'.split() + self.assertRaises(TypeError, list.sorted, data, None, lambda x,y: 0) + + def classmethods(self): + s = "hello world" + a = list.sorted(s) + b = UserList.sorted(s) + c = [].sorted(s) + d = UserList().sorted(s) + class Mylist(list): + def __new__(cls): + return UserList() + e = MyList.sorted(s) + f = MyList().sorted(s) + class Myuserlist(UserList): + def __new__(cls): + return [] + g = MyList.sorted(s) + h = MyList().sorted(s) + self.assert_(a == b == c == d == e == f == g == h) + self.assert_(b.__class__ == d.__class__ == UserList) + self.assert_(e.__class__ == f.__class__ == MyList) + self.assert_(g.__class__ == h.__class__ == Myuserlist) + #============================================================================== *************** *** 207,210 **** --- 264,268 ---- test_classes = ( TestDecorateSortUndecorate, + TestSorted, TestBugs, )

1 0

python/dist/src/Lib UserList.py,1.20,1.21
by rhettinger＠users.sourceforge.net 29 Oct '03

29 Oct '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv6236/Lib Modified Files: UserList.py Log Message: Add list.sorted() classmethod. Index: UserList.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/UserList.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** UserList.py 16 Oct 2003 05:53:16 -0000 1.20 --- UserList.py 29 Oct 2003 06:54:42 -0000 1.21 *************** *** 79,82 **** --- 79,87 ---- def reverse(self): self.data.reverse() def sort(self, *args, **kwds): self.data.sort(*args, **kwds) + def sorted(cls, iterable, *args, **kwds): + s = cls(iterable) + s.sort(*args, **kwds) + return s + sorted = classmethod(sorted) def extend(self, other): if isinstance(other, UserList):

1 0

python/dist/src/Doc/lib libstdtypes.tex, 1.138, 1.139
by rhettinger＠users.sourceforge.net 29 Oct '03

29 Oct '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv6236/Doc/lib Modified Files: libstdtypes.tex Log Message: Add list.sorted() classmethod. Index: libstdtypes.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libstdtypes.tex,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** libstdtypes.tex 22 Oct 2003 02:56:40 -0000 1.138 --- libstdtypes.tex 29 Oct 2003 06:54:42 -0000 1.139 *************** *** 630,634 **** \begin{methoddesc}[string]{istitle}{} Return true if the string is a titlecased string and there is at least one ! character, i.e. uppercase characters may only follow uncased characters and lowercase characters only cased ones. Return false otherwise. --- 630,634 ---- \begin{methoddesc}[string]{istitle}{} Return true if the string is a titlecased string and there is at least one ! character, for example uppercase characters may only follow uncased characters and lowercase characters only cased ones. Return false otherwise. *************** *** 976,979 **** --- 976,982 ---- \optional{, \var{reverse}=False}}})} {sort the items of \var{s} in place}{(7), (8), (9), (10)} + \lineiii{\var{s}.sorted(\var{iterable}\optional{, \var{cmp}=None\optional{, \var{key}=None + \optional{, \var{reverse}=False}}})} + {return a new sorted list from the items in \var{iterable}}{(8), (9), (11)} \end{tableiii} \indexiv{operations on}{mutable}{sequence}{types} *************** *** 1025,1030 **** the sorted or reversed list. ! \item[(8)] The \method{sort()} method takes optional arguments for ! controlling the comparisions. \var{cmp} specifies a custom comparison function of two arguments --- 1028,1033 ---- the sorted or reversed list. ! \item[(8)] The \method{sort()} and \method{sorted()} methods take optional ! arguments for controlling the comparisions. \var{cmp} specifies a custom comparison function of two arguments *************** *** 1053,1057 **** \item[(9)] Starting with Python 2.3, the \method{sort()} method is ! guaranteed to be stable. A sort is stable if it guarantees not to change the relative order of elements that compare equal --- this is helpful for sorting in multiple passes (for example, sort by --- 1056,1061 ---- \item[(9)] Starting with Python 2.3, the \method{sort()} method is ! guaranteed to be stable. Starting with Python 2.4, the \method{sorted()} ! method is also guaranteed to be stable. A sort is stable if it does not change the relative order of elements that compare equal --- this is helpful for sorting in multiple passes (for example, sort by *************** *** 1063,1066 **** --- 1067,1073 ---- \exception{ValueError} if it can detect that the list has been mutated during a sort. + + \item[(11)] \method{sorted()} is a class method that returns a new list. + \versionadded{2.4} \end{description}

1 0

python/dist/src/Doc/lib libposixpath.tex, 1.36.12.1, 1.36.12.2
by rhettinger＠users.sourceforge.net 29 Oct '03

29 Oct '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv19808 Modified Files: Tag: release23-maint libposixpath.tex Log Message: SF bug #827902: ctime is not creation time New fix for this bug recognizes differing definitions on various systems. Index: libposixpath.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libposixpath.tex,v retrieving revision 1.36.12.1 retrieving revision 1.36.12.2 diff -C2 -d -r1.36.12.1 -r1.36.12.2 *** libposixpath.tex 27 Oct 2003 20:03:22 -0000 1.36.12.1 --- libposixpath.tex 29 Oct 2003 00:47:11 -0000 1.36.12.2 *************** *** 85,90 **** \begin{funcdesc}{getctime}{path} ! Return the time of most recent content modification or metadata change ! for \var{path}. The return value is a number giving the number of seconds since the epoch (see the \refmodule{time} module). Raise \exception{os.error} if the file does --- 85,91 ---- \begin{funcdesc}{getctime}{path} ! Return the system's ctime which, on some systems (like \UNIX) is the ! time of the last change, and, on others (like Windows), is the ! creation time for \var{path}. The return value is a number giving the number of seconds since the epoch (see the \refmodule{time} module). Raise \exception{os.error} if the file does

1 0

python/dist/src/Doc/lib libposixpath.tex, 1.37, 1.38
by rhettinger＠users.sourceforge.net 29 Oct '03

29 Oct '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv19311 Modified Files: libposixpath.tex Log Message: SF bug #827902: ctime is not creation time New fix for this bug recognizes differing definitions on various systems. Index: libposixpath.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libposixpath.tex,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** libposixpath.tex 27 Oct 2003 20:00:36 -0000 1.37 --- libposixpath.tex 29 Oct 2003 00:46:19 -0000 1.38 *************** *** 85,90 **** \begin{funcdesc}{getctime}{path} ! Return the time of most recent content modification or metadata change ! for \var{path}. The return value is a number giving the number of seconds since the epoch (see the \refmodule{time} module). Raise \exception{os.error} if the file does --- 85,91 ---- \begin{funcdesc}{getctime}{path} ! Return the system's ctime which, on some systems (like \UNIX) is the ! time of the last change, and, on others (like Windows), is the ! creation time for \var{path}. The return value is a number giving the number of seconds since the epoch (see the \refmodule{time} module). Raise \exception{os.error} if the file does

1 0

python/nondist/peps pep-0322.txt,1.8,1.9
by rhettinger＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv29959 Modified Files: pep-0322.txt Log Message: No one likes the name inreverse(). Index: pep-0322.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0322.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pep-0322.txt 28 Oct 2003 21:21:31 -0000 1.8 --- pep-0322.txt 28 Oct 2003 22:39:22 -0000 1.9 *************** *** 47,51 **** ======== ! Add a builtin function called *inreverse()* that makes a reverse iterator over sequence objects that support __getitem__() and __len__(). --- 47,51 ---- ======== ! Add a builtin function called *ireverse()* that makes a reverse iterator over sequence objects that support __getitem__() and __len__(). *************** *** 53,71 **** The above examples then simplify to:: ! for i in inreverse(xrange(n)): print seqn[i] :: ! for elem in inreverse(seqn): print elem The core idea is that the clearest, least error-prone way of specifying reverse iteration is to specify it in a forward direction and then say ! *inreverse*. The implementation could be as simple as:: ! def inreverse(x): i = len(x) while i > 0: --- 53,71 ---- The above examples then simplify to:: ! for i in ireverse(xrange(n)): print seqn[i] :: ! for elem in ireverse(seqn): print elem The core idea is that the clearest, least error-prone way of specifying reverse iteration is to specify it in a forward direction and then say ! *ireverse*. The implementation could be as simple as:: ! def ireverse(x): i = len(x) while i > 0: *************** *** 84,88 **** * *backwards* -- more pithy, less explicit ! * *ireverse* -- reminiscent of imap(), izip(), and ifilter() --- 84,91 ---- * *backwards* -- more pithy, less explicit ! * *inreverse* -- no one seems to like this one except me ! ! The name *reverse* is not a candidate because it duplicates the name ! of the list.reverse() which mutates the underlying list. *************** *** 90,94 **** ============== ! Objects may optionally provide an *__inreverse__* method that returns a custom reverse iterator. --- 93,97 ---- ============== ! Objects may optionally provide an *__ireverse__* method that returns a custom reverse iterator. *************** *** 141,145 **** be run in a forward direction but is less intuitive and rarely presented that way in literature. The replacement code ! ``for i in inreverse(xrange(1, len(x)))`` is much easier to verify visually. --- 144,148 ---- be run in a forward direction but is less intuitive and rarely presented that way in literature. The replacement code ! ``for i in ireverse(xrange(1, len(x)))`` is much easier to verify visually. *************** *** 159,163 **** A simpler, but limited alternative is to create a builtin that takes the same arguments as range() but returns a reverse iterator over the ! range. The idea is that much of the benefit of inreverse() comes reducing the intellectual effort it takes to express the arguments for [x]range() when going backwards. A good name is needed for this --- 162,166 ---- A simpler, but limited alternative is to create a builtin that takes the same arguments as range() but returns a reverse iterator over the ! range. The idea is that much of the benefit of ireverse() comes reducing the intellectual effort it takes to express the arguments for [x]range() when going backwards. A good name is needed for this *************** *** 168,172 **** ==================== ! Several variants were submitted that attempted to apply inreverse() to all iterables by running the iterable to completion, saving the results, and then returning a reverse iterator over the results. --- 171,175 ---- ==================== ! Several variants were submitted that attempted to apply ireverse() to all iterables by running the iterable to completion, saving the results, and then returning a reverse iterator over the results.

1 0

python/dist/src/Lib/idlelib aboutDialog.py, 1.13, 1.13.8.1
by nnorwitz＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1:/tmp/cvs-serv20744/Lib/idlelib Modified Files: Tag: release23-maint aboutDialog.py Log Message: SF #775057, fix IDLE problem in about dialog If the file doesn't exist, the code to display an error message was broken Index: aboutDialog.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/aboutDialog.py,v retrieving revision 1.13 retrieving revision 1.13.8.1 diff -C2 -d -r1.13 -r1.13.8.1 *** aboutDialog.py 16 Jun 2003 18:46:42 -0000 1.13 --- aboutDialog.py 28 Oct 2003 21:58:26 -0000 1.13.8.1 *************** *** 140,146 **** textFile = codecs.open(fn, 'r') except IOError: tkMessageBox.showerror(title='File Load Error', message='Unable to load file '+ ! `fileName`+' .') return else: --- 140,148 ---- textFile = codecs.open(fn, 'r') except IOError: + import tkMessageBox tkMessageBox.showerror(title='File Load Error', message='Unable to load file '+ ! `fn`+' .', ! parent=self) return else:

1 0

python/dist/src/Lib/idlelib aboutDialog.py, 1.13, 1.14
by nnorwitz＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1:/tmp/cvs-serv20351/Lib/idlelib Modified Files: aboutDialog.py Log Message: SF #775057, fix IDLE problem in about dialog If the file doesn't exist, the code to display an error message was broken Will backport. Index: aboutDialog.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/aboutDialog.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** aboutDialog.py 16 Jun 2003 18:46:42 -0000 1.13 --- aboutDialog.py 28 Oct 2003 21:57:10 -0000 1.14 *************** *** 140,146 **** textFile = codecs.open(fn, 'r') except IOError: tkMessageBox.showerror(title='File Load Error', message='Unable to load file '+ ! `fileName`+' .') return else: --- 140,148 ---- textFile = codecs.open(fn, 'r') except IOError: + import tkMessageBox tkMessageBox.showerror(title='File Load Error', message='Unable to load file '+ ! `fn`+' .', ! parent=self) return else:

1 0

python/nondist/peps pep-0322.txt,1.7,1.8
by rhettinger＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv13072 Modified Files: pep-0322.txt Log Message: The alternative builtin needed a better name. Index: pep-0322.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0322.txt,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pep-0322.txt 28 Oct 2003 20:40:56 -0000 1.7 --- pep-0322.txt 28 Oct 2003 21:21:31 -0000 1.8 *************** *** 157,165 **** ================== ! A simpler, but limited alternative is to create a builtin called ! reverse_range() that takes the same arguments as range() but returns a ! reverse iterator over the range. The idea is that much of the benefit ! of inreverse() comes reducing the intellectual effort it takes to ! express the arguments for [x]range() when going backwards. --- 157,166 ---- ================== ! A simpler, but limited alternative is to create a builtin that takes ! the same arguments as range() but returns a reverse iterator over the ! range. The idea is that much of the benefit of inreverse() comes ! reducing the intellectual effort it takes to express the arguments for ! [x]range() when going backwards. A good name is needed for this ! alternative -- revrange() is cleanest so far.

1 0