Mailman 3 October 2003 - Python-checkins

python/dist/src/Include ceval.h,2.49,2.50
by arigo＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1:/tmp/cvs-serv30659/Include Modified Files: ceval.h Log Message: Deleting cyclic object comparison. SF patch 825639 http://mail.python.org/pipermail/python-dev/2003-October/039445.html Index: ceval.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/ceval.h,v retrieving revision 2.49 retrieving revision 2.50 diff -C2 -d -r2.49 -r2.50 *** ceval.h 20 Feb 2003 17:59:17 -0000 2.49 --- ceval.h 28 Oct 2003 12:05:46 -0000 2.50 *************** *** 44,49 **** --- 44,63 ---- PyAPI_FUNC(int) Py_MakePendingCalls(void); + /* Protection against deeply nested recursive calls */ PyAPI_FUNC(void) Py_SetRecursionLimit(int); PyAPI_FUNC(int) Py_GetRecursionLimit(void); + + #define Py_EnterRecursiveCall(where) \ + (_Py_MakeRecCheck(PyThreadState_GET()->recursion_depth) && \ + _Py_CheckRecursiveCall(where)) + #define Py_LeaveRecursiveCall() \ + (--PyThreadState_GET()->recursion_depth) + PyAPI_FUNC(int) _Py_CheckRecursiveCall(char *where); + PyAPI_DATA(int) _Py_CheckRecursionLimit; + #ifdef USE_STACKCHECK + # define _Py_MakeRecCheck(x) (++(x) > --_Py_CheckRecursionLimit) + #else + # define _Py_MakeRecCheck(x) (++(x) > _Py_CheckRecursionLimit) + #endif PyAPI_FUNC(char *) PyEval_GetFuncName(PyObject *);

1 0

python/dist/src/Lib/test pickletester.py, 1.55, 1.56 test_builtin.py, 1.23, 1.24 test_copy.py, 1.11, 1.12 test_richcmp.py, 1.9, 1.10
by arigo＠users.sourceforge.net 28 Oct '03

