Mailman 3 August 2012 - Python-checkins

benchmarks: Allow for the specification of a base directory for either interpreter
by brett.cannon 31 Aug '12

31 Aug '12

http://hg.python.org/benchmarks/rev/61768f86170c changeset: 164:61768f86170c user: Brett Cannon <brett(a)python.org> date: Fri Aug 31 18:58:24 2012 -0400 summary: Allow for the specification of a base directory for either interpreter being run. This allows for comparing Python 2.x to Python 3.x by having a Python 2 copy of the benchmarks and Python 3 copy of the benchmarks and then specifying the proper directory:: benchmarks_py3k$ python3 perf.py --basedir /some/py2/benchmark `which python2.7` `which python3.2` files: perf.py | 39 ++++++++++++++++++++++++++++++++------- 1 files changed, 32 insertions(+), 7 deletions(-) diff --git a/perf.py b/perf.py --- a/perf.py +++ b/perf.py @@ -850,8 +850,14 @@ "-exec", "rm", "-f", "{}", ";"]) -def Relative(path): - return os.path.join(os.path.dirname(__file__), path) +def Relative(path, python=None, options=None): + basedir = os.path.dirname(__file__) + if python is not None: + if python[0] == options.base_binary: + basedir = options.control_dirname + else: + basedir = options.experimental_dirname + return os.path.join(basedir, path) def LogCall(command): @@ -1258,9 +1264,9 @@ def Measure2to3(python, options): - fast_target = Relative("lib/2to3/lib2to3/refactor.py") - two_to_three_bin = Relative("lib/2to3/2to3") - two_to_three_dir = Relative("lib/2to3_data") + fast_target = Relative("lib/2to3/lib2to3/refactor.py", python, options) + two_to_three_bin = Relative("lib/2to3/2to3", python, options) + two_to_three_dir = Relative("lib/2to3_data", python, options) env = BuildEnv({"PYTHONPATH": two_to_three_dir}, inherit_env=options.inherit_env) @@ -1471,8 +1477,8 @@ def MeasureMako(python, options): - bm_path = Relative("performance/bm_mako.py") - mako_path = Relative("lib/mako") + bm_path = Relative("performance/bm_mako.py", python, options) + mako_path = Relative("lib/mako", python, options) bm_env = BuildEnv({"PYTHONPATH": mako_path}, options.inherit_env) return MeasureGeneric(python, options, bm_path, bm_env, iteration_scaling=5) @@ -2086,6 +2092,13 @@ """Parser callback to --inherit_env var names.""" parser.values.inherit_env = [v for v in value.split(",") if v] +def ParseBasedirOption(python_args_opt): + default = os.path.dirname(__file__) + parts = python_args_opt.split(",") + if len(parts) == 1: # No comma + parts.append('') + return [path or default for path in parts] + def ParseOutputStyle(option, opt_str, value, parser): if value not in ("normal", "table"): @@ -2142,6 +2155,15 @@ help=("Comma-separated list of environment variable names" " that are inherited from the parent environment" " when running benchmarking subprocesses.")) + parser.add_option("--basedir", default="", + help=("A comma-separated pair of base directories to " + "use when calculating absolute file paths to " + "benchmark and library code. The first argument " + "is for the base interpreter, the second for the " + "experimental one. Any unspecified value is " + "assumed to be the directory containing this " + "file. This is typically used when comparing a " + "Python 2.x interpreter to a 3.x one.")) parser.add_option("-T", "--disable_timelines", default=False, action="store_true", help="Don't use Google charts for displaying timelines.") parser.add_option("-O", "--output_style", metavar="STYLE", type="string", @@ -2184,6 +2206,9 @@ base_cmd_prefix = [base] + base_args changed_cmd_prefix = [changed] + changed_args + basedirs = ParseBasedirOption(options.basedir) + options.control_dirname, options.experimental_dirname = basedirs + logging.basicConfig(level=logging.INFO) if options.track_memory: -- Repository URL: http://hg.python.org/benchmarks

1 0

benchmarks: Differentiate between libraries that are Python 3 compatible as-is vs.
by brett.cannon 31 Aug '12

31 Aug '12

