Mailman 3 June 2018 - Python-checkins

bpo-33718: regrtest: update from master (GH-7305)
by Victor Stinner June 1, 2018

June 1, 2018

https://github.com/python/cpython/commit/3dd802d8f287e8f11848cfb068cf73000a… commit: 3dd802d8f287e8f11848cfb068cf73000a9d0d94 branch: 3.7 author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-06-01T12:29:39+02:00 summary: bpo-33718: regrtest: update from master (GH-7305) files: A Lib/test/libregrtest/utils.py M Lib/test/libregrtest/main.py M Lib/test/libregrtest/runtest_mp.py diff --git a/Lib/test/libregrtest/main.py b/Lib/test/… [View More]libregrtest/main.py index ce01c8ce586d..6a818cdd2cf1 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -8,7 +8,6 @@ import sys import sysconfig import tempfile -import textwrap import time import unittest from test.libregrtest.cmdline import _parse_args @@ -18,6 +17,7 @@ INTERRUPTED, CHILD_ERROR, PROGRESS_MIN_TIME, format_test_result) from test.libregrtest.setup import setup_tests +from test.libregrtest.utils import removepy, count, format_duration, printlist from test import support try: import gc @@ -41,16 +41,6 @@ TEMPDIR = os.path.abspath(TEMPDIR) -def format_duration(seconds): - if seconds < 1.0: - return '%.0f ms' % (seconds * 1e3) - if seconds < 60.0: - return '%.0f sec' % seconds - - minutes, seconds = divmod(seconds, 60.0) - return '%.0f min %.0f sec' % (minutes, seconds) - - class Regrtest: """Execute a test suite. @@ -88,6 +78,7 @@ def __init__(self): self.skipped = [] self.resource_denieds = [] self.environment_changed = [] + self.rerun = [] self.interrupted = False # used by --slow @@ -281,10 +272,11 @@ def rerun_failed_tests(self): self.ns.verbose = True self.ns.failfast = False self.ns.verbose3 = False - self.ns.match_tests = None + print() print("Re-running failed tests in verbose mode") - for test in self.bad[:]: + self.rerun = self.bad[:] + for test in self.rerun: print("Re-running test %r in verbose mode" % test, flush=True) try: self.ns.verbose = True @@ -302,22 +294,27 @@ def rerun_failed_tests(self): print(count(len(self.bad), 'test'), "failed again:") printlist(self.bad) + self.display_result() + def display_result(self): + # If running the test suite for PGO then no one cares about results. + if self.ns.pgo: + return + + print() + print("== Tests result: %s ==" % self.get_tests_result()) + if self.interrupted: - # print a newline after ^C print() + # print a newline after ^C print("Test suite interrupted by signal SIGINT.") executed = set(self.good) | set(self.bad) | set(self.skipped) omitted = set(self.selected) - executed print(count(len(omitted), "test"), "omitted:") printlist(omitted) - # If running the test suite for PGO then no one cares about - # results. - if self.ns.pgo: - return - if self.good and not self.ns.quiet: + print() if (not self.bad and not self.skipped and not self.interrupted @@ -348,6 +345,11 @@ def display_result(self): print(count(len(self.skipped), "test"), "skipped:") printlist(self.skipped) + if self.rerun: + print() + print("%s:" % count(len(self.rerun), "re-run test")) + printlist(self.rerun) + def run_tests_sequential(self): if self.ns.trace: import trace @@ -432,6 +434,21 @@ def display_header(self): % (locale.getpreferredencoding(False), sys.getfilesystemencoding())) + def get_tests_result(self): + result = [] + if self.bad: + result.append("FAILURE") + elif self.ns.fail_env_changed and self.environment_changed: + result.append("ENV CHANGED") + + if self.interrupted: + result.append("INTERRUPTED") + + if not result: + result.append("SUCCESS") + + return ', '.join(result) + def run_tests(self): # For a partial run, we do not need to clutter the output. if (self.ns.header @@ -473,16 +490,7 @@ def finalize(self): print() duration = time.monotonic() - self.start_time print("Total duration: %s" % format_duration(duration)) - - if self.bad: - result = "FAILURE" - elif self.interrupted: - result = "INTERRUPTED" - elif self.ns.fail_env_changed and self.environment_changed: - result = "ENV CHANGED" - else: - result = "SUCCESS" - print("Tests result: %s" % result) + print("Tests result: %s" % self.get_tests_result()) if self.ns.runleaks: os.system("leaks %d" % os.getpid()) @@ -549,37 +557,6 @@ def _main(self, tests, kwargs): sys.exit(0) -def removepy(names): - if not names: - return - for idx, name in enumerate(names): - basename, ext = os.path.splitext(name) - if ext == '.py': - names[idx] = basename - - -def count(n, word): - if n == 1: - return "%d %s" % (n, word) - else: - return "%d %ss" % (n, word) - - -def printlist(x, width=70, indent=4, file=None): - """Print the elements of iterable x to stdout. - - Optional arg width (default 70) is the maximum line length. - Optional arg indent (default 4) is the number of blanks with which to - begin each line. - """ - - blanks = ' ' * indent - # Print the sorted list: 'x' may be a '--random' list or a set() - print(textwrap.fill(' '.join(str(elt) for elt in sorted(x)), width, - initial_indent=blanks, subsequent_indent=blanks), - file=file) - - def main(tests=None, **kwargs): """Run the Python suite.""" Regrtest().main(tests=tests, **kwargs) diff --git a/Lib/test/libregrtest/runtest_mp.py b/Lib/test/libregrtest/runtest_mp.py index 598754f279d8..f7fa10cf551a 100644 --- a/Lib/test/libregrtest/runtest_mp.py +++ b/Lib/test/libregrtest/runtest_mp.py @@ -13,6 +13,7 @@ runtest, INTERRUPTED, CHILD_ERROR, PROGRESS_MIN_TIME, format_test_result) from test.libregrtest.setup import setup_tests +from test.libregrtest.utils import format_duration # Display the running tests if nothing happened last N seconds @@ -167,7 +168,8 @@ def get_running(workers): continue dt = time.monotonic() - worker.start_time if dt >= PROGRESS_MIN_TIME: - running.append('%s (%.0f sec)' % (current_test, dt)) + text = '%s (%s)' % (current_test, format_duration(dt)) + running.append(text) return running finished = 0 diff --git a/Lib/test/libregrtest/utils.py b/Lib/test/libregrtest/utils.py new file mode 100644 index 000000000000..85049cb06b36 --- /dev/null +++ b/Lib/test/libregrtest/utils.py @@ -0,0 +1,47 @@ +import os.path +import textwrap + + +def format_duration(seconds): + if seconds < 1.0: + return '%.0f ms' % (seconds * 1e3) + if seconds < 60.0: + return '%.0f sec' % seconds + + minutes, seconds = divmod(seconds, 60.0) + hours, minutes = divmod(minutes, 60.0) + if hours: + return '%.0f hour %.0f min' % (hours, minutes) + else: + return '%.0f min %.0f sec' % (minutes, seconds) + + +def removepy(names): + if not names: + return + for idx, name in enumerate(names): + basename, ext = os.path.splitext(name) + if ext == '.py': + names[idx] = basename + + +def count(n, word): + if n == 1: + return "%d %s" % (n, word) + else: + return "%d %ss" % (n, word) + + +def printlist(x, width=70, indent=4, file=None): + """Print the elements of iterable x to stdout. + + Optional arg width (default 70) is the maximum line length. + Optional arg indent (default 4) is the number of blanks with which to + begin each line. + """ + + blanks = ' ' * indent + # Print the sorted list: 'x' may be a '--random' list or a set() + print(textwrap.fill(' '.join(str(elt) for elt in sorted(x)), width, + initial_indent=blanks, subsequent_indent=blanks), + file=file) [View Less]