28 Oct '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv30659/Lib/test Modified Files: pickletester.py test_builtin.py test_copy.py test_richcmp.py Log Message: Deleting cyclic object comparison. SF patch 825639 http://mail.python.org/pipermail/python-dev/2003-October/039445.html Index: pickletester.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/pickletester.py,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** pickletester.py 2 Mar 2003 13:53:18 -0000 1.55 --- pickletester.py 28 Oct 2003 12:05:47 -0000 1.56 *************** *** 425,431 **** s = self.dumps(l, proto) x = self.loads(s) ! self.assertEqual(x, l) ! self.assertEqual(x, x[0]) ! self.assertEqual(id(x), id(x[0])) def test_recursive_dict(self): --- 425,430 ---- s = self.dumps(l, proto) x = self.loads(s) ! self.assertEqual(len(x), 1) ! self.assert_(x is x[0]) def test_recursive_dict(self): *************** *** 435,441 **** s = self.dumps(d, proto) x = self.loads(s) ! self.assertEqual(x, d) ! self.assertEqual(x[1], x) ! self.assertEqual(id(x[1]), id(x)) def test_recursive_inst(self): --- 434,439 ---- s = self.dumps(d, proto) x = self.loads(s) ! self.assertEqual(x.keys(), [1]) ! self.assert_(x[1] is x) def test_recursive_inst(self): *************** *** 445,451 **** s = self.dumps(i, 2) x = self.loads(s) ! self.assertEqual(x, i) ! self.assertEqual(x.attr, x) ! self.assertEqual(id(x.attr), id(x)) def test_recursive_multi(self): --- 443,448 ---- s = self.dumps(i, 2) x = self.loads(s) ! self.assertEqual(dir(x), dir(i)) ! self.assert_(x.attr is x) def test_recursive_multi(self): *************** *** 458,467 **** s = self.dumps(l, proto) x = self.loads(s) ! self.assertEqual(x, l) ! self.assertEqual(x[0], i) ! self.assertEqual(x[0].attr, d) ! self.assertEqual(x[0].attr[1], x) ! self.assertEqual(x[0].attr[1][0], i) ! self.assertEqual(x[0].attr[1][0].attr, d) def test_garyp(self): --- 455,462 ---- s = self.dumps(l, proto) x = self.loads(s) ! self.assertEqual(len(x), 1) ! self.assertEqual(dir(x[0]), dir(i)) ! self.assertEqual(x[0].attr.keys(), [1]) ! self.assert_(x[0].attr[1] is x) def test_garyp(self): Index: test_builtin.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_builtin.py,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** test_builtin.py 15 Aug 2003 17:52:39 -0000 1.23 --- test_builtin.py 28 Oct 2003 12:05:47 -0000 1.24 *************** *** 168,181 **** self.assertEqual(cmp(1, -1), 1) self.assertEqual(cmp(1, 1), 0) ! # verify that circular objects are handled a = []; a.append(a) b = []; b.append(b) from UserList import UserList c = UserList(); c.append(c) ! self.assertEqual(cmp(a, b), 0) ! self.assertEqual(cmp(b, c), 0) ! self.assertEqual(cmp(c, a), 0) ! self.assertEqual(cmp(a, c), 0) ! # okay, now break the cycles a.pop(); b.pop(); c.pop() self.assertRaises(TypeError, cmp) --- 168,181 ---- self.assertEqual(cmp(1, -1), 1) self.assertEqual(cmp(1, 1), 0) ! # verify that circular objects are not handled a = []; a.append(a) b = []; b.append(b) from UserList import UserList c = UserList(); c.append(c) ! self.assertRaises(RuntimeError, cmp, a, b) ! self.assertRaises(RuntimeError, cmp, b, c) ! self.assertRaises(RuntimeError, cmp, c, a) ! self.assertRaises(RuntimeError, cmp, a, c) ! # okay, now break the cycles a.pop(); b.pop(); c.pop() self.assertRaises(TypeError, cmp) Index: test_copy.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_copy.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** test_copy.py 14 Jun 2003 07:10:06 -0000 1.11 --- test_copy.py 28 Oct 2003 12:05:47 -0000 1.12 *************** *** 273,280 **** x.append(x) y = copy.deepcopy(x) ! self.assertEqual(y, x) self.assert_(y is not x) ! self.assert_(y[0] is not x[0]) ! self.assert_(y is y[0]) def test_deepcopy_tuple(self): --- 273,280 ---- x.append(x) y = copy.deepcopy(x) ! self.assertRaises(RuntimeError, cmp, y, x) self.assert_(y is not x) ! self.assert_(y[0] is y) ! self.assertEqual(len(y), 1) def test_deepcopy_tuple(self): *************** *** 289,293 **** x[0].append(x) y = copy.deepcopy(x) ! self.assertEqual(y, x) self.assert_(y is not x) self.assert_(y[0] is not x[0]) --- 289,293 ---- x[0].append(x) y = copy.deepcopy(x) ! self.assertRaises(RuntimeError, cmp, y, x) self.assert_(y is not x) self.assert_(y[0] is not x[0]) *************** *** 305,312 **** x['foo'] = x y = copy.deepcopy(x) ! self.assertEqual(y, x) self.assert_(y is not x) self.assert_(y['foo'] is y) ! self.assertEqual(y, {'foo': y}) def test_deepcopy_keepalive(self): --- 305,312 ---- x['foo'] = x y = copy.deepcopy(x) ! self.assertRaises(RuntimeError, cmp, y, x) self.assert_(y is not x) self.assert_(y['foo'] is y) ! self.assertEqual(len(y), 1) def test_deepcopy_keepalive(self): Index: test_richcmp.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_richcmp.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** test_richcmp.py 1 May 2003 17:45:47 -0000 1.9 --- test_richcmp.py 28 Oct 2003 12:05:47 -0000 1.10 *************** *** 225,279 **** def test_recursion(self): ! # Check comparison for recursive objects from UserList import UserList - a = UserList(); a.append(a) - b = UserList(); b.append(b) - - self.assert_(a == b) - self.assert_(not a != b) - a.append(1) - self.assert_(a == a[0]) - self.assert_(not a != a[0]) - self.assert_(a != b) - self.assert_(not a == b) - b.append(0) - self.assert_(a != b) - self.assert_(not a == b) - a[1] = -1 - self.assert_(a != b) - self.assert_(not a == b) - a = UserList() b = UserList() a.append(b) b.append(a) ! self.assert_(a == b) ! self.assert_(not a != b) b.append(17) self.assert_(a != b) ! self.assert_(not a == b) a.append(17) ! self.assert_(a == b) ! self.assert_(not a != b) ! ! def test_recursion2(self): ! # This test exercises the circular structure handling code ! # in PyObject_RichCompare() ! class Weird(object): ! def __eq__(self, other): ! return self != other ! def __ne__(self, other): ! return self == other ! def __lt__(self, other): ! return self > other ! def __gt__(self, other): ! return self < other ! ! self.assert_(Weird() == Weird()) ! self.assert_(not (Weird() != Weird())) ! ! for op in opmap["lt"]: ! self.assertRaises(ValueError, op, Weird(), Weird()) class DictTest(unittest.TestCase): --- 225,258 ---- def test_recursion(self): ! # Check that comparison for recursive objects fails gracefully from UserList import UserList a = UserList() b = UserList() a.append(b) b.append(a) ! self.assertRaises(RuntimeError, operator.eq, a, b) ! self.assertRaises(RuntimeError, operator.ne, a, b) ! self.assertRaises(RuntimeError, operator.lt, a, b) ! self.assertRaises(RuntimeError, operator.le, a, b) ! self.assertRaises(RuntimeError, operator.gt, a, b) ! self.assertRaises(RuntimeError, operator.ge, a, b) b.append(17) + # Even recursive lists of different lengths are different, + # but they cannot be ordered + self.assert_(not (a == b)) self.assert_(a != b) ! self.assertRaises(RuntimeError, operator.lt, a, b) ! self.assertRaises(RuntimeError, operator.le, a, b) ! self.assertRaises(RuntimeError, operator.gt, a, b) ! self.assertRaises(RuntimeError, operator.ge, a, b) a.append(17) ! self.assertRaises(RuntimeError, operator.eq, a, b) ! self.assertRaises(RuntimeError, operator.ne, a, b) ! a.insert(0, 11) ! b.insert(0, 12) ! self.assert_(not (a == b)) ! self.assert_(a != b) ! self.assert_(a < b) class DictTest(unittest.TestCase):

