Mailman 3 March 2006 - Python-checkins

buildbot warnings in x86 W2k 2.4
by buildbot＠python.org March 31, 2006

March 31, 2006

The Buildbot has detected a new failure of x86 W2k 2.4. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20W2k%202.4/builds/46 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release24-maint] HEAD Blamelist: georg.brandl Build Had Warnings: warnings test sincerely, -The Buildbot

1 0

r43494 - in python/branches/release24-maint: Lib/copy_reg.py Lib/test/test_copy_reg.py Misc/NEWS
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 20:25:48 2006 New Revision: 43494 Modified: python/branches/release24-maint/Lib/copy_reg.py python/branches/release24-maint/Lib/test/test_copy_reg.py python/branches/release24-maint/Misc/NEWS Log: Patch #1462313, bug #1443328: the pickle modules now can handle classes that have __private names in their __slots__. (backport from rev. 43493) Modified: python/branches/release24-maint/Lib/copy_reg.py ============================================================================== --- python/branches/release24-maint/Lib/copy_reg.py (original) +++ python/branches/release24-maint/Lib/copy_reg.py Fri Mar 31 20:25:48 2006 @@ -116,8 +116,19 @@ # Slots found -- gather slot names from all base classes for c in cls.__mro__: if "__slots__" in c.__dict__: - names += [name for name in c.__dict__["__slots__"] - if name not in ("__dict__", "__weakref__")] + slots = c.__dict__['__slots__'] + # if class has a single slot, it can be given as a string + if isinstance(slots, basestring): + slots = (slots,) + for name in slots: + # special descriptors + if name in ("__dict__", "__weakref__"): + continue + # mangled names + elif name.startswith('__') and not name.endswith('__'): + names.append('_%s%s' % (c.__name__, name)) + else: + names.append(name) # Cache the outcome in the class if at all possible try: Modified: python/branches/release24-maint/Lib/test/test_copy_reg.py ============================================================================== --- python/branches/release24-maint/Lib/test/test_copy_reg.py (original) +++ python/branches/release24-maint/Lib/test/test_copy_reg.py Fri Mar 31 20:25:48 2006 @@ -8,6 +8,22 @@ pass +class WithoutSlots(object): + pass + +class WithWeakref(object): + __slots__ = ('__weakref__',) + +class WithPrivate(object): + __slots__ = ('__spam',) + +class WithSingleString(object): + __slots__ = 'spam' + +class WithInherited(WithSingleString): + __slots__ = ('eggs',) + + class CopyRegTestCase(unittest.TestCase): def test_class(self): @@ -84,6 +100,19 @@ self.assertRaises(ValueError, copy_reg.add_extension, mod, func, code) + def test_slotnames(self): + self.assertEquals(copy_reg._slotnames(WithoutSlots), []) + self.assertEquals(copy_reg._slotnames(WithWeakref), []) + expected = ['_WithPrivate__spam'] + self.assertEquals(copy_reg._slotnames(WithPrivate), expected) + self.assertEquals(copy_reg._slotnames(WithSingleString), ['spam']) + expected = ['eggs', 'spam'] + expected.sort() + result = copy_reg._slotnames(WithInherited) + result.sort() + self.assertEquals(result, expected) + + def test_main(): test_support.run_unittest(CopyRegTestCase) Modified: python/branches/release24-maint/Misc/NEWS ============================================================================== --- python/branches/release24-maint/Misc/NEWS (original) +++ python/branches/release24-maint/Misc/NEWS Fri Mar 31 20:25:48 2006 @@ -121,6 +121,9 @@ Library ------- +- Patch #1462313, bug #1443328: the pickle modules now can handle classes + that have __private names in their __slots__. + - A regrtest option -w was added to re-run failed tests in verbose mode. - Patch #1337756: fileinput now handles Unicode filenames correctly.

1 0

