Mailman 3 September 2014 - Python-checkins

cpython: Issue #22333: Extend timeout in test_threaded_import
by victor.stinner 01 Oct '14

01 Oct '14

https://hg.python.org/cpython/rev/926c380aa423 changeset: 92697:926c380aa423 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Oct 01 01:45:16 2014 +0200 summary: Issue #22333: Extend timeout in test_threaded_import Check if the sporadic failure is related to a timeout. The test just failed on the buildbot "x86 Windows7 3.x": 1 thread done / 20 (the 'done' condition was not signaled because 1 < 20). files: Lib/test/test_threaded_import.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py --- a/Lib/test/test_threaded_import.py +++ b/Lib/test/test_threaded_import.py @@ -118,7 +118,7 @@ t = threading.Thread(target=task, args=(N, done, done_tasks, errors,)) t.start() - completed = done.wait(60) + completed = done.wait(10 * 60) dbg_info = 'done: %s/%s' % (len(done_tasks), N) self.assertFalse(errors, dbg_info) self.assertTrue(completed, dbg_info) -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #22333: test_threaded_import now displays elapsed time in verbose mode.
by victor.stinner 01 Oct '14

01 Oct '14

https://hg.python.org/cpython/rev/c8e7362875a8 changeset: 92698:c8e7362875a8 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Oct 01 01:48:05 2014 +0200 summary: Issue #22333: test_threaded_import now displays elapsed time in verbose mode. files: Lib/test/test_threaded_import.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_threaded_import.py b/Lib/test/test_threaded_import.py --- a/Lib/test/test_threaded_import.py +++ b/Lib/test/test_threaded_import.py @@ -114,11 +114,15 @@ errors = [] done_tasks = [] done.clear() + t0 = time.monotonic() for i in range(N): t = threading.Thread(target=task, args=(N, done, done_tasks, errors,)) t.start() completed = done.wait(10 * 60) + dt = time.monotonic() - t0 + if verbose: + print("%.1f ms" % (dt*1e3), flush=True, end=" ") dbg_info = 'done: %s/%s' % (len(done_tasks), N) self.assertFalse(errors, dbg_info) self.assertTrue(completed, dbg_info) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.4 -> default): Merge with 3.4
by terry.reedy 01 Oct '14

01 Oct '14

https://hg.python.org/cpython/rev/3635b1bf0431 changeset: 92696:3635b1bf0431 parent: 92692:2de58aebae64 parent: 92695:4848e0c6b342 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Sep 30 19:08:02 2014 -0400 summary: Merge with 3.4 files: Doc/reference/datamodel.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -222,7 +222,7 @@ at the mercy of the underlying machine architecture (and C or Java implementation) for the accepted range and handling of overflow. Python does not support single-precision floating point numbers; the savings in processor and - memory usage that are usually the reason for using these is dwarfed by the + memory usage that are usually the reason for using these are dwarfed by the overhead of using objects in Python, so there is no reason to complicate the language with two kinds of floating point numbers. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Issue 22465: grammar, number agreement.
by terry.reedy 01 Oct '14

01 Oct '14

https://hg.python.org/cpython/rev/4848e0c6b342 changeset: 92695:4848e0c6b342 branch: 3.4 parent: 92690:40c031308967 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Sep 30 19:07:49 2014 -0400 summary: Issue 22465: grammar, number agreement. files: Doc/reference/datamodel.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -222,7 +222,7 @@ at the mercy of the underlying machine architecture (and C or Java implementation) for the accepted range and handling of overflow. Python does not support single-precision floating point numbers; the savings in processor and - memory usage that are usually the reason for using these is dwarfed by the + memory usage that are usually the reason for using these are dwarfed by the overhead of using objects in Python, so there is no reason to complicate the language with two kinds of floating point numbers. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue 22465: grammar, number agreement.
by terry.reedy 01 Oct '14

01 Oct '14

