Mailman 3 August 2013 - Python-checkins

cpython: make lists uniformly integers for the benefit of pypy
by benjamin.peterson Aug. 29, 2013

Aug. 29, 2013

http://hg.python.org/cpython/rev/a6df3f045e8b changeset: 85458:a6df3f045e8b user: Benjamin Peterson <benjamin(a)python.org> date: Thu Aug 29 17:27:57 2013 -0400 summary: make lists uniformly integers for the benefit of pypy files: Lib/datetime.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/datetime.py b/Lib/datetime.py --- a/Lib/datetime.py +++ b/Lib/datetime.py @@ -23,9 +23,10 @@ # for all computations. See the book for algorithms for converting between # proleptic Gregorian ordinals and many other calendar systems. -_DAYS_IN_MONTH = [None, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] +# -1 is a placeholder for 0. +_DAYS_IN_MONTH = [-1, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] -_DAYS_BEFORE_MONTH = [None] +_DAYS_BEFORE_MONTH = [-1] # -1 is a placeholder for 0. dbm = 0 for dim in _DAYS_IN_MONTH[1:]: _DAYS_BEFORE_MONTH.append(dbm) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Fixes Issue #15507: test_subprocess's test_send_signal could fail if the test
by gregory.p.smith Aug. 29, 2013

Aug. 29, 2013

http://hg.python.org/cpython/rev/6aa7ca40b100 changeset: 85457:6aa7ca40b100 parent: 85455:dd6e0ccf8ec1 parent: 85456:9810844126e1 user: Gregory P. Smith <greg(a)krypto.org> date: Thu Aug 29 13:39:44 2013 -0700 summary: Fixes Issue #15507: test_subprocess's test_send_signal could fail if the test runner were run in an environment where the process inherited an ignore setting for SIGINT. Restore the SIGINT handler to the desired KeyboardInterrupt raising one during that test. files: Lib/test/test_subprocess.py | 26 +++++++++++++++--------- Misc/NEWS | 5 ++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1432,16 +1432,22 @@ def _kill_process(self, method, *args): # Do not inherit file handles from the parent. # It should fix failures on some platforms. - p = subprocess.Popen([sys.executable, "-c", """if 1: - import sys, time - sys.stdout.write('x\\n') - sys.stdout.flush() - time.sleep(30) - """], - close_fds=True, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + # Also set the SIGINT handler to the default to make sure it's not + # being ignored (some tests rely on that.) + old_handler = signal.signal(signal.SIGINT, signal.default_int_handler) + try: + p = subprocess.Popen([sys.executable, "-c", """if 1: + import sys, time + sys.stdout.write('x\\n') + sys.stdout.flush() + time.sleep(30) + """], + close_fds=True, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + finally: + signal.signal(signal.SIGINT, old_handler) # Wait for the interpreter to be completely initialized before # sending any signal. p.stdout.read(1) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -155,6 +155,11 @@ Tests ----- +- Issue #15507: test_subprocess's test_send_signal could fail if the test + runner were run in an environment where the process inherited an ignore + setting for SIGINT. Restore the SIGINT handler to the desired + KeyboardInterrupt raising one during that test. + - Issue #16799: Switched from getopt to argparse style in regrtest's argument parsing. Added more tests for regrtest's argument parsing. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Fixes issue #15507: test_subprocess's test_send_signal could fail if the test
by gregory.p.smith Aug. 29, 2013

Aug. 29, 2013