r43493 - in python/trunk: Lib/copy_reg.py Lib/test/test_copy_reg.py Misc/NEWS
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 20:25:44 2006 New Revision: 43493 Modified: python/trunk/Lib/copy_reg.py python/trunk/Lib/test/test_copy_reg.py python/trunk/Misc/NEWS Log: Patch #1462313, bug #1443328: the pickle modules now can handle classes that have __private names in their __slots__. Modified: python/trunk/Lib/copy_reg.py ============================================================================== --- python/trunk/Lib/copy_reg.py (original) +++ python/trunk/Lib/copy_reg.py Fri Mar 31 20:25:44 2006 @@ -116,8 +116,19 @@ # Slots found -- gather slot names from all base classes for c in cls.__mro__: if "__slots__" in c.__dict__: - names += [name for name in c.__dict__["__slots__"] - if name not in ("__dict__", "__weakref__")] + slots = c.__dict__['__slots__'] + # if class has a single slot, it can be given as a string + if isinstance(slots, basestring): + slots = (slots,) + for name in slots: + # special descriptors + if name in ("__dict__", "__weakref__"): + continue + # mangled names + elif name.startswith('__') and not name.endswith('__'): + names.append('_%s%s' % (c.__name__, name)) + else: + names.append(name) # Cache the outcome in the class if at all possible try: Modified: python/trunk/Lib/test/test_copy_reg.py ============================================================================== --- python/trunk/Lib/test/test_copy_reg.py (original) +++ python/trunk/Lib/test/test_copy_reg.py Fri Mar 31 20:25:44 2006 @@ -8,6 +8,22 @@ pass +class WithoutSlots(object): + pass + +class WithWeakref(object): + __slots__ = ('__weakref__',) + +class WithPrivate(object): + __slots__ = ('__spam',) + +class WithSingleString(object): + __slots__ = 'spam' + +class WithInherited(WithSingleString): + __slots__ = ('eggs',) + + class CopyRegTestCase(unittest.TestCase): def test_class(self): @@ -84,6 +100,19 @@ self.assertRaises(ValueError, copy_reg.add_extension, mod, func, code) + def test_slotnames(self): + self.assertEquals(copy_reg._slotnames(WithoutSlots), []) + self.assertEquals(copy_reg._slotnames(WithWeakref), []) + expected = ['_WithPrivate__spam'] + self.assertEquals(copy_reg._slotnames(WithPrivate), expected) + self.assertEquals(copy_reg._slotnames(WithSingleString), ['spam']) + expected = ['eggs', 'spam'] + expected.sort() + result = copy_reg._slotnames(WithInherited) + result.sort() + self.assertEquals(result, expected) + + def test_main(): test_support.run_unittest(CopyRegTestCase) Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Fri Mar 31 20:25:44 2006 @@ -487,6 +487,9 @@ Library ------- +- Patch #1462313, bug #1443328: the pickle modules now can handle classes + that have __private names in their __slots__. + - Bug #1250170: mimetools now gracefully handles socket.gethostname() failures gracefully.

1 0

