Mailman 3 October 2007 - Python-checkins

r58304 - in python/trunk: Misc/NEWS Objects/enumobject.c
by raymond.hettinger Oct. 3, 2007

Oct. 3, 2007

Author: raymond.hettinger Date: Wed Oct 3 23:18:11 2007 New Revision: 58304 Modified: python/trunk/Misc/NEWS python/trunk/Objects/enumobject.c Log: enumerate() is no longer bounded to using sequences shorter than LONG_MAX. The possibility of overflow was sending some newsgroup posters into a tizzy. Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Wed Oct 3 23:18:11 2007 @@ -12,6 +12,10 @@ Core and builtins ----------------- +- The enumerate() builtin function is no longer bounded to sequences smaller + than LONG_MAX. Formerly, it raised an OverflowError. Now, automatically + shifts from ints to longs. + - Issue #1686386: Tuple's tp_repr did not take into account the possibility of having a self-referential tuple, which is possible from C code. Nor did object's tp_str consider that a type's tp_str could do something that could Modified: python/trunk/Objects/enumobject.c ============================================================================== --- python/trunk/Objects/enumobject.c (original) +++ python/trunk/Objects/enumobject.c Wed Oct 3 23:18:11 2007 @@ -7,6 +7,7 @@ long en_index; /* current index of enumeration */ PyObject* en_sit; /* secondary iterator of enumeration */ PyObject* en_result; /* result tuple */ + PyObject* en_longindex; /* index for sequences >= LONG_MAX */ } enumobject; static PyObject * @@ -25,6 +26,7 @@ return NULL; en->en_index = 0; en->en_sit = PyObject_GetIter(seq); + en->en_longindex = NULL; if (en->en_sit == NULL) { Py_DECREF(en); return NULL; @@ -43,6 +45,7 @@ PyObject_GC_UnTrack(en); Py_XDECREF(en->en_sit); Py_XDECREF(en->en_result); + Py_XDECREF(en->en_longindex); Py_Type(en)->tp_free(en); } @@ -51,10 +54,53 @@ { Py_VISIT(en->en_sit); Py_VISIT(en->en_result); + Py_VISIT(en->en_longindex); return 0; } static PyObject * +enum_next_long(enumobject *en, PyObject* next_item) +{ + static PyObject *one = NULL; + PyObject *result = en->en_result; + PyObject *next_index; + PyObject *stepped_up; + + if (en->en_longindex == NULL) { + en->en_longindex = PyInt_FromLong(LONG_MAX); + if (en->en_longindex == NULL) + return NULL; + } + if (one == NULL) { + one = PyInt_FromLong(1); + if (one == NULL) + return NULL; + } + next_index = en->en_longindex; + assert(next_index != NULL); + stepped_up = PyNumber_Add(next_index, one); + if (stepped_up == NULL) + return NULL; + en->en_longindex = stepped_up; + + if (result->ob_refcnt == 1) { + Py_INCREF(result); + Py_DECREF(PyTuple_GET_ITEM(result, 0)); + Py_DECREF(PyTuple_GET_ITEM(result, 1)); + } else { + result = PyTuple_New(2); + if (result == NULL) { + Py_DECREF(next_index); + Py_DECREF(next_item); + return NULL; + } + } + PyTuple_SET_ITEM(result, 0, next_index); + PyTuple_SET_ITEM(result, 1, next_item); + return result; +} + +static PyObject * enum_next(enumobject *en) { PyObject *next_index; @@ -62,16 +108,13 @@ PyObject *result = en->en_result; PyObject *it = en->en_sit; - if (en->en_index == LONG_MAX) { - PyErr_SetString(PyExc_OverflowError, - "enumerate() is limited to LONG_MAX items"); - return NULL; - } - next_item = (*Py_Type(it)->tp_iternext)(it); if (next_item == NULL) return NULL; + if (en->en_index == LONG_MAX) + return enum_next_long(en, next_item); + next_index = PyInt_FromLong(en->en_index); if (next_index == NULL) { Py_DECREF(next_item);

1 0

r58303 - peps/trunk/pep-0352.txt
by brett.cannon Oct. 3, 2007

Oct. 3, 2007