1 0

python/nondist/peps pep-0000.txt, 1.255, 1.256 pep-0322.txt, 1.5, 1.6
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-serv12216 Modified Files: pep-0000.txt pep-0322.txt Log Message: Update the reverse iteration pep to reflect comments from comp.lang.python, from Guido, and from some on python-dev. Index: pep-0000.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v retrieving revision 1.255 retrieving revision 1.256 diff -C2 -d -r1.255 -r1.256 *** pep-0000.txt 27 Oct 2003 15:01:08 -0000 1.255 --- pep-0000.txt 28 Oct 2003 10:16:31 -0000 1.256 *************** *** 119,123 **** S 319 Python Synchronize/Asynchronize Block Pelletier S 321 Date/Time Parsing and Formatting Kuchling ! S 322 Reverse Iteration Methods Hettinger S 323 Copyable Iterators Martelli S 754 IEEE 754 Floating Point Special Values Warnes --- 119,123 ---- S 319 Python Synchronize/Asynchronize Block Pelletier S 321 Date/Time Parsing and Formatting Kuchling ! S 322 Reverse Iteration Hettinger S 323 Copyable Iterators Martelli S 754 IEEE 754 Floating Point Special Values Warnes *************** *** 338,342 **** I 320 Python 2.4 Release Schedule Warsaw S 321 Date/Time Parsing and Formatting Kuchling ! S 322 Reverse Iteration Methods Hettinger SR 666 Reject Foolish Indentation Creighton S 754 IEEE 754 Floating Point Special Values Warnes --- 338,342 ---- I 320 Python 2.4 Release Schedule Warsaw S 321 Date/Time Parsing and Formatting Kuchling ! S 322 Reverse Iteration Hettinger SR 666 Reject Foolish Indentation Creighton S 754 IEEE 754 Floating Point Special Values Warnes Index: pep-0322.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0322.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pep-0322.txt 28 Sep 2003 02:43:37 -0000 1.5 --- pep-0322.txt 28 Oct 2003 10:16:32 -0000 1.6 *************** *** 1,4 **** PEP: 322 ! Title: Reverse Iteration Methods Version: $Revision$ Last-Modified: $Date$ --- 1,4 ---- PEP: 322 ! Title: Reverse Iteration Version: $Revision$ Last-Modified: $Date$ *************** *** 15,20 **** ======== ! This proposal is to extend the API of several sequence types ! to include a method for iterating over the sequence in reverse. --- 15,20 ---- ======== ! This proposal is to add a builtin function to support reverse ! iteration over sequences. *************** *** 47,66 **** ======== ! Add a method called *iterreverse()* to sequence objects that can ! benefit from it. The above examples then simplify to:: ! for i in xrange(n).iterreverse(): print seqn[i] :: ! for elem in seqn.iterreverse(): print elem ! The new protocol would be applied to lists, tuples, strings, and ! xrange objects. It would not apply to unordered collections like ! dicts and sets. ! No language syntax changes are needed. --- 47,81 ---- ======== ! Add a builtin function called *inreverse()* that makes a reverse ! iterator over sequence objects that support __getitem__() and ! __len__(). ! 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: ! i -= 1 ! yield x[i] ! ! If *x* is a mapping, the implementation should return a ValueError with ! a message noting that reverse iteration is undefined for mappings. ! ! No language syntax changes are needed. The proposal is fully backwards ! compatible. *************** *** 68,91 **** ======================== - * *iterbackwards* -- like iteritems() but somewhat long * *backwards* -- more pithy, less explicit * *ireverse* -- reminiscent of imap(), izip(), and ifilter() ! Other Issues ! ============ ! * Should *tuple* objects be included? In the past, they have been ! denied some list like behaviors such as count() and index(). I ! prefer that it be included. ! * Should *file* objects be included? Implementing reverse iteration ! may not be easy though it would be useful on occasion. I think ! this one should be skipped. ! * Should *enumerate* objects be included? They can provide reverse ! iteration only when the underlying sequences support *__len__* ! and reverse iteration. I think this can be saved for another ! day if the need arises. --- 83,102 ---- ======================== * *backwards* -- more pithy, less explicit * *ireverse* -- reminiscent of imap(), izip(), and ifilter() ! Custom Reverse ! ============== ! Objects may optionally provide an *__inreverse__* method that returns ! a custom reverse iterator. ! This allows reverse() to be applied to objects that do not have ! __getitem__() and __len__() but still have some useful way of ! providing reverse iteration. ! Using this protocol, enumerate() can be extended to support reversal ! whenever the underlying iterator supports it also. *************** *** 102,138 **** . . . ! The application dictates the need to run exit handlers in the ! reverse order they were built. The ``while alist: alist.pop()`` ! form is readable and clean; however, it would be slightly faster ! and clearer with:: ! ! for func, target, kargs in _exithandlers.iterreverse(): ! . . . ! del _exithandlers ! ! Note, if the order of deletion is important, then the first form ! is still needed. ! ! * difflib.get_close_matches() uses:: ! ! result.sort() # Retain only the best n. ! result = result[-n:] # Move best-scorer to head of list. ! result.reverse() # Strip scores. ! return [x for score, x in result] ! ! The need for reverse iteration arises from a requirement to return ! a portion of a sort in an order opposite of the sort criterion. The ! list comprehension is incidental (the third step of a Schwartzian ! transform). This particular use case can met with extended slicing, ! but the code is somewhat unattractive, hard to visually verify, ! and difficult for beginners to construct:: ! ! result.sort() ! return [x for score, x in result[:-n-1:-1]] ! ! The proposed form is much easier to construct and verify:: ! ! result.sort() ! return [x for score, x in result[-n:].iterreverse()] * heapq.heapify() uses ``for i in xrange(n//2 - 1, -1, -1)`` because --- 113,118 ---- . . . ! In this application popping is required, so the new function would ! not help. * heapq.heapify() uses ``for i in xrange(n//2 - 1, -1, -1)`` because *************** *** 161,166 **** be run in a forward direction but is less intuitive and rarely presented that way in literature. The replacement code ! ``for i in xrange(1, len(x)).iterreverse()`` is much easier ! to mentally verify. * rfc822.Message.__delitem__() uses:: --- 141,146 ---- 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. * rfc822.Message.__delitem__() uses:: *************** *** 174,203 **** ! Alternative Ideas ! ================= ! ! * Add a builtin function, *riter()* which calls a magic method, ! *__riter__*. I see this as more overhead for no additional benefit. ! ! * Several variants were submitted that provided fallback behavior ! when *__riter__* is not defined: ! ! - fallback to: ``for i in xrange(len(obj)-1,-1,-1): yield obj[i]`` ! - fallback to: ``for i in itertools.count(): yield obj[-i]`` ! - fallback to: ``tmp=list(obj); tmp.reverse(); return iter(tmp)`` ! ! All of these attempt to save implementing some object methods at the ! expense of adding a new builtin function and of creating a new magic ! method name. ! ! The approaches using *__getitem__()* are slower than using a custom ! method for each object. Also, the *__getitem__()* variants produce ! bizarre results when applied to mappings. ! ! All of the variants crash when applied to an infinite iterator. ! The last variant can invisibly slip into a low performance mode ! (in terms of time and memory) which could be made more visible with ! an explicit ``ro=list(obj); ro.reverse()``. --- 154,167 ---- ! Rejected Alternative ! ==================== ! 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. ! While satisfying some notions of full generality, running the input ! to the end is contrary to the purpose of using iterators ! in the first place. Also, a small disaster ensues if the underlying ! iterator is infinite.