r43492 - in python/branches/release24-maint: Lib/test/test_socket_ssl.py Misc/NEWS Modules/_ssl.c
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 20:01:24 2006 New Revision: 43492 Modified: python/branches/release24-maint/Lib/test/test_socket_ssl.py python/branches/release24-maint/Misc/NEWS python/branches/release24-maint/Modules/_ssl.c Log: Patch #1380952: fix SSL objects timing out on consecutive read()s (backport from rev. 43491) Modified: python/branches/release24-maint/Lib/test/test_socket_ssl.py ============================================================================== --- python/branches/release24-maint/Lib/test/test_socket_ssl.py (original) +++ python/branches/release24-maint/Lib/test/test_socket_ssl.py Fri Mar 31 20:01:24 2006 @@ -27,6 +27,19 @@ buf = f.read() f.close() +def test_timeout(): + test_support.requires('network') + + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.settimeout(30.0) + # connect to service which issues an welcome banner (without need to write anything) + s.connect(("gmail.org", 995)) + ss = socket.ssl(s) + # read part of return welcome banner twice,# read part of return welcome banner twice + ss.read(1) + ss.read(1) + s.close() + def test_rude_shutdown(): try: import thread @@ -63,6 +76,7 @@ raise test_support.TestSkipped("socket module has no ssl support") test_rude_shutdown() test_basic() + test_timeout() if __name__ == "__main__": test_main() Modified: python/branches/release24-maint/Misc/NEWS ============================================================================== --- python/branches/release24-maint/Misc/NEWS (original) +++ python/branches/release24-maint/Misc/NEWS Fri Mar 31 20:01:24 2006 @@ -25,6 +25,8 @@ Extension Modules ----------------- +- Patch #1380952: fix SSL objects timing out on consecutive read()s + - Ubuntu bug #29289: Fixed a bug that the gb18030 codec raises RuntimeError on encoding surrogate pair area on UCS4 build. Modified: python/branches/release24-maint/Modules/_ssl.c ============================================================================== --- python/branches/release24-maint/Modules/_ssl.c (original) +++ python/branches/release24-maint/Modules/_ssl.c Fri Mar 31 20:01:24 2006 @@ -474,15 +474,22 @@ if (!(buf = PyString_FromStringAndSize((char *) 0, len))) return NULL; - - sockstate = check_socket_and_wait_for_timeout(self->Socket, 0); - if (sockstate == SOCKET_HAS_TIMED_OUT) { - PyErr_SetString(PySSLErrorObject, "The read operation timed out"); - Py_DECREF(buf); - return NULL; - } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) { - PyErr_SetString(PySSLErrorObject, "Underlying socket too large for select()."); - return NULL; + + /* first check if there are bytes ready to be read */ + Py_BEGIN_ALLOW_THREADS + count = SSL_pending(self->ssl); + Py_END_ALLOW_THREADS + + if (!count) { + sockstate = check_socket_and_wait_for_timeout(self->Socket, 0); + if (sockstate == SOCKET_HAS_TIMED_OUT) { + PyErr_SetString(PySSLErrorObject, "The read operation timed out"); + Py_DECREF(buf); + return NULL; + } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) { + PyErr_SetString(PySSLErrorObject, "Underlying socket too large for select()."); + return NULL; + } } do { err = 0;

1 0

r43491 - in python/trunk: Lib/test/test_socket_ssl.py Misc/NEWS Modules/_ssl.c
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 20:01:16 2006 New Revision: 43491 Modified: python/trunk/Lib/test/test_socket_ssl.py python/trunk/Misc/NEWS python/trunk/Modules/_ssl.c Log: Patch #1380952: fix SSL objects timing out on consecutive read()s Modified: python/trunk/Lib/test/test_socket_ssl.py ============================================================================== --- python/trunk/Lib/test/test_socket_ssl.py (original) +++ python/trunk/Lib/test/test_socket_ssl.py Fri Mar 31 20:01:16 2006 @@ -26,6 +26,19 @@ buf = f.read() f.close() +def test_timeout(): + test_support.requires('network') + + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.settimeout(30.0) + # connect to service which issues an welcome banner (without need to write anything) + s.connect(("gmail.org", 995)) + ss = socket.ssl(s) + # read part of return welcome banner twice,# read part of return welcome banner twice + ss.read(1) + ss.read(1) + s.close() + def test_rude_shutdown(): try: import threading @@ -74,6 +87,7 @@ raise test_support.TestSkipped("socket module has no ssl support") test_rude_shutdown() test_basic() + test_timeout() if __name__ == "__main__": test_main() Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Fri Mar 31 20:01:16 2006 @@ -303,6 +303,8 @@ Extension Modules ----------------- +- Patch #1380952: fix SSL objects timing out on consecutive read()s + - Patch #1309579: wait3 and wait4 were added to the posix module. - Patch #1231053: The audioop module now supports encoding/decoding of alaw. Modified: python/trunk/Modules/_ssl.c ============================================================================== --- python/trunk/Modules/_ssl.c (original) +++ python/trunk/Modules/_ssl.c Fri Mar 31 20:01:16 2006 @@ -474,15 +474,22 @@ if (!(buf = PyString_FromStringAndSize((char *) 0, len))) return NULL; - - sockstate = check_socket_and_wait_for_timeout(self->Socket, 0); - if (sockstate == SOCKET_HAS_TIMED_OUT) { - PyErr_SetString(PySSLErrorObject, "The read operation timed out"); - Py_DECREF(buf); - return NULL; - } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) { - PyErr_SetString(PySSLErrorObject, "Underlying socket too large for select()."); - return NULL; + + /* first check if there are bytes ready to be read */ + Py_BEGIN_ALLOW_THREADS + count = SSL_pending(self->ssl); + Py_END_ALLOW_THREADS + + if (!count) { + sockstate = check_socket_and_wait_for_timeout(self->Socket, 0); + if (sockstate == SOCKET_HAS_TIMED_OUT) { + PyErr_SetString(PySSLErrorObject, "The read operation timed out"); + Py_DECREF(buf); + return NULL; + } else if (sockstate == SOCKET_TOO_LARGE_FOR_SELECT) { + PyErr_SetString(PySSLErrorObject, "Underlying socket too large for select()."); + return NULL; + } } do { err = 0;

