Mailman 3 September 2008 - Python-checkins

r66685 - in python/branches/release25-maint: Lib/ctypes/test/test_bitfields.py Modules/_ctypes/cfield.c
by thomas.heller 29 Sep '08

29 Sep '08

Author: thomas.heller Date: Mon Sep 29 22:04:02 2008 New Revision: 66685 Log: Fix issue #3547 for MingW, update comments (backport from trunk). Modified: python/branches/release25-maint/Lib/ctypes/test/test_bitfields.py python/branches/release25-maint/Modules/_ctypes/cfield.c Modified: python/branches/release25-maint/Lib/ctypes/test/test_bitfields.py ============================================================================== --- python/branches/release25-maint/Lib/ctypes/test/test_bitfields.py (original) +++ python/branches/release25-maint/Lib/ctypes/test/test_bitfields.py Mon Sep 29 22:04:02 2008 @@ -223,8 +223,9 @@ ("d", c_short, 4), ("e", c_short, 4), ("f", c_int, 24)] - # MS compilers do NOT combine c_short and c_int into - # one field, gcc does. + # MSVC does NOT combine c_short and c_int into one field, GCC + # does (unless GCC is run with '-mms-bitfields' which + # produces code compatible with MSVC). if os.name in ("nt", "ce"): self.failUnlessEqual(sizeof(X), sizeof(c_int) * 4) else: Modified: python/branches/release25-maint/Modules/_ctypes/cfield.c ============================================================================== --- python/branches/release25-maint/Modules/_ctypes/cfield.c (original) +++ python/branches/release25-maint/Modules/_ctypes/cfield.c Mon Sep 29 22:04:02 2008 @@ -65,10 +65,12 @@ } if (bitsize /* this is a bitfield request */ && *pfield_size /* we have a bitfield open */ -#if defined(MS_WIN32) && !defined(__MINGW32__) - && dict->size * 8 == *pfield_size /* MSVC */ +#ifdef MS_WIN32 + /* MSVC, GCC with -mms-bitfields */ + && dict->size * 8 == *pfield_size #else - && dict->size * 8 <= *pfield_size /* GCC, MINGW */ + /* GCC */ + && dict->size * 8 <= *pfield_size #endif && (*pbitofs + bitsize) <= *pfield_size) { /* continue bit field */

1 0

r66683 - in python/trunk: Lib/ctypes/test/test_bitfields.py Modules/_ctypes/cfield.c
by thomas.heller 29 Sep '08

29 Sep '08

Author: thomas.heller Date: Mon Sep 29 21:56:24 2008 New Revision: 66683 Log: Fix issue #3547 for MingW, update comments. Modified: python/trunk/Lib/ctypes/test/test_bitfields.py python/trunk/Modules/_ctypes/cfield.c Modified: python/trunk/Lib/ctypes/test/test_bitfields.py ============================================================================== --- python/trunk/Lib/ctypes/test/test_bitfields.py (original) +++ python/trunk/Lib/ctypes/test/test_bitfields.py Mon Sep 29 21:56:24 2008 @@ -223,8 +223,9 @@ ("d", c_short, 4), ("e", c_short, 4), ("f", c_int, 24)] - # MS compilers do NOT combine c_short and c_int into - # one field, gcc does. + # MSVC does NOT combine c_short and c_int into one field, GCC + # does (unless GCC is run with '-mms-bitfields' which + # produces code compatible with MSVC). if os.name in ("nt", "ce"): self.failUnlessEqual(sizeof(X), sizeof(c_int) * 4) else: Modified: python/trunk/Modules/_ctypes/cfield.c ============================================================================== --- python/trunk/Modules/_ctypes/cfield.c (original) +++ python/trunk/Modules/_ctypes/cfield.c Mon Sep 29 21:56:24 2008 @@ -65,10 +65,12 @@ } if (bitsize /* this is a bitfield request */ && *pfield_size /* we have a bitfield open */ -#if defined(MS_WIN32) && !defined(__MINGW32__) - && dict->size * 8 == *pfield_size /* MSVC */ +#ifdef MS_WIN32 + /* MSVC, GCC with -mms-bitfields */ + && dict->size * 8 == *pfield_size #else - && dict->size * 8 <= *pfield_size /* GCC, MINGW */ + /* GCC */ + && dict->size * 8 <= *pfield_size #endif && (*pbitofs + bitsize) <= *pfield_size) { /* continue bit field */

1 0

buildbot failure in g4 osx.4 trunk
by buildbot＠python.org 29 Sep '08

29 Sep '08

The Buildbot has detected a new failure of g4 osx.4 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/g4%20osx.4%20trunk/builds/3972 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: psf-g4 Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: bill.janssen BUILD FAILED: failed test Excerpt from the test logfile: sincerely, -The Buildbot

1 0

r66682 - in python/trunk/Lib: ssl.py test/test_ssl.py
by bill.janssen 29 Sep '08

29 Sep '08