1 0

python/dist/src/Modules itertoolsmodule.c, 1.24, 1.25
by rhettinger＠users.sourceforge.net 27 Oct '03

27 Oct '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv20751 Modified Files: itertoolsmodule.c Log Message: Fix nits in error messages. Index: itertoolsmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/itertoolsmodule.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** itertoolsmodule.c 26 Oct 2003 14:25:56 -0000 1.24 --- itertoolsmodule.c 28 Oct 2003 07:32:28 -0000 1.25 *************** *** 768,772 **** PyErr_Clear(); PyErr_SetString(PyExc_ValueError, ! "Stop argument must be an integer or None."); return NULL; } --- 768,772 ---- PyErr_Clear(); PyErr_SetString(PyExc_ValueError, ! "Stop argument must be a non-negative integer or None."); return NULL; } *************** *** 777,781 **** PyErr_Clear(); PyErr_SetString(PyExc_ValueError, ! "Start argument must be an integer."); return NULL; } --- 777,781 ---- PyErr_Clear(); PyErr_SetString(PyExc_ValueError, ! "Start argument must be a non-negative integer."); return NULL; } *************** *** 786,790 **** PyErr_Clear(); PyErr_SetString(PyExc_ValueError, ! "Stop argument must be an integer or None."); return NULL; } --- 786,790 ---- PyErr_Clear(); PyErr_SetString(PyExc_ValueError, ! "Stop argument must be a non-negative integer or None."); return NULL; } *************** *** 794,798 **** if (start<0 || stop<-1) { PyErr_SetString(PyExc_ValueError, ! "Indices for islice() must be positive."); return NULL; } --- 794,798 ---- if (start<0 || stop<-1) { PyErr_SetString(PyExc_ValueError, ! "Indices for islice() must be non-negative integers."); return NULL; }