1 0

buildbot warnings in x86 XP trunk
by buildbot＠python.org March 31, 2006

March 31, 2006

The Buildbot has detected a new failure of x86 XP trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20XP%20trunk/builds/211 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: georg.brandl Build Had Warnings: warnings failed slave lost sincerely, -The Buildbot

1 0

r43490 - in python/trunk: Lib/mimetools.py Lib/test/test_urllib2.py Misc/NEWS
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 19:18:06 2006 New Revision: 43490 Modified: python/trunk/Lib/mimetools.py python/trunk/Lib/test/test_urllib2.py python/trunk/Misc/NEWS Log: Bug #1250170, Patch #1462230: handle socket.gethostname() failures gracefully Modified: python/trunk/Lib/mimetools.py ============================================================================== --- python/trunk/Lib/mimetools.py (original) +++ python/trunk/Lib/mimetools.py Fri Mar 31 19:18:06 2006 @@ -127,7 +127,10 @@ import time if _prefix is None: import socket - hostid = socket.gethostbyname(socket.gethostname()) + try: + hostid = socket.gethostbyname(socket.gethostname()) + except socket.gaierror: + hostid = '127.0.0.1' try: uid = repr(os.getuid()) except AttributeError: Modified: python/trunk/Lib/test/test_urllib2.py ============================================================================== --- python/trunk/Lib/test/test_urllib2.py (original) +++ python/trunk/Lib/test/test_urllib2.py Fri Mar 31 19:18:06 2006 @@ -349,13 +349,19 @@ TESTFN = test_support.TESTFN urlpath = sanepathname2url(os.path.abspath(TESTFN)) towrite = "hello, world\n" - for url in [ + urls = [ "file://localhost%s" % urlpath, "file://%s" % urlpath, "file://%s%s" % (socket.gethostbyname('localhost'), urlpath), - "file://%s%s" % (socket.gethostbyname(socket.gethostname()), - urlpath), - ]: + ] + try: + localaddr = socket.gethostbyname(socket.gethostname()) + except socket.gaierror: + localaddr = '' + if localaddr: + urls.append("file://%s%s" % (localaddr, urlpath)) + + for url in urls: f = open(TESTFN, "wb") try: try: Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Fri Mar 31 19:18:06 2006 @@ -485,6 +485,9 @@ Library ------- +- Bug #1250170: mimetools now gracefully handles socket.gethostname() + failures gracefully. + - patch #1457316: "setup.py upload" now supports --identity to select the key to be used for signing the uploaded code.

1 0

r43489 - python/trunk/Python/pyarena.c
by jeremy.hylton March 31, 2006

March 31, 2006