1 0

bpo-33692: Update pythoninfo from master (GH-7298)
by Victor Stinner June 1, 2018

June 1, 2018

https://github.com/python/cpython/commit/466aae545786d2db5ac27f243c5d77aeb7… commit: 466aae545786d2db5ac27f243c5d77aeb7a5958e branch: 3.7 author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-06-01T12:10:07+02:00 summary: bpo-33692: Update pythoninfo from master (GH-7298) * bpo-33692: pythoninfo detect libedit on Python 3.6 (GH-7293) * bpo-33717: pythoninfo: add CC --version (GH-7290) files: M Lib/test/pythoninfo.py diff --git a/Lib/… [View More]

1 0

bpo-33692: Update pythoninfo from master (GH-7301)
by Victor Stinner June 1, 2018

June 1, 2018

https://github.com/python/cpython/commit/b9afe645c4926b1f086f30ba9bd00671b0… commit: b9afe645c4926b1f086f30ba9bd00671b0b8b55e branch: 3.6 author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-06-01T12:09:59+02:00 summary: bpo-33692: Update pythoninfo from master (GH-7301) * bpo-33717: pythoninfo: add CC --version (GH-7290) files: M Lib/test/pythoninfo.py diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py index 26f493ee29ff..… [View More]

1 0

bpo-30654: Do not reset SIGINT handler to SIG_DFL in finisignal (GH-7146)
by Antoine Pitrou June 1, 2018

