Mailman 3 January 2012 - Python-checkins

cpython (merge 3.2 -> default): Port remaining test fixes, and fix test_importlib too.
by antoine.pitrou Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/454d1c52f3e0 changeset: 74604:454d1c52f3e0 parent: 74597:cb13d8cff050 parent: 74603:37ac757a9145 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Wed Jan 25 03:01:34 2012 +0100 summary: Port remaining test fixes, and fix test_importlib too. files: Lib/importlib/test/source/test_file_loader.py | 10 +++- Lib/test/test_import.py | 29 +++++++-- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/Lib/importlib/test/source/test_file_loader.py b/Lib/importlib/test/source/test_file_loader.py --- a/Lib/importlib/test/source/test_file_loader.py +++ b/Lib/importlib/test/source/test_file_loader.py @@ -4,6 +4,7 @@ from .. import util from . import util as source_util +import errno import imp import marshal import os @@ -131,7 +132,14 @@ compiled = imp.cache_from_source(source) with open(source, 'w') as f: f.write("x = 5") - os.utime(source, (2 ** 33, 2 ** 33)) + try: + os.utime(source, (2 ** 33, 2 ** 33)) + except OverflowError: + self.skipTest("cannot set modification time to large integer") + except OSError as e: + if e.errno != getattr(errno, 'EOVERFLOW', None): + raise + self.skipTest("cannot set modification time to large integer ({})".format(e)) loader = _bootstrap._SourceFileLoader('_temp', mapping['_temp']) mod = loader.load_module('_temp') # Sanity checks. diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -11,6 +11,7 @@ import sys import unittest import textwrap +import errno from test.support import ( EnvironmentVarGuard, TESTFN, check_warnings, forget, is_jython, @@ -309,14 +310,26 @@ def test_timestamp_overflow(self): # A modification timestamp larger than 2**32 should not be a problem # when importing a module (issue #11235). - source = TESTFN + ".py" - compiled = imp.cache_from_source(source) - with open(source, 'w') as f: - pass - os.utime(source, (2 ** 33, 2 ** 33)) - __import__(TESTFN) - # The pyc file was created. - os.stat(compiled) + sys.path.insert(0, os.curdir) + try: + source = TESTFN + ".py" + compiled = imp.cache_from_source(source) + with open(source, 'w') as f: + pass + try: + os.utime(source, (2 ** 33, 2 ** 33)) + except OverflowError: + self.skipTest("cannot set modification time to large integer") + except OSError as e: + if e.errno != getattr(errno, 'EOVERFLOW', None): + raise + self.skipTest("cannot set modification time to large integer ({})".format(e)) + __import__(TESTFN) + # The pyc file was created. + os.stat(compiled) + finally: + del sys.path[0] + remove_files(TESTFN) class PycRewritingTests(unittest.TestCase): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Port remaining test fixes, and fix test_importlib too.
by antoine.pitrou Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/37ac757a9145 changeset: 74603:37ac757a9145 branch: 3.2 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Wed Jan 25 03:00:57 2012 +0100 summary: Port remaining test fixes, and fix test_importlib too. files: Lib/importlib/test/source/test_file_loader.py | 10 +++++++++- Lib/test/test_import.py | 5 +++++ 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/Lib/importlib/test/source/test_file_loader.py b/Lib/importlib/test/source/test_file_loader.py --- a/Lib/importlib/test/source/test_file_loader.py +++ b/Lib/importlib/test/source/test_file_loader.py @@ -4,6 +4,7 @@ from .. import util from . import util as source_util +import errno import imp import marshal import os @@ -136,7 +137,14 @@ compiled = imp.cache_from_source(source) with open(source, 'w') as f: f.write("x = 5") - os.utime(source, (2 ** 33, 2 ** 33)) + try: + os.utime(source, (2 ** 33, 2 ** 33)) + except OverflowError: + self.skipTest("cannot set modification time to large integer") + except OSError as e: + if e.errno != getattr(errno, 'EOVERFLOW', None): + raise + self.skipTest("cannot set modification time to large integer ({})".format(e)) loader = _bootstrap._SourceFileLoader('_temp', mapping['_temp']) mod = loader.load_module('_temp') # Sanity checks. diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -11,6 +11,7 @@ import sys import unittest import textwrap +import errno from test.support import ( EnvironmentVarGuard, TESTFN, check_warnings, forget, is_jython, @@ -323,6 +324,10 @@ os.utime(source, (2 ** 33, 2 ** 33)) except OverflowError: self.skipTest("cannot set modification time to large integer") + except OSError as e: + if e.errno != getattr(errno, 'EOVERFLOW', None): + raise + self.skipTest("cannot set modification time to large integer ({})".format(e)) __import__(TESTFN) # The pyc file was created. os.stat(compiled) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Make test work under 32-bit systems, and when invoked through
by antoine.pitrou Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/365d0e387179 changeset: 74602:365d0e387179 branch: 3.2 parent: 74596:a2f3d6986bfa user: Antoine Pitrou <solipsis(a)pitrou.net> date: Wed Jan 25 01:35:26 2012 +0100 summary: Make test work under 32-bit systems, and when invoked through Lib/test/regrtest.py (rather than `-m test.regrtest`) files: Lib/test/test_import.py | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -313,14 +313,22 @@ def test_timestamp_overflow(self): # A modification timestamp larger than 2**32 should not be a problem # when importing a module (issue #11235). - source = TESTFN + ".py" - compiled = imp.cache_from_source(source) - with open(source, 'w') as f: - pass - os.utime(source, (2 ** 33, 2 ** 33)) - __import__(TESTFN) - # The pyc file was created. - os.stat(compiled) + sys.path.insert(0, os.curdir) + try: + source = TESTFN + ".py" + compiled = imp.cache_from_source(source) + with open(source, 'w') as f: + pass + try: + os.utime(source, (2 ** 33, 2 ** 33)) + except OverflowError: + self.skipTest("cannot set modification time to large integer") + __import__(TESTFN) + # The pyc file was created. + os.stat(compiled) + finally: + del sys.path[0] + remove_files(TESTFN) class PycRewritingTests(unittest.TestCase): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Skip test failure under OpenIndiana
by antoine.pitrou Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/dd1b4fc2d736 changeset: 74601:dd1b4fc2d736 branch: 2.7 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Wed Jan 25 02:49:47 2012 +0100 summary: Skip test failure under OpenIndiana files: Lib/test/test_import.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -1,3 +1,4 @@ +import errno import imp import marshal import os @@ -290,6 +291,10 @@ os.utime(source, (2 ** 33, 2 ** 33)) except OverflowError: self.skipTest("cannot set modification time to large integer") + except OSError as e: + if e.errno != getattr(errno, 'EOVERFLOW', None): + raise + self.skipTest("cannot set modification time to large integer ({})".format(e)) __import__(TESTFN) # The pyc file was created. os.stat(compiled) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Make test work under 32-bit systems, and when invoked through
by antoine.pitrou Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/5f7ad3c26677 changeset: 74600:5f7ad3c26677 branch: 2.7 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Wed Jan 25 01:35:26 2012 +0100 summary: Make test work under 32-bit systems, and when invoked through Lib/test/regrtest.py (rather than `-m test.regrtest`) files: Lib/test/test_import.py | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -280,15 +280,22 @@ def test_timestamp_overflow(self): # A modification timestamp larger than 2**32 should not be a problem # when importing a module (issue #11235). - source = TESTFN + ".py" - self.addCleanup(remove_files, TESTFN) - compiled = source + ('c' if __debug__ else 'o') - with open(source, 'w') as f: - pass - os.utime(source, (2 ** 33, 2 ** 33)) - __import__(TESTFN) - # The pyc file was created. - os.stat(compiled) + sys.path.insert(0, os.curdir) + try: + source = TESTFN + ".py" + compiled = source + ('c' if __debug__ else 'o') + with open(source, 'w') as f: + pass + try: + os.utime(source, (2 ** 33, 2 ** 33)) + except OverflowError: + self.skipTest("cannot set modification time to large integer") + __import__(TESTFN) + # The pyc file was created. + os.stat(compiled) + finally: + del sys.path[0] + remove_files(TESTFN) class PycRewritingTests(unittest.TestCase): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #12501: merge the discordant NEWS entries.
by florent.xicluna Jan. 24, 2012