http://hg.python.org/cpython/rev/9810844126e1 changeset: 85456:9810844126e1 branch: 3.3 parent: 85453:5f23df32f888 user: Gregory P. Smith <greg(a)krypto.org> date: Thu Aug 29 13:35:27 2013 -0700 summary: Fixes issue #15507: test_subprocess's test_send_signal could fail if the test runner were run in an environment where the process inherited an ignore setting for SIGINT. Restore the SIGINT handler to the desired KeyboardInterrupt raising one during that test. files: Lib/test/test_subprocess.py | 26 +++++++++++++++--------- Misc/NEWS | 5 ++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1398,16 +1398,22 @@ def _kill_process(self, method, *args): # Do not inherit file handles from the parent. # It should fix failures on some platforms. - p = subprocess.Popen([sys.executable, "-c", """if 1: - import sys, time - sys.stdout.write('x\\n') - sys.stdout.flush() - time.sleep(30) - """], - close_fds=True, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + # Also set the SIGINT handler to the default to make sure it's not + # being ignored (some tests rely on that.) + old_handler = signal.signal(signal.SIGINT, signal.default_int_handler) + try: + p = subprocess.Popen([sys.executable, "-c", """if 1: + import sys, time + sys.stdout.write('x\\n') + sys.stdout.flush() + time.sleep(30) + """], + close_fds=True, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + finally: + signal.signal(signal.SIGINT, old_handler) # Wait for the interpreter to be completely initialized before # sending any signal. p.stdout.read(1) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -309,6 +309,11 @@ Tests ----- +- Issue #15507: test_subprocess's test_send_signal could fail if the test + runner were run in an environment where the process inherited an ignore + setting for SIGINT. Restore the SIGINT handler to the desired + KeyboardInterrupt raising one during that test. + - Issue #18792: Use "127.0.0.1" or "::1" instead of "localhost" as much as possible, since "localhost" goes through a DNS lookup under recent Windows versions. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Null merge of 3.3 into default.
by tim.peters Aug. 29, 2013

Aug. 29, 2013

http://hg.python.org/cpython/rev/dd6e0ccf8ec1 changeset: 85455:dd6e0ccf8ec1 parent: 85454:142627dbe10d parent: 85453:5f23df32f888 user: Tim Peters <tim(a)python.org> date: Thu Aug 29 12:35:37 2013 -0500 summary: Null merge of 3.3 into default. files: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge default -> default): Merge.
by charles-francois.natali Aug. 29, 2013

Aug. 29, 2013

http://hg.python.org/cpython/rev/142627dbe10d changeset: 85454:142627dbe10d parent: 85448:6d998a43102b parent: 85451:9b27cf72c79b user: Charles-François Natali <cf.natali(a)gmail.com> date: Thu Aug 29 19:27:17 2013 +0200 summary: Merge. files: Lib/test/support/__init__.py | 8 +++++++- Lib/test/test_socket.py | 7 ++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -604,8 +604,14 @@ # Windows limit seems to be around 512 B, and many Unix kernels have a # 64 KiB pipe buffer size or 16 * PAGE_SIZE: take a few megs to be sure. # (see issue #17835 for a discussion of this number). -PIPE_MAX_SIZE = 4 *1024 * 1024 + 1 +PIPE_MAX_SIZE = 4 * 1024 * 1024 + 1 +# A constant likely larger than the underlying OS socket buffer size, to make +# writes blocking. +# The socket buffer sizes can usually be tuned system-wide (e.g. through sysctl +# on Linux), or on a per-socket basis (SO_SNDBUF/SO_RCVBUF). See issue #18643 +# for a discussion of this number). +SOCK_MAX_SIZE = 16 * 1024 * 1024 + 1 # decorator for skipping tests on non-IEEE 754 platforms requires_IEEE_754 = unittest.skipUnless( diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1247,11 +1247,12 @@ c.settimeout(1.5) with self.assertRaises(ZeroDivisionError): signal.alarm(1) - c.sendall(b"x" * (1024**2)) + c.sendall(b"x" * support.SOCK_MAX_SIZE) if with_timeout: signal.signal(signal.SIGALRM, ok_handler) signal.alarm(1) - self.assertRaises(socket.timeout, c.sendall, b"x" * (1024**2)) + self.assertRaises(socket.timeout, c.sendall, + b"x" * support.SOCK_MAX_SIZE) finally: signal.alarm(0) signal.signal(signal.SIGALRM, old_alarm) @@ -4138,7 +4139,7 @@ self.serv_skipped = None self.serv_conn.setblocking(False) # Try to saturate the socket buffer pipe with repeated large writes. - BIG = b"x" * (1024 ** 2) + BIG = b"x" * support.SOCK_MAX_SIZE LIMIT = 10 # The first write() succeeds since a chunk of data can be buffered n = self.write_file.write(BIG) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> 3.3): Merge.
by charles-francois.natali Aug. 29, 2013