June 1, 2018

https://github.com/python/cpython/commit/e905c84494526363086f66a979e317e155… commit: e905c84494526363086f66a979e317e155bf9536 branch: master author: pkerling <pkerling(a)casix.org> committer: Antoine Pitrou <pitrou(a)free.fr> date: 2018-06-01T11:47:18+02:00 summary: bpo-30654: Do not reset SIGINT handler to SIG_DFL in finisignal (GH-7146) files: A Misc/NEWS.d/next/Core and Builtins/2018-05-28-12-28-53.bpo-30654.9fDJye.rst M Modules/signalmodule.c diff --git a/Misc/NEWS.d/next/… [View More]

1 0

Daily reference leaks (4243df51fe43): sum=14
by solipsis＠pitrou.net June 1, 2018

June 1, 2018

results for 4243df51fe43 on branch "default" -------------------------------------------- test_asyncio leaked [0, 3, 0] memory blocks, sum=3 test_collections leaked [0, 0, 7] memory blocks, sum=7 test_functools leaked [0, 3, 1] memory blocks, sum=4 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogRjk4ZD', '--timeout', '7200']

1 0

bpo-33400: Removed references to RFC3339 and ISO8601 from the logging documentation. (GH-7297)
by Vinay Sajip June 1, 2018

June 1, 2018

https://github.com/python/cpython/commit/23cee80cfade1a9019c52b3a17d8e5c1b5… commit: 23cee80cfade1a9019c52b3a17d8e5c1b5db17e2 branch: master author: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> committer: GitHub <noreply(a)github.com> date: 2018-06-01T10:09:21+01:00 summary: bpo-33400: Removed references to RFC3339 and ISO8601 from the logging documentation. (GH-7297) files: M Doc/library/logging.config.rst M Doc/library/logging.rst diff --git a/Doc/library/logging.config.rst b/Doc/… [View More]library/logging.config.rst index b5007610c40f..de805eb955df 100644 --- a/Doc/library/logging.config.rst +++ b/Doc/library/logging.config.rst @@ -790,11 +790,10 @@ Sections which specify formatter configuration are typified by the following. The ``format`` entry is the overall format string, and the ``datefmt`` entry is the :func:`strftime`\ -compatible date/time format string. If empty, the -package substitutes ISO8601-style format date/times, which is almost equivalent to -specifying the date format string ``'%Y-%m-%d %H:%M:%S'``. This format also -specifies milliseconds, which are appended to the result of using the above -format string, with a comma separator. An example time in this format is -``2003-01-23 00:29:50,411``. +package substitutes something which is almost equivalent to specifying the date +format string ``'%Y-%m-%d %H:%M:%S'``. This format also specifies milliseconds, +which are appended to the result of using the above format string, with a comma +separator. An example time in this format is ``2003-01-23 00:29:50,411``. The ``class`` entry is optional. It indicates the name of the formatter's class (as a dotted module and class name.) This option is useful for instantiating a diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst index 6b48d6406aa2..2b4401ac682d 100644 --- a/Doc/library/logging.rst +++ b/Doc/library/logging.rst @@ -515,9 +515,8 @@ The useful mapping keys in a :class:`LogRecord` are given in the section on Returns a new instance of the :class:`Formatter` class. The instance is initialized with a format string for the message as a whole, as well as a format string for the date/time portion of a message. If no *fmt* is - specified, ``'%(message)s'`` is used. If no *datefmt* is specified, an - ISO8601-like (or :rfc:`3339`-like) date format is used. See the - :meth:`formatTime` documentation for more details. + specified, ``'%(message)s'`` is used. If no *datefmt* is specified, a format + is used which is described in the :meth:`formatTime` documentation. The *style* parameter can be one of '%', '{' or '$' and determines how the format string will be merged with its data: using one of %-formatting, @@ -557,8 +556,10 @@ The useful mapping keys in a :class:`LogRecord` are given in the section on formatters to provide for any specific requirement, but the basic behavior is as follows: if *datefmt* (a string) is specified, it is used with :func:`time.strftime` to format the creation time of the - record. Otherwise, an ISO8601-like (or RDC 3339-like) format is used. The - resulting string is returned. + record. Otherwise, the format '%Y-%m-%d %H:%M:%S,uuu' is used, where the + uuu part is a millisecond value and the other letters are as per the + :func:`time.strftime` documentation. An example time in this format is + ``2003-01-23 00:29:50,411``. The resulting string is returned. This function uses a user-configurable function to convert the creation time to a tuple. By default, :func:`time.localtime` is used; to change @@ -569,8 +570,8 @@ The useful mapping keys in a :class:`LogRecord` are given in the section on attribute in the ``Formatter`` class. .. versionchanged:: 3.3 - Previously, the default ISO8601-like format was hard-coded as in this - example: ``2010-09-06 22:38:15,292`` where the part before the comma is + Previously, the default format was hard-coded as in this example: + ``2010-09-06 22:38:15,292`` where the part before the comma is handled by a strptime format string (``'%Y-%m-%d %H:%M:%S'``), and the part after the comma is a millisecond value. Because strptime does not have a format placeholder for milliseconds, the millisecond value is [View Less]