Author: jeremy.hylton Date: Fri Mar 31 18:41:22 2006 New Revision: 43489 Modified: python/trunk/Python/pyarena.c Log: Expand comments. Explicitly clear all elements from arena->a_objects and remove assert() that refcount is 1. It's possible for a program to get a reference to the list via sys.getobjects() or via gc functions. Modified: python/trunk/Python/pyarena.c ============================================================================== --- python/trunk/Python/pyarena.c (original) +++ python/trunk/Python/pyarena.c Fri Mar 31 18:41:22 2006 @@ -6,6 +6,9 @@ Measurements with standard library modules suggest the average allocation is about 20 bytes and that most compiles use a single block. + + TODO(jhylton): Think about a realloc API, maybe just for the last + allocation? */ #define DEFAULT_BLOCK_SIZE 8192 @@ -39,9 +42,25 @@ */ struct _arena { + /* Pointer to the first block allocated for the arena, never NULL. + It is used only to find the first block when the arena is + being freed. + */ block *a_head; + + /* Pointer to the block currently used for allocation. It's + ab_next field should be NULL. If it is not-null after a + call to block_alloc(), it means a new block has been allocated + and a_cur should be reset to point it. + */ block *a_cur; + + /* A Python list object containing references to all the PyObject + pointers associated with this area. They will be DECREFed + when the arena is freed. + */ PyObject *a_objects; + #if defined(Py_DEBUG) /* Debug output */ size_t total_allocs; @@ -134,6 +153,7 @@ void PyArena_Free(PyArena *arena) { + int r; assert(arena); #if defined(Py_DEBUG) /* @@ -146,6 +166,13 @@ #endif block_free(arena->a_head); assert(arena->a_objects->ob_refcnt == 1); + + /* Clear all the elements from the list. This is necessary + to guarantee that they will be DECREFed. */ + r = PyList_SetSlice(arena->a_objects, + 0, PyList_GET_SIZE(arena->a_objects), NULL); + assert(r == 0); + assert(PyList_GET_SIZE(arena->a_objects) == 0); Py_DECREF(arena->a_objects); free(arena); }

1 0

r43488 - python/trunk/Doc/tools/prechm.py
by martin.v.loewis March 31, 2006

March 31, 2006

Author: martin.v.loewis Date: Fri Mar 31 18:19:18 2006 New Revision: 43488 Modified: python/trunk/Doc/tools/prechm.py Log: Add 2.5 libraries. Modified: python/trunk/Doc/tools/prechm.py ============================================================================== --- python/trunk/Doc/tools/prechm.py (original) +++ python/trunk/Doc/tools/prechm.py Fri Mar 31 18:19:18 2006 @@ -150,6 +150,22 @@ # Library Doc list of books: # each 'book' : (Dir, Title, First page, Content page, Index page) supported_libraries = { + '2.5': + [ + Book('.', 'Main page', 'index'), + Book('.', 'Global Module Index', 'modindex'), + Book('whatsnew', "What's New", 'index', 'contents'), + Book('tut','Tutorial','tut','node2'), + Book('lib','Library Reference','lib','contents','genindex'), + Book('ref','Language Reference','ref','contents','genindex'), + Book('mac','Macintosh Reference','mac','contents','genindex'), + Book('ext','Extending and Embedding','ext','contents'), + Book('api','Python/C API','api','contents','genindex'), + Book('doc','Documenting Python','doc','contents'), + Book('inst','Installing Python Modules', 'inst', 'index'), + Book('dist','Distributing Python Modules', 'dist', 'index', 'genindex'), + ], + '2.4': [ Book('.', 'Main page', 'index'),

1 0

r43487 - python/trunk/Doc/ref/ref3.tex
by georg.brandl March 31, 2006

March 31, 2006

Author: georg.brandl Date: Fri Mar 31 18:12:34 2006 New Revision: 43487 Modified: python/trunk/Doc/ref/ref3.tex Log: typos Modified: python/trunk/Doc/ref/ref3.tex ============================================================================== --- python/trunk/Doc/ref/ref3.tex (original) +++ python/trunk/Doc/ref/ref3.tex Fri Mar 31 18:12:34 2006 @@ -1035,7 +1035,7 @@ %========================================================================= \section{New-style and classic classes} -Classes and instances come in two flavours: old-style or classic, and new-style. +Classes and instances come in two flavors: old-style or classic, and new-style. Up to Python 2.1, old-style classes were the only flavour available to the user. The concept of (old-style) class is unrelated to the concept of type: if @@ -1065,7 +1065,7 @@ implemented before for compatibility concerns, like the method resolution order in case of multiple inheritance. -This manuel is not up-to-date with respect to new-style classes. For now, +This manual is not up-to-date with respect to new-style classes. For now, please see \url{http://www.python.org/doc/newstyle.html} for more information. The plan is to eventually drop old-style classes, leaving only the semantics of

1 0