http://hg.python.org/benchmarks/rev/47035700a022 changeset: 163:47035700a022 user: Brett Cannon <brett(a)python.org> date: Fri Aug 31 18:52:42 2012 -0400 summary: Differentiate between libraries that are Python 3 compatible as-is vs. needing 2to3 translation. files: make_perf3.sh | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/make_perf3.sh b/make_perf3.sh --- a/make_perf3.sh +++ b/make_perf3.sh @@ -30,9 +30,16 @@ cp "${srcdir}/perf.py" perf.py ${CONVERT} perf.py -SAFE_LIBS="2to3 mako pathlib" +# Libraries that are Python 3 compatible as-is. +SAFE_LIBS_AS_IS="pathlib" +# Libraries that work with Python 3 after passing through 2to3. +SAFE_LIBS_TO_TRANSLATE="2to3 mako" mkdir lib -for safe_lib in ${SAFE_LIBS}; do +for safe_lib in ${SAFE_LIBS_AS_IS}; do + cp -a "${srcdir}/lib/${safe_lib}" lib/${safe_lib} +done + +for safe_lib in ${SAFE_LIBS_TO_TRANSLATE}; do cp -a "${srcdir}/lib/${safe_lib}" lib/${safe_lib} ${CONVERT} lib/${safe_lib} done -- Repository URL: http://hg.python.org/benchmarks

1 0

cpython (2.7): Remove trailing whitespace in order to silence warnings on HP-UX.
by trent.nelson 31 Aug '12

31 Aug '12

http://hg.python.org/cpython/rev/7b076911f5f9 changeset: 78820:7b076911f5f9 branch: 2.7 parent: 78813:69952b5599b5 user: Trent Nelson <trent(a)trent.me> date: Fri Aug 31 17:15:49 2012 -0400 summary: Remove trailing whitespace in order to silence warnings on HP-UX. files: Include/pyfpe.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Include/pyfpe.h b/Include/pyfpe.h --- a/Include/pyfpe.h +++ b/Include/pyfpe.h @@ -4,8 +4,8 @@ extern "C" { #endif /* - --------------------------------------------------------------------- - / Copyright (c) 1996. \ + --------------------------------------------------------------------- + / Copyright (c) 1996. \ | The Regents of the University of California. | | All rights reserved. | | | @@ -37,8 +37,8 @@ | opinions of authors expressed herein do not necessarily state or | | reflect those of the United States Government or the University | | of California, and shall not be used for advertising or product | - \ endorsement purposes. / - --------------------------------------------------------------------- + \ endorsement purposes. / + --------------------------------------------------------------------- */ /* -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge whitespace fix from 3.2.
by trent.nelson 31 Aug '12

31 Aug '12

http://hg.python.org/cpython/rev/815b88454e3e changeset: 78819:815b88454e3e parent: 78817:d54f047312a8 parent: 78818:c0c7b1998306 user: Trent Nelson <trent(a)trent.me> date: Fri Aug 31 17:14:31 2012 -0400 summary: Merge whitespace fix from 3.2. files: Include/pyfpe.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Include/pyfpe.h b/Include/pyfpe.h --- a/Include/pyfpe.h +++ b/Include/pyfpe.h @@ -4,8 +4,8 @@ extern "C" { #endif /* - --------------------------------------------------------------------- - / Copyright (c) 1996. \ + --------------------------------------------------------------------- + / Copyright (c) 1996. \ | The Regents of the University of California. | | All rights reserved. | | | @@ -37,8 +37,8 @@ | opinions of authors expressed herein do not necessarily state or | | reflect those of the United States Government or the University | | of California, and shall not be used for advertising or product | - \ endorsement purposes. / - --------------------------------------------------------------------- + \ endorsement purposes. / + --------------------------------------------------------------------- */ /* -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Remove trailing whitespace in order to silence warnings on HP-UX.
by trent.nelson 31 Aug '12

31 Aug '12

http://hg.python.org/cpython/rev/c0c7b1998306 changeset: 78818:c0c7b1998306 branch: 3.2 parent: 78814:8877d25119ef user: Trent Nelson <trent(a)trent.me> date: Fri Aug 31 17:11:39 2012 -0400 summary: Remove trailing whitespace in order to silence warnings on HP-UX. files: Include/pyfpe.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Include/pyfpe.h b/Include/pyfpe.h --- a/Include/pyfpe.h +++ b/Include/pyfpe.h @@ -4,8 +4,8 @@ extern "C" { #endif /* - --------------------------------------------------------------------- - / Copyright (c) 1996. \ + --------------------------------------------------------------------- + / Copyright (c) 1996. \ | The Regents of the University of California. | | All rights reserved. | | | @@ -37,8 +37,8 @@ | opinions of authors expressed herein do not necessarily state or | | reflect those of the United States Government or the University | | of California, and shall not be used for advertising or product | - \ endorsement purposes. / - --------------------------------------------------------------------- + \ endorsement purposes. / + --------------------------------------------------------------------- */ /* -- Repository URL: http://hg.python.org/cpython

1 0

devguide: Tweak the last commit.
by brett.cannon 31 Aug '12

31 Aug '12