1 0

bpo-32519: Removed misleading sentence from EnvBuilder documentation. (GH-7296)
by Vinay Sajip June 1, 2018

June 1, 2018

https://github.com/python/cpython/commit/c0d341d49b3ffc8b0037e501c246271be9… commit: c0d341d49b3ffc8b0037e501c246271be9c69f55 branch: master author: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> committer: GitHub <noreply(a)github.com> date: 2018-06-01T10:08:33+01:00 summary: bpo-32519: Removed misleading sentence from EnvBuilder documentation. (GH-7296) files: M Doc/library/venv.rst diff --git a/Doc/library/venv.rst b/Doc/library/venv.rst index 1fff7bc4bfb2..b85d642ee61c 100644 --- a/… [View More]

1 0

bpo-33718: regrtest: enhance "running:" formatting (GH-7292)
by Victor Stinner June 1, 2018

June 1, 2018

https://github.com/python/cpython/commit/7ad16eb51c7871320edb789ddb6184c6c7… commit: 7ad16eb51c7871320edb789ddb6184c6c76304b0 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-06-01T11:04:45+02:00 summary: bpo-33718: regrtest: enhance "running:" formatting (GH-7292) * "running:" progress: Format number of seconds as hours and minutes * format_duration(): count also minutes as hours * Create Lib/test/libregrtest/utils.… [View More]py files: A Lib/test/libregrtest/utils.py M Lib/test/libregrtest/main.py M Lib/test/libregrtest/runtest_mp.py diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py index f0c1631509bd..6a818cdd2cf1 100644 --- a/Lib/test/libregrtest/main.py +++ b/Lib/test/libregrtest/main.py @@ -8,7 +8,6 @@ import sys import sysconfig import tempfile -import textwrap import time import unittest from test.libregrtest.cmdline import _parse_args @@ -18,6 +17,7 @@ INTERRUPTED, CHILD_ERROR, PROGRESS_MIN_TIME, format_test_result) from test.libregrtest.setup import setup_tests +from test.libregrtest.utils import removepy, count, format_duration, printlist from test import support try: import gc @@ -41,16 +41,6 @@ TEMPDIR = os.path.abspath(TEMPDIR) -def format_duration(seconds): - if seconds < 1.0: - return '%.0f ms' % (seconds * 1e3) - if seconds < 60.0: - return '%.0f sec' % seconds - - minutes, seconds = divmod(seconds, 60.0) - return '%.0f min %.0f sec' % (minutes, seconds) - - class Regrtest: """Execute a test suite. @@ -567,37 +557,6 @@ def _main(self, tests, kwargs): sys.exit(0) -def removepy(names): - if not names: - return - for idx, name in enumerate(names): - basename, ext = os.path.splitext(name) - if ext == '.py': - names[idx] = basename - - -def count(n, word): - if n == 1: - return "%d %s" % (n, word) - else: - return "%d %ss" % (n, word) - - -def printlist(x, width=70, indent=4, file=None): - """Print the elements of iterable x to stdout. - - Optional arg width (default 70) is the maximum line length. - Optional arg indent (default 4) is the number of blanks with which to - begin each line. - """ - - blanks = ' ' * indent - # Print the sorted list: 'x' may be a '--random' list or a set() - print(textwrap.fill(' '.join(str(elt) for elt in sorted(x)), width, - initial_indent=blanks, subsequent_indent=blanks), - file=file) - - def main(tests=None, **kwargs): """Run the Python suite.""" Regrtest().main(tests=tests, **kwargs) diff --git a/Lib/test/libregrtest/runtest_mp.py b/Lib/test/libregrtest/runtest_mp.py index 598754f279d8..f7fa10cf551a 100644 --- a/Lib/test/libregrtest/runtest_mp.py +++ b/Lib/test/libregrtest/runtest_mp.py @@ -13,6 +13,7 @@ runtest, INTERRUPTED, CHILD_ERROR, PROGRESS_MIN_TIME, format_test_result) from test.libregrtest.setup import setup_tests +from test.libregrtest.utils import format_duration # Display the running tests if nothing happened last N seconds @@ -167,7 +168,8 @@ def get_running(workers): continue dt = time.monotonic() - worker.start_time if dt >= PROGRESS_MIN_TIME: - running.append('%s (%.0f sec)' % (current_test, dt)) + text = '%s (%s)' % (current_test, format_duration(dt)) + running.append(text) return running finished = 0 diff --git a/Lib/test/libregrtest/utils.py b/Lib/test/libregrtest/utils.py new file mode 100644 index 000000000000..85049cb06b36 --- /dev/null +++ b/Lib/test/libregrtest/utils.py @@ -0,0 +1,47 @@ +import os.path +import textwrap + + +def format_duration(seconds): + if seconds < 1.0: + return '%.0f ms' % (seconds * 1e3) + if seconds < 60.0: + return '%.0f sec' % seconds + + minutes, seconds = divmod(seconds, 60.0) + hours, minutes = divmod(minutes, 60.0) + if hours: + return '%.0f hour %.0f min' % (hours, minutes) + else: + return '%.0f min %.0f sec' % (minutes, seconds) + + +def removepy(names): + if not names: + return + for idx, name in enumerate(names): + basename, ext = os.path.splitext(name) + if ext == '.py': + names[idx] = basename + + +def count(n, word): + if n == 1: + return "%d %s" % (n, word) + else: + return "%d %ss" % (n, word) + + +def printlist(x, width=70, indent=4, file=None): + """Print the elements of iterable x to stdout. + + Optional arg width (default 70) is the maximum line length. + Optional arg indent (default 4) is the number of blanks with which to + begin each line. + """ + + blanks = ' ' * indent + # Print the sorted list: 'x' may be a '--random' list or a set() + print(textwrap.fill(' '.join(str(elt) for elt in sorted(x)), width, + initial_indent=blanks, subsequent_indent=blanks), + file=file) [View Less]