Aug. 29, 2013

http://hg.python.org/cpython/rev/5f23df32f888 changeset: 85453:5f23df32f888 branch: 3.3 parent: 85441:6c0f5af2f5a5 parent: 85450:498957c97c2b user: Charles-François Natali <cf.natali(a)gmail.com> date: Thu Aug 29 19:26:37 2013 +0200 summary: Merge. files: Lib/test/support/__init__.py | 8 +++++++- Lib/test/test_socket.py | 7 ++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -603,8 +603,14 @@ # Windows limit seems to be around 512 B, and many Unix kernels have a # 64 KiB pipe buffer size or 16 * PAGE_SIZE: take a few megs to be sure. # (see issue #17835 for a discussion of this number). -PIPE_MAX_SIZE = 4 *1024 * 1024 + 1 +PIPE_MAX_SIZE = 4 * 1024 * 1024 + 1 +# A constant likely larger than the underlying OS socket buffer size, to make +# writes blocking. +# The socket buffer sizes can usually be tuned system-wide (e.g. through sysctl +# on Linux), or on a per-socket basis (SO_SNDBUF/SO_RCVBUF). See issue #18643 +# for a discussion of this number). +SOCK_MAX_SIZE = 16 * 1024 * 1024 + 1 # decorator for skipping tests on non-IEEE 754 platforms requires_IEEE_754 = unittest.skipUnless( diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1210,11 +1210,12 @@ c.settimeout(1.5) with self.assertRaises(ZeroDivisionError): signal.alarm(1) - c.sendall(b"x" * (1024**2)) + c.sendall(b"x" * support.SOCK_MAX_SIZE) if with_timeout: signal.signal(signal.SIGALRM, ok_handler) signal.alarm(1) - self.assertRaises(socket.timeout, c.sendall, b"x" * (1024**2)) + self.assertRaises(socket.timeout, c.sendall, + b"x" * support.SOCK_MAX_SIZE) finally: signal.alarm(0) signal.signal(signal.SIGALRM, old_alarm) @@ -4047,7 +4048,7 @@ self.serv_skipped = None self.serv_conn.setblocking(False) # Try to saturate the socket buffer pipe with repeated large writes. - BIG = b"x" * (1024 ** 2) + BIG = b"x" * support.SOCK_MAX_SIZE LIMIT = 10 # The first write() succeeds since a chunk of data can be buffered n = self.write_file.write(BIG) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 2.7 -> 2.7): Merge.
by charles-francois.natali Aug. 29, 2013

Aug. 29, 2013

http://hg.python.org/cpython/rev/7d530381fc0e changeset: 85452:7d530381fc0e branch: 2.7 parent: 85443:8c768bbacd92 parent: 85449:2de7fc69d2d4 user: Charles-François Natali <cf.natali(a)gmail.com> date: Thu Aug 29 19:26:12 2013 +0200 summary: Merge. files: Lib/test/test_socket.py | 5 +++-- Lib/test/test_support.py | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -688,11 +688,12 @@ c.settimeout(1.5) with self.assertRaises(ZeroDivisionError): signal.alarm(1) - c.sendall(b"x" * (1024**2)) + c.sendall(b"x" * test_support.SOCK_MAX_SIZE) if with_timeout: signal.signal(signal.SIGALRM, ok_handler) signal.alarm(1) - self.assertRaises(socket.timeout, c.sendall, b"x" * (1024**2)) + self.assertRaises(socket.timeout, c.sendall, + b"x" * test_support.SOCK_MAX_SIZE) finally: signal.signal(signal.SIGALRM, old_alarm) c.close() diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -411,8 +411,14 @@ # Windows limit seems to be around 512 B, and many Unix kernels have a # 64 KiB pipe buffer size or 16 * PAGE_SIZE: take a few megs to be sure. # (see issue #17835 for a discussion of this number). -PIPE_MAX_SIZE = 4 *1024 * 1024 + 1 +PIPE_MAX_SIZE = 4 * 1024 * 1024 + 1 +# A constant likely larger than the underlying OS socket buffer size, to make +# writes blocking. +# The socket buffer sizes can usually be tuned system-wide (e.g. through sysctl +# on Linux), or on a per-socket basis (SO_SNDBUF/SO_RCVBUF). See issue #18643 +# for a discussion of this number). +SOCK_MAX_SIZE = 16 * 1024 * 1024 + 1 try: unicode -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #18643: Fix some test_socket failures due to large default socket buffer
by charles-francois.natali Aug. 29, 2013