Jan. 24, 2012

http://hg.python.org/cpython/rev/62bd0553693f changeset: 74599:62bd0553693f branch: 2.7 user: Florent Xicluna <florent.xicluna(a)gmail.com> date: Tue Jan 24 21:05:10 2012 +0100 summary: Issue #12501: merge the discordant NEWS entries. files: Misc/NEWS | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -25,8 +25,6 @@ - Issue #13333: The UTF-7 decoder now accepts lone surrogates (the encoder already accepts them). -- Remove Py3k warning for callable. - - Issue #10519: Avoid unnecessary recursive function calls in setobject.c. @@ -73,8 +71,8 @@ deallocator calls one of the methods on the type (e.g. when subclassing IOBase). Diagnosis and patch by Davide Rizzo. -- Issue #12501: Adjust callable() warning: callable() is only not supported in - Python 3.1. callable() is again supported in Python 3.2. +- Issue #12501: Remove Py3k warning for callable. callable() is supported + again in Python 3.2. - Issue #9611, #9015: FileIO.read(), FileIO.readinto(), FileIO.write() and os.write() clamp the length to INT_MAX on Windows. -- Repository URL: http://hg.python.org/cpython

1 0

devinabox: Clean up arguments for building the devguide.
by brett.cannon Jan. 24, 2012

Jan. 24, 2012