http://hg.python.org/devguide/rev/aadb78f591c8 changeset: 542:aadb78f591c8 user: Brett Cannon <brett(a)python.org> date: Fri Aug 31 15:58:08 2012 -0400 summary: Tweak the last commit. files: coverage.rst | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coverage.rst b/coverage.rst --- a/coverage.rst +++ b/coverage.rst @@ -128,13 +128,13 @@ But one of the strengths of coverage.py is its HTML-based reports which let you visually see what lines of code were not tested:: - ./python -m coverage html -i --omit="*/test/*,*/tests/*,*/Tools/*" + ./python -m coverage html -i --omit="*/test/*,*/tests/*,Tools/*" This will generate an HTML report in a directory named ``htmlcov`` which -ignores any errors that may arise and -ignores test modules. You can then open the ``htmlcov/index.html`` file -in a web browser to view the coverage results along with pages that visibly -show what lines of code were or were not executed. +ignores any errors that may arise and ignores modules for which test coverage is +unimportant (e.g. tests). You can then open the ``htmlcov/index.html`` file in a +web browser to view the coverage results along with pages that visibly show what +lines of code were or were not executed. .. _branch_coverage: -- Repository URL: http://hg.python.org/devguide

1 0

devguide: Ignore the Tools directory when generating coverage reports.
by brett.cannon 31 Aug '12

31 Aug '12

http://hg.python.org/devguide/rev/dba748ac63b4 changeset: 541:dba748ac63b4 user: Brett Cannon <brett(a)python.org> date: Fri Aug 31 15:42:20 2012 -0400 summary: Ignore the Tools directory when generating coverage reports. files: coverage.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/coverage.rst b/coverage.rst --- a/coverage.rst +++ b/coverage.rst @@ -128,7 +128,7 @@ But one of the strengths of coverage.py is its HTML-based reports which let you visually see what lines of code were not tested:: - ./python -m coverage html -i --omit="*/test/*,*/tests/*" + ./python -m coverage html -i --omit="*/test/*,*/tests/*,*/Tools/*" This will generate an HTML report in a directory named ``htmlcov`` which ignores any errors that may arise and -- Repository URL: http://hg.python.org/devguide

1 0

benchmarks: Pathlib works under Python 3.
by brett.cannon 31 Aug '12

31 Aug '12

http://hg.python.org/benchmarks/rev/873baf08045e changeset: 162:873baf08045e user: Brett Cannon <brett(a)python.org> date: Fri Aug 31 11:52:30 2012 -0400 summary: Pathlib works under Python 3. files: make_perf3.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/make_perf3.sh b/make_perf3.sh --- a/make_perf3.sh +++ b/make_perf3.sh @@ -30,7 +30,7 @@ cp "${srcdir}/perf.py" perf.py ${CONVERT} perf.py -SAFE_LIBS="2to3 mako" +SAFE_LIBS="2to3 mako pathlib" mkdir lib for safe_lib in ${SAFE_LIBS}; do cp -a "${srcdir}/lib/${safe_lib}" lib/${safe_lib} -- Repository URL: http://hg.python.org/benchmarks

1 0

benchmarks: Ignore more stuff.
by brett.cannon 31 Aug '12

31 Aug '12

http://hg.python.org/benchmarks/rev/8cc15b202237 changeset: 161:8cc15b202237 user: Brett Cannon <brett(a)python.org> date: Fri Aug 31 11:52:10 2012 -0400 summary: Ignore more stuff. files: .hgignore | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -1,7 +1,12 @@ - syntax: glob +*.swp *.pyc *.pyo *.pyd *.o lib/2to3/lib2to3/*.pickle +*.cover +*~ +.coverage +coverage/ +htmlcov/ -- Repository URL: http://hg.python.org/benchmarks

1 0

cpython: Issue #15828: Don't try to close a file if imp.find_module() doesn't
by brett.cannon 31 Aug '12

31 Aug '12

http://hg.python.org/cpython/rev/d54f047312a8 changeset: 78817:d54f047312a8 user: Brett Cannon <brett(a)python.org> date: Fri Aug 31 11:31:20 2012 -0400 summary: Issue #15828: Don't try to close a file if imp.find_module() doesn't return one. files: Lib/test/test_imp.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py --- a/Lib/test/test_imp.py +++ b/Lib/test/test_imp.py @@ -211,7 +211,9 @@ # and importlib couldn't handle C extensions example = "_heapq" x = imp.find_module(example) - self.addCleanup(x[0].close) + file_ = x[0] + if file_ is not None: + self.addCleanup(file_.close) mod = imp.load_module(example, *x) self.assertEqual(mod.__name__, example) -- Repository URL: http://hg.python.org/cpython

1 0