Author: brett.cannon Date: Wed Oct 3 21:59:57 2007 New Revision: 58303 Modified: peps/trunk/pep-0352.txt Log: Fix/clarify stuff based on suggestions from Mark Summerfield. Modified: peps/trunk/pep-0352.txt ============================================================================== --- peps/trunk/pep-0352.txt (original) +++ peps/trunk/pep-0352.txt Wed Oct 3 21:59:57 2007 @@ -67,12 +67,9 @@ """ def __init__(self, *args): - """Set the 'args' attribute'""" self.args = args def __str__(self): - """Return the str of - ``args[0] if len(args) == 1 else args``.""" if len(self.args) == 1: return str(self.args[0]) else: @@ -137,7 +134,7 @@ propagate up and allow the interpreter to terminate. KeyboardInterrupt has been moved since users typically expect an -application to exit when the press the interrupt key (usually Ctrl-C). +application to exit when they press the interrupt key (usually Ctrl-C). If people have overly broad ``except`` clauses the expected behaviour does not occur. @@ -176,11 +173,9 @@ """ def __init__(self, *args): - """Set the 'args' attribute.""" self.args = args def __str__(self): - """Return the str of args[0] or args, depending on length.""" return str(self.args[0] if len(self.args) <= 1 else self.args) @@ -204,9 +199,10 @@ "since Python 2.6") return self.args[0] if len(args) == 1 else '' - message = property(_get_message) - - + message = property(_get_message, + doc="access the 'message' attribute; " + "deprecated and provided only for " + "backwards-compatibility") Deprecation of features in Python 2.9 is optional. This is because it @@ -216,7 +212,7 @@ will be used in 2.9 since there could be such a difference between 2.9 and 3.0 that it would make 2.9 too "noisy" in terms of warnings. Thus the proposed deprecation warnings for Python 2.9 will be revisited -when development of that version begins to determine if they are still +when development of that version begins, to determine if they are still desired. * Python 2.5 [done]

1 0

buildbot failure in ARM Linux trunk
by buildbot＠python.org Oct. 3, 2007

Oct. 3, 2007

The Buildbot has detected a new failure of ARM Linux trunk. Full details are available at: http://www.python.org/dev/buildbot/all/ARM%20Linux%20trunk/builds/3 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-linux-arm Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: brett.cannon,facundo.batista BUILD FAILED: failed test Excerpt from the test logfile: make: *** [buildbottest] Aborted sincerely, -The Buildbot

1 0

r58302 - peps/trunk/pep-3100.txt
by brett.cannon Oct. 3, 2007

Oct. 3, 2007

Author: brett.cannon Date: Wed Oct 3 20:51:50 2007 New Revision: 58302 Modified: peps/trunk/pep-3100.txt Log: Remove duplicate entry for the removal of md5. Modified: peps/trunk/pep-3100.txt ============================================================================== --- peps/trunk/pep-3100.txt (original) +++ peps/trunk/pep-3100.txt Wed Oct 3 20:51:50 2007 @@ -216,7 +216,6 @@ ``multifile``, ``rfc822``, ``sha``, - ``md5``, [to do] - ``mpz``, ``posixfile``, ``regsub``, ``rgbimage``, ``statcache``, ``sv``, ``TERMIOS``, ``timing`` [done]

1 0

r58301 - peps/trunk/pep-0000.txt peps/trunk/pep-0358.txt peps/trunk/pep-3137.txt
by guido.van.rossum Oct. 3, 2007

Oct. 3, 2007