http://hg.python.org/devinabox/rev/f890f17df293 changeset: 40:f890f17df293 user: Brett Cannon <brett(a)python.org> date: Tue Jan 24 14:46:03 2012 -0500 summary: Clean up arguments for building the devguide. files: make_a_box.py | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/make_a_box.py b/make_a_box.py --- a/make_a_box.py +++ b/make_a_box.py @@ -247,18 +247,20 @@ """Build the devguide using Sphinx from CPython's docs.""" # Grab Sphinx from cpython/Doc/tools/ tools_directory = os.path.join('cpython', 'Doc', 'tools') - sphinx_build_path = os.path.abspath(os.path.join(tools_directory, 'sphinx-build.py')) + sphinx_build_path = os.path.join(tools_directory, 'sphinx-build.py') + sphinx_build_path = os.path.abspath(sphinx_build_path) orig_pythonpath = os.environ.get('PYTHONPATH') os.environ['PYTHONPATH'] = os.path.abspath(tools_directory) - sphinxbuild_env = "SPHINXBUILD='python {}'".format(sphinx_build_path) + orig_sphinxbuild = os.environ.get('SPHINXBUILD') + os.environ['SPHINXBUILD'] = 'python {}'.format(sphinx_build_path) try: with change_cwd(self.directory): - subprocess.check_call(' '.join(['make', 'html', - sphinxbuild_env]), - shell=True) + subprocess.check_call(['make', 'html']) finally: if orig_pythonpath: os.environ['PYTHONPATH'] = orig_pythonpath + if orig_sphinxbuild: + os.environ['SPHINXBUILD'] = orig_sphinxbuild index_path = os.path.join(self.directory, '_build', 'html', 'index.html') -- Repository URL: http://hg.python.org/devinabox

1 0

devguide: Add a note that -j0 is a 3.3 feature.
by brett.cannon Jan. 24, 2012

Jan. 24, 2012

http://hg.python.org/devguide/rev/051873f59622 changeset: 490:051873f59622 user: Brett Cannon <brett(a)python.org> date: Tue Jan 24 14:04:54 2012 -0500 summary: Add a note that -j0 is a 3.3 feature. files: runtests.rst | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/runtests.rst b/runtests.rst --- a/runtests.rst +++ b/runtests.rst @@ -43,6 +43,9 @@ ./python -m test -j0 +If you are running a version of Python prior to 3.3 you must specify the number +of processes to run simultaneously (e.g. ``-j2``). + .. _strenuous_testing: Finally, if you want to run tests under a more strenuous set of settings, you -- Repository URL: http://hg.python.org/devguide

1 0

devinabox: People should be reading the dev guid and using Tools/scripts/run_tests.py.
by brett.cannon Jan. 24, 2012

Jan. 24, 2012

http://hg.python.org/devinabox/rev/bbd2884126cc changeset: 38:bbd2884126cc user: Brett Cannon <brett(a)python.org> date: Tue Jan 24 14:00:05 2012 -0500 summary: People should be reading the dev guid and using Tools/scripts/run_tests.py. files: run_all_tests.py | 24 ------------------------ 1 files changed, 0 insertions(+), 24 deletions(-) diff --git a/run_all_tests.py b/run_all_tests.py deleted file mode 100755 --- a/run_all_tests.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python -"""Run CPython's test suite in the most rigorous way possible.""" -import multiprocessing -import shutil -import subprocess -import sys -import build_cpython - - -def main(): - cmd = build_cpython.main() - if cmd is None: - print('CPython is not built') - sys.exit(1) - try: - subprocess.call([cmd, '-W', 'default', '-bb', '-E', '-m', 'test', '-r', - '-w', '-u', 'all', '-j', - str(multiprocessing.cpu_count())]) - finally: - shutil.rmtree('build') - - -if __name__ == '__main__': - main() -- Repository URL: http://hg.python.org/devinabox

1 0

devinabox: Install to /tmp/cpython so people can test installation issues.
by brett.cannon Jan. 24, 2012

Jan. 24, 2012

http://hg.python.org/devinabox/rev/d3bc278f0471 changeset: 39:d3bc278f0471 user: Brett Cannon <brett(a)python.org> date: Tue Jan 24 14:01:54 2012 -0500 summary: Install to /tmp/cpython so people can test installation issues. files: build_cpython.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build_cpython.py b/build_cpython.py --- a/build_cpython.py +++ b/build_cpython.py @@ -36,7 +36,7 @@ if os.path.isfile('Makefile'): print('Makefile already exists; skipping ./configure') else: - subprocess.check_call(['./configure', '--prefix=/dev/null', + subprocess.check_call(['./configure', '--prefix=/tmp/cpython', '--with-pydebug']) make_cmd = ['make', '-s', '-j', str(multiprocessing.cpu_count())] subprocess.call(make_cmd) -- Repository URL: http://hg.python.org/devinabox

1 0