https://hg.python.org/cpython/rev/63dc1e32b715 changeset: 92694:63dc1e32b715 branch: 2.7 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Tue Sep 30 19:07:45 2014 -0400 summary: Issue 22465: grammar, number agreement. files: Doc/reference/datamodel.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst --- a/Doc/reference/datamodel.rst +++ b/Doc/reference/datamodel.rst @@ -234,7 +234,7 @@ at the mercy of the underlying machine architecture (and C or Java implementation) for the accepted range and handling of overflow. Python does not support single-precision floating point numbers; the savings in processor and - memory usage that are usually the reason for using these is dwarfed by the + memory usage that are usually the reason for using these are dwarfed by the overhead of using objects in Python, so there is no reason to complicate the language with two kinds of floating point numbers. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Remove duplicate PyLong function descriptions.
by georg.brandl 30 Sep '14

30 Sep '14

https://hg.python.org/cpython/rev/68de12ae664d changeset: 92693:68de12ae664d branch: 2.7 parent: 92689:0d98344af1bb user: Georg Brandl <georg(a)python.org> date: Tue Sep 30 23:02:52 2014 +0200 summary: Remove duplicate PyLong function descriptions. files: Doc/c-api/long.rst | 28 ---------------------------- 1 files changed, 0 insertions(+), 28 deletions(-) diff --git a/Doc/c-api/long.rst b/Doc/c-api/long.rst --- a/Doc/c-api/long.rst +++ b/Doc/c-api/long.rst @@ -65,22 +65,6 @@ .. versionadded:: 2.6 -.. c:function:: PyObject* PyLong_FromSsize_t(Py_ssize_t v) - - Return a new :c:type:`PyLongObject` object with a value of *v*, or *NULL* - on failure. - - .. versionadded:: 2.6 - - -.. c:function:: PyObject* PyLong_FromSize_t(size_t v) - - Return a new :c:type:`PyLongObject` object with a value of *v*, or *NULL* - on failure. - - .. versionadded:: 2.6 - - .. c:function:: PyObject* PyLong_FromLongLong(PY_LONG_LONG v) Return a new :c:type:`PyLongObject` object from a C :c:type:`long long`, or *NULL* @@ -199,18 +183,6 @@ raised. -.. c:function:: Py_ssize_t PyLong_AsSsize_t(PyObject *pylong) - - .. index:: - single: PY_SSIZE_T_MAX - - Return a :c:type:`Py_ssize_t` representation of the contents of *pylong*. If - *pylong* is greater than :const:`PY_SSIZE_T_MAX`, an :exc:`OverflowError` is - raised. - - .. versionadded:: 2.6 - - .. c:function:: PY_LONG_LONG PyLong_AsLongLong(PyObject *pylong) .. index:: -- Repository URL: https://hg.python.org/cpython

1 0

devguide: Path update.
by georg.brandl 30 Sep '14

30 Sep '14

https://hg.python.org/devguide/rev/3774a980615c changeset: 715:3774a980615c user: Georg Brandl <georg(a)python.org> date: Tue Sep 30 22:58:03 2014 +0200 summary: Path update. files: documenting.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/documenting.rst b/documenting.rst --- a/documenting.rst +++ b/documenting.rst @@ -1503,7 +1503,7 @@ * "pydoc-topics", which builds a Python module containing a dictionary with plain text documentation for the labels defined in - :file:`Doc/tools/sphinxext/pyspecific.py` -- pydoc needs these to show topic + :file:`Doc/tools/pyspecific.py` -- pydoc needs these to show topic and keyword help. * "suspicious", which checks the parsed markup for text that looks like -- Repository URL: https://hg.python.org/devguide

1 0

peps: Path update.
by georg.brandl 30 Sep '14

30 Sep '14

https://hg.python.org/peps/rev/4d6b1cb66ae1 changeset: 5568:4d6b1cb66ae1 user: Georg Brandl <georg(a)python.org> date: Tue Sep 30 22:57:38 2014 +0200 summary: Path update. files: pep-0101.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pep-0101.txt b/pep-0101.txt --- a/pep-0101.txt +++ b/pep-0101.txt @@ -178,7 +178,7 @@ ___ Commit any changes to pydoc_topics.py and the doc sources. - ___ Make sure the SOURCE_URI in ``Doc/tools/sphinxext/pyspecific.py`` + ___ Make sure the SOURCE_URI in ``Doc/tools/pyspecific.py`` points to the right branch in the hg repository (or ``default`` for unstable releases of the default branch). @@ -283,7 +283,7 @@ pushed. Login to hg.python.org and edit (as the "hg" user) ``/data/hg/repos/cpython/.hg/hgrc`` to that effect. - ___ For a final major release, Doc/tools/sphinxext/static/version_switch.js + ___ For a final major release, Doc/tools/static/version_switch.js must be updated in all maintained branches, so that the new maintenance branch is not "dev" anymore and there is a new "dev" version. -- Repository URL: https://hg.python.org/peps