Author: guido.van.rossum Date: Wed Oct 3 18:04:53 2007 New Revision: 58301 Modified: peps/trunk/pep-0000.txt peps/trunk/pep-0358.txt peps/trunk/pep-3137.txt Log: Mark PEP 3137 as accepted. Mark Summerfield sent some comments on PEP 358 (I also referenced PEP 3137). Modified: peps/trunk/pep-0000.txt ============================================================================== --- peps/trunk/pep-0000.txt (original) +++ peps/trunk/pep-0000.txt Wed Oct 3 18:04:53 2007 @@ -80,6 +80,7 @@ SA 3118 Revising the buffer protocol Oliphant, Banks SA 3119 Introducing Abstract Base Classes GvR, Talin SA 3121 Extension Module Initialization & Finalization von Löwis + SA 3137 Immutable Bytes and Mutable Buffer GvR Open PEPs (under consideration) @@ -96,7 +97,6 @@ S 3116 New I/O Stutzbach, Verdone, GvR S 3134 Exception Chaining and Embedded Tracebacks Yee S 3135 New Super Spealman, Delaney - S 3137 Immutable Bytes and Mutable Buffer GvR S 3141 A Type Hierarchy for Numbers Yasskin Finished PEPs (done, implemented in Subversion) @@ -510,7 +510,7 @@ S 3134 Exception Chaining and Embedded Tracebacks Yee S 3135 New Super Spealman, Delaney SR 3136 Labeled break and continue Chisholm - S 3137 Immutable Bytes and Mutable Buffer GvR + SA 3137 Immutable Bytes and Mutable Buffer GvR S 3141 A Type Hierarchy for Numbers Yasskin Modified: peps/trunk/pep-0358.txt ============================================================================== --- peps/trunk/pep-0358.txt (original) +++ peps/trunk/pep-0358.txt Wed Oct 3 18:04:53 2007 @@ -11,6 +11,11 @@ Post-History: +Update + + This PEP has partially been superseded by PEP 3137. + + Abstract This PEP outlines the introduction of a raw bytes sequence type. @@ -32,15 +37,15 @@ overloading of purpose leads to confusion and bugs. In future versions of Python, string objects will be used for holding character data. The bytes object will fulfil the role of a byte - container. Eventually the unicode built-in will be renamed to str - and the str object will be removed. + container. Eventually the unicode type will be renamed to str + and the old str type will be removed. Specification A bytes object stores a mutable sequence of integers that are in the range 0 to 255. Unlike string objects, indexing a bytes - object returns an integer. Assigning or comparin an object that + object returns an integer. Assigning or comparing an object that is not an integer to an element causes a TypeError exception. Assigning an element to a value outside the range 0 to 255 causes a ValueError exception. The .__len__() method of bytes returns @@ -58,10 +63,10 @@ (optimized for clear semantics, not for speed) is: def bytes(initializer=0, encoding=None): - if isinstance(initializer, int): # In 2.6, (int, long) + if isinstance(initializer, int): # In 2.6, int -> (int, long) initializer = [0]*initializer elif isinstance(initializer, basestring): - if isinstance(initializer, unicode): # In 3.0, always + if isinstance(initializer, unicode): # In 3.0, "if True" if encoding is None: # In 3.0, raise TypeError("explicit encoding required") encoding = sys.getdefaultencoding() @@ -106,7 +111,7 @@ >> bytes([92, 83, 80, 255]).hex() '5c5350ff' - The bytes object has some methods similar to list method, and + The bytes object has some methods similar to list methods, and others similar to str methods. Here is a complete list of methods, with their approximate signatures: @@ -176,8 +181,8 @@ support bytes objects. * It has been suggested that a special method named .__bytes__() - be added to language to allow objects to be converted into byte - arrays. This decision is out of scope. + be added to the language to allow objects to be converted into + byte arrays. This decision is out of scope. * A bytes literal of the form b"..." is also proposed. This is the subject of PEP 3112. @@ -236,7 +241,7 @@ A: There is no sane meaning that the encoding can have in that case. str objects *are* byte arrays and they know nothing about the encoding of character data they contain. We need to assume that - the programmer has provided str object that already uses the + the programmer has provided a str object that already uses the desired encoding. If you need something other than a pure copy of the bytes then you need to first decode the string. For example: Modified: peps/trunk/pep-3137.txt ============================================================================== --- peps/trunk/pep-3137.txt (original) +++ peps/trunk/pep-3137.txt Wed Oct 3 18:04:53 2007 @@ -3,7 +3,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: Guido van Rossum <guido(a)python.org> -Status: Draft +Status: Accepted Type: Standards Track Content-Type: text/x-rst Created: 26-Sep-2007

1 0

r58300 - peps/trunk/pep-0000.txt peps/trunk/pep-3100.txt
by andrew.kuchling Oct. 3, 2007

Oct. 3, 2007