1 0

bpo-33692: pythoninfo detect libedit on Python 3.6 (GH-7293)
by Victor Stinner June 1, 2018

June 1, 2018

https://github.com/python/cpython/commit/ef634b5b26f14d942768069fa23f9791a0… commit: ef634b5b26f14d942768069fa23f9791a06ff37e branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2018-06-01T11:04:29+02:00 summary: bpo-33692: pythoninfo detect libedit on Python 3.6 (GH-7293) Check which readline implementation is used based on the readline docstring. files: M Lib/test/pythoninfo.py diff --git a/Lib/test/pythoninfo.py b/Lib/… [View More]

1 0

bpo-33606: improve logging performance when logger is disabled (GH-7285)
by Vinay Sajip June 1, 2018

June 1, 2018

https://github.com/python/cpython/commit/6e3ca645e71dd021fead5a70dc06d9b663… commit: 6e3ca645e71dd021fead5a70dc06d9b663612e3a branch: master author: Timo Furrer <tuxtimo(a)gmail.com> committer: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: 2018-06-01T08:29:46+01:00 summary: bpo-33606: improve logging performance when logger is disabled (GH-7285) A check has been added in Logger.isEnabledFor() to return False when the logger is disabled. This avoids unnecessary work being done when … [View More]

1 0