1 0

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

27 Oct '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv5782 Modified Files: Tag: release23-maint libposixpath.tex Log Message: SF bug #827902: ctime is not creation time Document the correct definition of os.path.getctime() Index: libposixpath.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libposixpath.tex,v retrieving revision 1.36 retrieving revision 1.36.12.1 diff -C2 -d -r1.36 -r1.36.12.1 *** libposixpath.tex 25 Apr 2003 15:12:47 -0000 1.36 --- libposixpath.tex 27 Oct 2003 20:03:22 -0000 1.36.12.1 *************** *** 85,89 **** \begin{funcdesc}{getctime}{path} ! Return the time of creation of \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,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

1 0

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

27 Oct '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv5180 Modified Files: libposixpath.tex Log Message: SF bug #827902: ctime is not creation time Document the correct definition of os.path.getctime() Index: libposixpath.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libposixpath.tex,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** libposixpath.tex 25 Apr 2003 15:12:47 -0000 1.36 --- libposixpath.tex 27 Oct 2003 20:00:36 -0000 1.37 *************** *** 85,89 **** \begin{funcdesc}{getctime}{path} ! Return the time of creation of \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,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

1 0

python/dist/src/Lib htmllib.py,1.20,1.21
by akuchling＠users.sourceforge.net 27 Oct '03