Aug. 29, 2013

http://hg.python.org/cpython/rev/9b27cf72c79b changeset: 85451:9b27cf72c79b parent: 85417:df2fdd42b375 parent: 85450:498957c97c2b user: Charles-François Natali <cf.natali(a)gmail.com> date: Thu Aug 29 19:02:23 2013 +0200 summary: Issue #18643: Fix some test_socket failures due to large default socket buffer sizes. files: Lib/test/support/__init__.py | 8 +++++++- Lib/test/test_socket.py | 7 ++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -602,8 +602,14 @@ # Windows limit seems to be around 512 B, and many Unix kernels have a # 64 KiB pipe buffer size or 16 * PAGE_SIZE: take a few megs to be sure. # (see issue #17835 for a discussion of this number). -PIPE_MAX_SIZE = 4 *1024 * 1024 + 1 +PIPE_MAX_SIZE = 4 * 1024 * 1024 + 1 +# A constant likely larger than the underlying OS socket buffer size, to make +# writes blocking. +# The socket buffer sizes can usually be tuned system-wide (e.g. through sysctl +# on Linux), or on a per-socket basis (SO_SNDBUF/SO_RCVBUF). See issue #18643 +# for a discussion of this number). +SOCK_MAX_SIZE = 16 * 1024 * 1024 + 1 # decorator for skipping tests on non-IEEE 754 platforms requires_IEEE_754 = unittest.skipUnless( diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1245,11 +1245,12 @@ c.settimeout(1.5) with self.assertRaises(ZeroDivisionError): signal.alarm(1) - c.sendall(b"x" * (1024**2)) + c.sendall(b"x" * support.SOCK_MAX_SIZE) if with_timeout: signal.signal(signal.SIGALRM, ok_handler) signal.alarm(1) - self.assertRaises(socket.timeout, c.sendall, b"x" * (1024**2)) + self.assertRaises(socket.timeout, c.sendall, + b"x" * support.SOCK_MAX_SIZE) finally: signal.alarm(0) signal.signal(signal.SIGALRM, old_alarm) @@ -4136,7 +4137,7 @@ self.serv_skipped = None self.serv_conn.setblocking(False) # Try to saturate the socket buffer pipe with repeated large writes. - BIG = b"x" * (1024 ** 2) + BIG = b"x" * support.SOCK_MAX_SIZE LIMIT = 10 # The first write() succeeds since a chunk of data can be buffered n = self.write_file.write(BIG) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #18643: Fix some test_socket failures due to large default socket buffer
by charles-francois.natali Aug. 29, 2013

Aug. 29, 2013