1 0

cpython (merge 3.4 -> default): merge with 3.4
by georg.brandl 30 Sep '14

30 Sep '14

https://hg.python.org/cpython/rev/2de58aebae64 changeset: 92692:2de58aebae64 parent: 92691:488a401a5d23 parent: 92690:40c031308967 user: Georg Brandl <georg(a)python.org> date: Tue Sep 30 22:56:47 2014 +0200 summary: merge with 3.4 files: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.4): Move Doc/tools/sphinxext content to Doc/tools, there is no need for the nested
by georg.brandl 30 Sep '14

30 Sep '14

https://hg.python.org/cpython/rev/40c031308967 changeset: 92690:40c031308967 branch: 3.4 parent: 92685:860c50e40720 user: Georg Brandl <georg(a)python.org> date: Tue Sep 30 22:51:30 2014 +0200 summary: Move Doc/tools/sphinxext content to Doc/tools, there is no need for the nested subdirectory anymore. files: Doc/Makefile | 4 +- Doc/README.txt | 3 +- Doc/conf.py | 6 +- Doc/make.bat | 2 +- Doc/tools/sphinxext/c_annotations.py | 0 Doc/tools/sphinxext/download.html | 0 Doc/tools/sphinxext/indexcontent.html | 0 Doc/tools/sphinxext/indexsidebar.html | 0 Doc/tools/sphinxext/layout.html | 0 Doc/tools/sphinxext/opensearch.xml | 0 Doc/tools/sphinxext/patchlevel.py | 0 Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css | 0 Doc/tools/sphinxext/pydoctheme/theme.conf | 0 Doc/tools/sphinxext/pyspecific.py | 0 Doc/tools/roman.py | 80 ---------- Doc/tools/sphinxext/static/basic.css | 0 Doc/tools/sphinxext/static/copybutton.js | 0 Doc/tools/sphinxext/static/py.png | 0 Doc/tools/sphinxext/static/sidebar.js | 0 Doc/tools/sphinxext/static/version_switch.js | 0 Doc/tools/sphinxext/susp-ignored.csv | 0 Doc/tools/sphinxext/suspicious.py | 0 Lib/pydoc.py | 2 +- 23 files changed, 8 insertions(+), 89 deletions(-) diff --git a/Doc/Makefile b/Doc/Makefile --- a/Doc/Makefile +++ b/Doc/Makefile @@ -8,7 +8,7 @@ SPHINXBUILD = sphinx-build PAPER = SOURCES = -DISTVERSION = $(shell $(PYTHON) tools/sphinxext/patchlevel.py) +DISTVERSION = $(shell $(PYTHON) tools/patchlevel.py) ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_paper_size=$(PAPER) \ $(SPHINXOPTS) . build/$(BUILDER) $(SOURCES) @@ -79,7 +79,7 @@ @$(MAKE) build BUILDER=$(BUILDER) || { \ echo "Suspicious check complete; look for any errors in the above output" \ "or in build/$(BUILDER)/suspicious.csv. If all issues are false" \ - "positives, append that file to tools/sphinxext/susp-ignored.csv."; \ + "positives, append that file to tools/susp-ignored.csv."; \ false; } coverage: BUILDER = coverage diff --git a/Doc/README.txt b/Doc/README.txt --- a/Doc/README.txt +++ b/Doc/README.txt @@ -79,8 +79,7 @@ * "pydoc-topics", which builds a Python module containing a dictionary with plain text documentation for the labels defined in - `tools/sphinxext/pyspecific.py` -- pydoc needs these to show topic and - keyword help. + `tools/pyspecific.py` -- pydoc needs these to show topic and keyword help. * "suspicious", which checks the parsed markup for text that looks like malformed and thus unconverted reST. diff --git a/Doc/conf.py b/Doc/conf.py --- a/Doc/conf.py +++ b/Doc/conf.py @@ -7,14 +7,14 @@ # that aren't pickleable (module imports are okay, they're removed automatically). import sys, os, time -sys.path.append(os.path.abspath('tools/sphinxext')) +sys.path.append(os.path.abspath('tools')) # General configuration # --------------------- extensions = ['sphinx.ext.coverage', 'sphinx.ext.doctest', 'pyspecific', 'c_annotations'] -templates_path = ['tools/sphinxext'] +templates_path = ['tools'] # General substitutions. project = 'Python' @@ -96,7 +96,7 @@ html_use_opensearch = 'http://docs.python.org/' + version # Additional static files. -html_static_path = ['tools/sphinxext/static'] +html_static_path = ['tools/static'] # Output file base name for HTML help builder. htmlhelp_basename = 'python' + release.replace('.', '') diff --git a/Doc/make.bat b/Doc/make.bat --- a/Doc/make.bat +++ b/Doc/make.bat @@ -12,7 +12,7 @@ if NOT DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles% if "%HTMLHELP%" EQU "" set HTMLHELP=%_PRGMFLS%\HTML Help Workshop\hhc.exe -if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/sphinxext/patchlevel.py`) do set DISTVERSION=%%v +if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/patchlevel.py`) do set DISTVERSION=%%v if "%BUILDDIR%" EQU "" set BUILDDIR=build diff --git a/Doc/tools/sphinxext/c_annotations.py b/Doc/tools/c_annotations.py rename from Doc/tools/sphinxext/c_annotations.py rename to Doc/tools/c_annotations.py diff --git a/Doc/tools/sphinxext/download.html b/Doc/tools/download.html rename from Doc/tools/sphinxext/download.html rename to Doc/tools/download.html diff --git a/Doc/tools/sphinxext/indexcontent.html b/Doc/tools/indexcontent.html rename from Doc/tools/sphinxext/indexcontent.html rename to Doc/tools/indexcontent.html diff --git a/Doc/tools/sphinxext/indexsidebar.html b/Doc/tools/indexsidebar.html rename from Doc/tools/sphinxext/indexsidebar.html rename to Doc/tools/indexsidebar.html diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/layout.html rename from Doc/tools/sphinxext/layout.html rename to Doc/tools/layout.html diff --git a/Doc/tools/sphinxext/opensearch.xml b/Doc/tools/opensearch.xml rename from Doc/tools/sphinxext/opensearch.xml rename to Doc/tools/opensearch.xml diff --git a/Doc/tools/sphinxext/patchlevel.py b/Doc/tools/patchlevel.py rename from Doc/tools/sphinxext/patchlevel.py rename to Doc/tools/patchlevel.py diff --git a/Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css b/Doc/tools/pydoctheme/static/pydoctheme.css rename from Doc/tools/sphinxext/pydoctheme/static/pydoctheme.css rename to Doc/tools/pydoctheme/static/pydoctheme.css diff --git a/Doc/tools/sphinxext/pydoctheme/theme.conf b/Doc/tools/pydoctheme/theme.conf rename from Doc/tools/sphinxext/pydoctheme/theme.conf rename to Doc/tools/pydoctheme/theme.conf diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/pyspecific.py rename from Doc/tools/sphinxext/pyspecific.py rename to Doc/tools/pyspecific.py diff --git a/Doc/tools/roman.py b/Doc/tools/roman.py deleted file mode 100644 --- a/Doc/tools/roman.py +++ /dev/null @@ -1,80 +0,0 @@ -"""Convert to and from Roman numerals""" - -__author__ = "Mark Pilgrim (f8dy(a)diveintopython.org)" -__version__ = "1.4" -__date__ = "8 August 2001" -__copyright__ = """Copyright (c) 2001 Mark Pilgrim - -This program is part of "Dive Into Python", a free Python tutorial for -experienced programmers. Visit http://diveintopython.org/ for the -latest version. - -This program is free software; you can redistribute it and/or modify -it under the terms of the Python 2.1.1 license, available at -http://www.python.org/2.1.1/license.html -""" - -import re - -#Define exceptions -class RomanError(Exception): pass -class OutOfRangeError(RomanError): pass -class NotIntegerError(RomanError): pass -class InvalidRomanNumeralError(RomanError): pass - -#Define digit mapping -romanNumeralMap = (('M', 1000), - ('CM', 900), - ('D', 500), - ('CD', 400), - ('C', 100), - ('XC', 90), - ('L', 50), - ('XL', 40), - ('X', 10), - ('IX', 9), - ('V', 5), - ('IV', 4), - ('I', 1)) - -def toRoman(n): - """convert integer to Roman numeral""" - if not (0 < n < 5000): - raise OutOfRangeError("number out of range (must be 1..4999)") - if int(n) != n: - raise NotIntegerError("decimals can not be converted") - - result = "" - for numeral, integer in romanNumeralMap: - while n >= integer: - result += numeral - n -= integer - return result - -#Define pattern to detect valid Roman numerals -romanNumeralPattern = re.compile(""" - ^ # beginning of string - M{0,4} # thousands - 0 to 4 M's - (CM|CD|D?C{0,3}) # hundreds - 900 (CM), 400 (CD), 0-300 (0 to 3 C's), - # or 500-800 (D, followed by 0 to 3 C's) - (XC|XL|L?X{0,3}) # tens - 90 (XC), 40 (XL), 0-30 (0 to 3 X's), - # or 50-80 (L, followed by 0 to 3 X's) - (IX|IV|V?I{0,3}) # ones - 9 (IX), 4 (IV), 0-3 (0 to 3 I's), - # or 5-8 (V, followed by 0 to 3 I's) - $ # end of string - """ ,re.VERBOSE) - -def fromRoman(s): - """convert Roman numeral to integer""" - if not s: - raise InvalidRomanNumeralError('Input can not be blank') - if not romanNumeralPattern.search(s): - raise InvalidRomanNumeralError('Invalid Roman numeral: %s' % s) - - result = 0 - index = 0 - for numeral, integer in romanNumeralMap: - while s[index:index+len(numeral)] == numeral: - result += integer - index += len(numeral) - return result diff --git a/Doc/tools/sphinxext/static/basic.css b/Doc/tools/static/basic.css rename from Doc/tools/sphinxext/static/basic.css rename to Doc/tools/static/basic.css diff --git a/Doc/tools/sphinxext/static/copybutton.js b/Doc/tools/static/copybutton.js rename from Doc/tools/sphinxext/static/copybutton.js rename to Doc/tools/static/copybutton.js diff --git a/Doc/tools/sphinxext/static/py.png b/Doc/tools/static/py.png rename from Doc/tools/sphinxext/static/py.png rename to Doc/tools/static/py.png diff --git a/Doc/tools/sphinxext/static/sidebar.js b/Doc/tools/static/sidebar.js rename from Doc/tools/sphinxext/static/sidebar.js rename to Doc/tools/static/sidebar.js diff --git a/Doc/tools/sphinxext/static/version_switch.js b/Doc/tools/static/version_switch.js rename from Doc/tools/sphinxext/static/version_switch.js rename to Doc/tools/static/version_switch.js diff --git a/Doc/tools/sphinxext/susp-ignored.csv b/Doc/tools/susp-ignored.csv rename from Doc/tools/sphinxext/susp-ignored.csv rename to Doc/tools/susp-ignored.csv diff --git a/Doc/tools/sphinxext/suspicious.py b/Doc/tools/suspicious.py rename from Doc/tools/sphinxext/suspicious.py rename to Doc/tools/suspicious.py diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1638,7 +1638,7 @@ # in pydoc_data/topics.py. # # CAUTION: if you change one of these dictionaries, be sure to adapt the - # list of needed labels in Doc/tools/sphinxext/pyspecific.py and + # list of needed labels in Doc/tools/pyspecific.py and # regenerate the pydoc_data/topics.py file by running # make pydoc-topics # in Doc/ and copying the output file into the Lib/ directory. -- Repository URL: https://hg.python.org/cpython

1 0