27 Oct '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv18017 Modified Files: htmllib.py Log Message: Docstring fix: XHTML 1.0 entities are supported Index: htmllib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/htmllib.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** htmllib.py 12 Sep 2003 16:38:00 -0000 1.20 --- htmllib.py 27 Oct 2003 15:47:48 -0000 1.21 *************** *** 14,20 **** """This is the basic HTML parser class. ! It supports all entity names required by the HTML 2.0 specification ! RFC 1866. It also defines handlers for all HTML 2.0 and many HTML 3.0 ! and 3.2 elements. """ --- 14,20 ---- """This is the basic HTML parser class. ! It supports all entity names required by the XHTML 1.0 Recommendation. ! It also defines handlers for all HTML 2.0 and many HTML 3.0 and 3.2 ! elements. """

1 0

python/dist/src/Doc/lib libhtmllib.tex,1.26,1.27
by akuchling＠users.sourceforge.net 27 Oct '03

27 Oct '03

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1:/tmp/cvs-serv17768 Modified Files: libhtmllib.tex Log Message: Fix inaccuracy: all entities from XHTML 1.0 are supported (according to text further down in this file) Index: libhtmllib.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libhtmllib.tex,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** libhtmllib.tex 14 Jul 2003 08:15:47 -0000 1.26 --- libhtmllib.tex 27 Oct 2003 15:46:16 -0000 1.27 *************** *** 65,70 **** \begin{classdesc}{HTMLParser}{formatter} This is the basic HTML parser class. It supports all entity names ! required by the HTML 2.0 specification (\rfc{1866}). It also defines ! handlers for all HTML 2.0 and many HTML 3.0 and 3.2 elements. \end{classdesc} --- 65,70 ---- \begin{classdesc}{HTMLParser}{formatter} This is the basic HTML parser class. It supports all entity names ! required by the XHTML 1.0 Recommendation (\url{http://www.w3.org/TR/xhtml1}). ! It also defines handlers for all HTML 2.0 and many HTML 3.0 and 3.2 elements. \end{classdesc} *************** *** 80,85 **** ``HTML as deployed'' and which isn't legal for XHTML.} ! \seemodule{htmlentitydefs}{Definition of replacement text for HTML ! 2.0 entities.} \seemodule{sgmllib}{Base class for \class{HTMLParser}.} \end{seealso} --- 80,85 ---- ``HTML as deployed'' and which isn't legal for XHTML.} ! \seemodule{htmlentitydefs}{Definition of replacement text for XHTML 1.0 ! entities.} \seemodule{sgmllib}{Base class for \class{HTMLParser}.} \end{seealso}

1 0

python/nondist/peps pep-0323.txt, NONE, 1.1 pep-0000.txt, 1.254, 1.255
by aleax＠users.sourceforge.net 27 Oct '03

27 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv9167 Modified Files: pep-0000.txt Added Files: pep-0323.txt Log Message: Added PEP 323, "Copyable Iterators". --- NEW FILE: pep-0323.txt --- PEP: 323 Title: Copyable Iterators Version: $Revision: 1.1 $ Last-Modified: $Date: 2003/10/27 15:01:08 $ Author: Alex Martelli <aleaxit(a)yahoo.com> Status: Draft Type: Standards Track Content-Type: text/plain Created: 25-Oct-2003 Python-Version: 2.4 Post-History: Abstract This PEP suggests that some iterator types should support being copied (shallowly or deeply), by exposing suitable methods such as __copy__ or __deepcopy__. Motivation Some iterators, such as those which built-in function iter builds over sequences, should be intrinsically easy to copy (just get another reference to the same sequence and a copy of the index) or deepcopy (ditto but with a deepcopy of the underlying sequence). However, in Python up to 2.3, those iterators don't expose their state: user code which is using such an iterator X is not able to just "save" a copy of X (for future iteration from the current point) with a simple "saved_X = copy.copy(X)". To "tee" a non-copyable iterator into two independently iterable ones, subtle code [such as that which will go into itertools.tee in 2.4] is needed (a Python version thereof is currently in the itertools docs). In any case, such code will inevitably have to consume memory to keep a copy of the subsequence which has been iterated on by one but not both tee'd iterators. This is a waste of memory in those cases in which the iterator being tee'd already _has_ an underlying sequence (or other iterable) and index. Having iterators expose a suitable __copy__ when feasible allows easy optimization of itertools.tee and similar user code, as in: def tee(it): it = iter(it) try: return it, copy.copy(it) except TypeError: # non-copyable iterator, do all the needed hard work Specification Any iterator type X may expose a method __copy__ that is callable without arguments on any instance x of X. The method should be exposed if and only if the iterator type can provide copyability with reasonably little computational and memory effort. Similarly, X may expose a method __deepcopy__ that is callable with one argument (a memo dictionary) on instances of X. The (very concise...) specs for these methods are at [2] -- for more details, see also file copy.py in the Python standard library. For example, suppose a class Iter essentially duplicated the functionality of the iter builtin for iterating on a sequence: class Iter(object): def __init__(self, sequence): self.sequence = sequence self.index = 0 def __iter__(self): return self def next(self): try: result = self.sequence[self.index] except IndexError: raise StopIteration self.index += 1 return result To make this Iter class compliant with this PEP, the following additions to the body of class Iter would suffice: def __copy__(self): result = self.__class__(sequence) result.index = self.index return result def __deepcopy__(self, memo): result = self.__copy__() result.sequence = deepcopy(self.sequence, memo) return result Details Besides adding to the Python docs a recommendation that user-coded iterators be made copyable when feasible, this PEP's implementation will specifically include the addition of copyability to the iterators over sequences that built-in iter returns, and also to the iterators over a dictionary returned by the methods __iter__, iterkeys, itervalues, and iteritems of built-in type dict. Iterators produced by generators will not be copyable (the BDFL deems shallow copy impossible, and deep copy too much trouble). However, iterators produced by the new "generator expressions" of Python 2.4 (PEP 289 [3]) should be copyable if their underlying iterator[s] are; the strict limitations on what is possible in a generator expression, compared to the much vaster generality of a generator, should make that feasible. Similarly, the iterators produced by the built-in function enumerate should be copyable if the underlying iterator is. The implementation of this PEP will also include the optimization of the new itertools.tee function mentioned in the Motivation section. Rationale Being able to copy iterators will allow copying of user-coded classes that have copyable iterators as attributes. This applies to both shallow and deep copying. Deep copyability of suitable iterators will allow "decoupling" from an underlying mutable sequence, and, according to the BDFL, may in the future allow certain iterators to become picklable (however, this PEP, in itself, does not include picklability of iterators). The main use case for (shallow) copying of an iterator is the same as for the function itertools.tee (new in 2.4). Indeed, we assume that user code will typically not directly attempt to copy.copy an iterator, because it would have to deal with uncopyable cases; just calling itertools.tee will enable copying when feasible, with an implicit fallback to a maximally efficient non-copying strategy for iterators that are not copyable. A tee'd iterator may serve as a "reference point", allowing processing of a sequence to continue or resume from a known point, while the other independent iterator can be freely advanced to "explore" a further part of the sequence as needed. To fully exploit this pattern, it should ideally also be possible, given two iterators originally produced by iterator.tee, to check if they are "equal" (have been stepped the same number of times); however, this PEP, in itself, does not include comparability of such iterators. Therefore, code using this pattern may also need to count the number of forward steps taken after tee by the iterators, so as to be able to tell which one is "behind", and by how much. Built-in function enumerate is one way to make such counting very easy in many situations. However, such needs do not always arise. Here is a simpler example: a generator which, given an iterator of numbers (assumed to be positive), returns a corresponding iterator each of whose items is the fraction of the total corresponding to each corresponding item of the input iterator. The caller may pass the total as a value, if known in advance; otherwise, the iterator returned by calling the generator will first compute the total. def fractions(numbers, total=None): if total is None: numbers, aux = itertools.tee(numbers) total = sum(aux) total = float(total) for item in numbers: yield item / total The ability to tee the numbers iterator allows this generator to precompute the total, if needed, without necessarily requiring O(N) auxiliary memory if the numbers iterator is copyable. References [1] Discussion on python-dev starting at post: http://mail.python.org/pipermail/python-dev/2003-October/038969.html [2] Online documentation for the copy module of the standard library: http://www.python.org/doc/current/lib/module-copy.html [3] PEP 289, Generator Expressions, Hettinger http://www.python.org/peps/pep-0289.html Copyright This document has been placed in the public domain. Local Variables: mode: indented-text indent-tabs-mode: nil sentence-end-double-space: t fill-column: 70 End: Index: pep-0000.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v retrieving revision 1.254 retrieving revision 1.255 diff -C2 -d -r1.254 -r1.255 *** pep-0000.txt 22 Oct 2003 18:09:35 -0000 1.254 --- pep-0000.txt 27 Oct 2003 15:01:08 -0000 1.255 *************** *** 120,123 **** --- 120,124 ---- S 321 Date/Time Parsing and Formatting Kuchling S 322 Reverse Iteration Methods Hettinger + S 323 Copyable Iterators Martelli S 754 IEEE 754 Floating Point Special Values Warnes

1 0

python/dist/src/Modules _ssl.c,1.13.6.1,1.13.6.2
by loewis＠users.sourceforge.net 27 Oct '03

27 Oct '03

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1:/tmp/cvs-serv1678/Modules Modified Files: Tag: release23-maint _ssl.c Log Message: Patch #803998: Correctly check for error in SSL_write. Index: _ssl.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_ssl.c,v retrieving revision 1.13.6.1 retrieving revision 1.13.6.2 diff -C2 -d -r1.13.6.1 -r1.13.6.2 *** _ssl.c 20 Oct 2003 14:34:46 -0000 1.13.6.1 --- _ssl.c 27 Oct 2003 14:24:41 -0000 1.13.6.2 *************** *** 374,381 **** char *data; int len; int timedout; int err; ! if (!PyArg_ParseTuple(args, "s#:write", &data, &len)) return NULL; --- 374,382 ---- char *data; int len; + int count; int timedout; int err; ! if (!PyArg_ParseTuple(args, "s#:write", &data, &count)) return NULL; *************** *** 388,392 **** err = 0; Py_BEGIN_ALLOW_THREADS ! len = SSL_write(self->ssl, data, len); err = SSL_get_error(self->ssl, len); Py_END_ALLOW_THREADS --- 389,393 ---- err = 0; Py_BEGIN_ALLOW_THREADS ! len = SSL_write(self->ssl, data, count); err = SSL_get_error(self->ssl, len); Py_END_ALLOW_THREADS

1 0