Author: bill.janssen Date: Mon Sep 29 20:56:38 2008 New Revision: 66682 Log: fix for release blocker 3910, 2.6 regression in socket.ssl method Modified: python/trunk/Lib/ssl.py python/trunk/Lib/test/test_ssl.py Modified: python/trunk/Lib/ssl.py ============================================================================== --- python/trunk/Lib/ssl.py (original) +++ python/trunk/Lib/ssl.py Mon Sep 29 20:56:38 2008 @@ -434,7 +434,18 @@ for compability with Python 2.5 and earlier. Will disappear in Python 3.0.""" - ssl_sock = _ssl.sslwrap(sock._sock, 0, keyfile, certfile, CERT_NONE, + if hasattr(sock, "_sock"): + sock = sock._sock + + ssl_sock = _ssl.sslwrap(sock, 0, keyfile, certfile, CERT_NONE, PROTOCOL_SSLv23, None) - ssl_sock.do_handshake() + try: + sock.getpeername() + except: + # no, no connection yet + pass + else: + # yes, do the handshake + ssl_sock.do_handshake() + return ssl_sock Modified: python/trunk/Lib/test/test_ssl.py ============================================================================== --- python/trunk/Lib/test/test_ssl.py (original) +++ python/trunk/Lib/test/test_ssl.py Mon Sep 29 20:56:38 2008 @@ -34,6 +34,21 @@ if test_support.verbose: sys.stdout.write(prefix + exc_format) + def testSimpleSSLwrap(self): + try: + ssl.sslwrap_simple(socket.socket(socket.AF_INET)) + except IOError, e: + if e.errno == 32: # broken pipe when ssl_sock.do_handshake(), this test doesn't care about that + pass + else: + raise + try: + ssl.sslwrap_simple(socket.socket(socket.AF_INET)._sock) + except IOError, e: + if e.errno == 32: # broken pipe when ssl_sock.do_handshake(), this test doesn't care about that + pass + else: + raise class BasicTests(unittest.TestCase): @@ -58,7 +73,6 @@ finally: s.close() - def testCrucialConstants(self): ssl.PROTOCOL_SSLv2 ssl.PROTOCOL_SSLv23

1 0

buildbot failure in AMD64 W2k8 trunk
by buildbot＠python.org 29 Sep '08

29 Sep '08

The Buildbot has detected a new failure of AMD64 W2k8 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/AMD64%20W2k8%20trunk/builds/968 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: nelson-win64 Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: georg.brandl BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_bsddb3 sincerely, -The Buildbot

1 0

r66681 - python/trunk/PCbuild/readme.txt
by georg.brandl 29 Sep '08

29 Sep '08

Author: georg.brandl Date: Mon Sep 29 18:51:35 2008 New Revision: 66681 Log: Update nasm location. Modified: python/trunk/PCbuild/readme.txt Modified: python/trunk/PCbuild/readme.txt ============================================================================== --- python/trunk/PCbuild/readme.txt (original) +++ python/trunk/PCbuild/readme.txt Mon Sep 29 18:51:35 2008 @@ -153,7 +153,7 @@ build process will automatically select the latest version. You must install the NASM assembler from - http://www.kernel.org/pub/software/devel/nasm/binaries/win32/ + http://nasm.sf.net for x86 builds. Put nasmw.exe anywhere in your PATH. You can also install ActivePerl from

1 0

buildbot failure in sparc Debian 3.0
by buildbot＠python.org 29 Sep '08

29 Sep '08

The Buildbot has detected a new failure of sparc Debian 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%20Debian%203.0/builds/579 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-debian-sparc Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: brett.cannon BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_subprocess make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

buildbot failure in g4 osx.4 3.0
by buildbot＠python.org 28 Sep '08

28 Sep '08

The Buildbot has detected a new failure of g4 osx.4 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/g4%20osx.4%203.0/builds/1457 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: psf-g4 Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: brett.cannon BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_doctest make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

buildbot failure in sparc Ubuntu 3.0
by buildbot＠python.org 28 Sep '08

28 Sep '08

The Buildbot has detected a new failure of sparc Ubuntu 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%20Ubuntu%203.0/builds/657 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-ubuntu-sparc Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: brett.cannon BUILD FAILED: failed failed slave lost sincerely, -The Buildbot

1 0

buildbot failure in sparc solaris10 gcc 3.0
by buildbot＠python.org 28 Sep '08

28 Sep '08

The Buildbot has detected a new failure of sparc solaris10 gcc 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%20solaris10%20gcc%203.0/builds… Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: loewis-sun Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: brett.cannon BUILD FAILED: failed test Excerpt from the test logfile: 2 tests failed: test_posix test_smtplib ====================================================================== ERROR: test_getcwd_long_pathnames (test.test_posix.PosixTester) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/test/test_posix.py", line 252, in test_getcwd_long_pathnames support.rmtree(base_path) File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/test/support.py", line 98, in rmtree shutil.rmtree(path) File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/shutil.py", line 225, in rmtree onerror(os.rmdir, path, sys.exc_info()) File "/home2/buildbot/slave/3.0.loewis-sun/build/Lib/shutil.py", line 223, in rmtree os.rmdir(path) OSError: [Errno 22] Invalid argument: '/home2/buildbot/slave/3.0.loewis-sun/build/@test.getcwd/@test.getcwd' sincerely, -The Buildbot

1 0