Author: andrew.kuchling Date: Wed Oct 3 13:24:09 2007 New Revision: 58300 Modified: peps/trunk/pep-0000.txt peps/trunk/pep-3100.txt Log: Remove name from PEP 3100; no time to follow 3.0 Modified: peps/trunk/pep-0000.txt ============================================================================== --- peps/trunk/pep-0000.txt (original) +++ peps/trunk/pep-0000.txt Wed Oct 3 13:24:09 2007 @@ -70,7 +70,7 @@ IF 356 Python 2.5 Release Schedule Norwitz, et al I 360 Externally Maintained Packages Cannon I 361 Python 2.6 Release Schedule Norwitz, et al - I 3100 Python 3.0 Plans Kuchling, Cannon + I 3100 Python 3.0 Plans Cannon Accepted PEPs (accepted; may not be implemented yet) @@ -473,7 +473,7 @@ P 3001 Reviewing and improving stdlib modules Brandl P 3002 Procedure for Backwards-Incompatible Changes Bethard I 3099 Things that will Not Change in Python 3000 Brandl - I 3100 Python 3.0 Plans Kuchling, Cannon + I 3100 Python 3.0 Plans Cannon SA 3101 Advanced String Formatting Talin SF 3102 Keyword-Only Arguments Talin SR 3103 A Switch/Case Statement GvR Modified: peps/trunk/pep-3100.txt ============================================================================== --- peps/trunk/pep-3100.txt (original) +++ peps/trunk/pep-3100.txt Wed Oct 3 13:24:09 2007 @@ -2,8 +2,7 @@ Title: Miscellaneous Python 3.0 Plans Version: $Revision$ Last-Modified: $Date$ -Author: A.M. Kuchling <amk(a)amk.ca>, - Brett Cannon <brett(a)python.org> +Author: Brett Cannon <brett(a)python.org> Status: Draft Type: Informational Content-Type: text/x-rst

1 0

r58299 - python/trunk/Doc/reference/expressions.rst
by mark.summerfield Oct. 3, 2007

Oct. 3, 2007

Author: mark.summerfield Date: Wed Oct 3 10:53:21 2007 New Revision: 58299 Modified: python/trunk/Doc/reference/expressions.rst Log: Added note in footnote about string comparisons about unicodedata.normalize(). Modified: python/trunk/Doc/reference/expressions.rst ============================================================================== --- python/trunk/Doc/reference/expressions.rst (original) +++ python/trunk/Doc/reference/expressions.rst Wed Oct 3 10:53:21 2007 @@ -1330,9 +1330,10 @@ .. [#] While comparisons between unicode strings make sense at the byte level, they may be counter-intuitive to users. For example, the - strings ``u"\u00C7"`` and ``u"\u0327\u0043"`` compare differently, + strings ``u"\u00C7"`` and ``u"\u0043\u0327"`` compare differently, even though they both represent the same unicode character (LATIN - CAPTITAL LETTER C WITH CEDILLA). + CAPTITAL LETTER C WITH CEDILLA). To compare strings in a human + recognizable way, compare using :func:`unicodedata.normalize`. .. [#] The implementation computes this efficiently, without constructing lists or sorting.

1 0

buildbot failure in x86 XP-3 trunk
by buildbot＠python.org Oct. 2, 2007

Oct. 2, 2007

The Buildbot has detected a new failure of x86 XP-3 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20XP-3%20trunk/builds/277 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: heller-windows Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: facundo.batista BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_urllib2net sincerely, -The Buildbot

1 0

buildbot failure in x86 mvlgcc trunk
by buildbot＠python.org Oct. 2, 2007

Oct. 2, 2007

The Buildbot has detected a new failure of x86 mvlgcc trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20mvlgcc%20trunk/builds/847 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: loewis-linux Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: facundo.batista BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_urllib2net make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

buildbot failure in x86 gentoo trunk
by buildbot＠python.org Oct. 2, 2007

Oct. 2, 2007

The Buildbot has detected a new failure of x86 gentoo trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20gentoo%20trunk/builds/2507 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: norwitz-x86 Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: facundo.batista BUILD FAILED: failed test Excerpt from the test logfile: Traceback (most recent call last): File "/home/buildslave/python-trunk/trunk.norwitz-x86/build/Lib/threading.py", line 486, in __bootstrap_inner self.run() File "/home/buildslave/python-trunk/trunk.norwitz-x86/build/Lib/threading.py", line 446, in run self.__target(*self.__args, **self.__kwargs) File "/home/buildslave/python-trunk/trunk.norwitz-x86/build/Lib/bsddb/test/test_thread.py", line 281, in readerThread rec = dbutils.DeadlockWrap(c.next, max_retries=10) File "/home/buildslave/python-trunk/trunk.norwitz-x86/build/Lib/bsddb/dbutils.py", line 62, in DeadlockWrap return function(*_args, **_kwargs) DBLockDeadlockError: (-30996, 'DB_LOCK_DEADLOCK: Locker killed to resolve a deadlock') 1 test failed: test_urllib2net make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0