http://hg.python.org/cpython/rev/498957c97c2b changeset: 85450:498957c97c2b branch: 3.3 parent: 85412:694e50a79638 user: Charles-François Natali <cf.natali(a)gmail.com> date: Thu Aug 29 19:01:40 2013 +0200 summary: Issue #18643: Fix some test_socket failures due to large default socket buffer sizes. files: Lib/test/support/__init__.py | 8 +++++++- Lib/test/test_socket.py | 7 ++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -601,8 +601,14 @@ # Windows limit seems to be around 512 B, and many Unix kernels have a # 64 KiB pipe buffer size or 16 * PAGE_SIZE: take a few megs to be sure. # (see issue #17835 for a discussion of this number). -PIPE_MAX_SIZE = 4 *1024 * 1024 + 1 +PIPE_MAX_SIZE = 4 * 1024 * 1024 + 1 +# A constant likely larger than the underlying OS socket buffer size, to make +# writes blocking. +# The socket buffer sizes can usually be tuned system-wide (e.g. through sysctl +# on Linux), or on a per-socket basis (SO_SNDBUF/SO_RCVBUF). See issue #18643 +# for a discussion of this number). +SOCK_MAX_SIZE = 16 * 1024 * 1024 + 1 # decorator for skipping tests on non-IEEE 754 platforms requires_IEEE_754 = unittest.skipUnless( diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1210,11 +1210,12 @@ c.settimeout(1.5) with self.assertRaises(ZeroDivisionError): signal.alarm(1) - c.sendall(b"x" * (1024**2)) + c.sendall(b"x" * support.SOCK_MAX_SIZE) if with_timeout: signal.signal(signal.SIGALRM, ok_handler) signal.alarm(1) - self.assertRaises(socket.timeout, c.sendall, b"x" * (1024**2)) + self.assertRaises(socket.timeout, c.sendall, + b"x" * support.SOCK_MAX_SIZE) finally: signal.alarm(0) signal.signal(signal.SIGALRM, old_alarm) @@ -4047,7 +4048,7 @@ self.serv_skipped = None self.serv_conn.setblocking(False) # Try to saturate the socket buffer pipe with repeated large writes. - BIG = b"x" * (1024 ** 2) + BIG = b"x" * support.SOCK_MAX_SIZE LIMIT = 10 # The first write() succeeds since a chunk of data can be buffered n = self.write_file.write(BIG) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #18643: Fix some test_socket failures due to large default socket buffer
by charles-francois.natali Aug. 29, 2013

Aug. 29, 2013

http://hg.python.org/cpython/rev/2de7fc69d2d4 changeset: 85449:2de7fc69d2d4 branch: 2.7 parent: 85411:187a678c6033 user: Charles-François Natali <cf.natali(a)gmail.com> date: Thu Aug 29 19:00:30 2013 +0200 summary: Issue #18643: Fix some test_socket failures due to large default socket buffer sizes. files: Lib/test/test_socket.py | 5 +++-- Lib/test/test_support.py | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -688,11 +688,12 @@ c.settimeout(1.5) with self.assertRaises(ZeroDivisionError): signal.alarm(1) - c.sendall(b"x" * (1024**2)) + c.sendall(b"x" * test_support.SOCK_MAX_SIZE) if with_timeout: signal.signal(signal.SIGALRM, ok_handler) signal.alarm(1) - self.assertRaises(socket.timeout, c.sendall, b"x" * (1024**2)) + self.assertRaises(socket.timeout, c.sendall, + b"x" * test_support.SOCK_MAX_SIZE) finally: signal.signal(signal.SIGALRM, old_alarm) c.close() diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -411,8 +411,14 @@ # Windows limit seems to be around 512 B, and many Unix kernels have a # 64 KiB pipe buffer size or 16 * PAGE_SIZE: take a few megs to be sure. # (see issue #17835 for a discussion of this number). -PIPE_MAX_SIZE = 4 *1024 * 1024 + 1 +PIPE_MAX_SIZE = 4 * 1024 * 1024 + 1 +# A constant likely larger than the underlying OS socket buffer size, to make +# writes blocking. +# The socket buffer sizes can usually be tuned system-wide (e.g. through sysctl +# on Linux), or on a per-socket basis (SO_SNDBUF/SO_RCVBUF). See issue #18643 +# for a discussion of this number). +SOCK_MAX_SIZE = 16 * 1024 * 1024 + 1 try: unicode -- Repository URL: http://hg.python.org/cpython

1 0