Mailman 3 November 2018 - Python-checkins

Daily reference leaks (4243df51fe43): sum=3
by solipsis＠pitrou.net 04 Nov '18

04 Nov '18

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

1 0

Doc: -W flag for sphinx-build can be disabled (GH-10303)
by Julien Palard 03 Nov '18

03 Nov '18

https://github.com/python/cpython/commit/f98c1623ec90508937afc1b58556e38214… commit: f98c1623ec90508937afc1b58556e38214d70892 branch: master author: Julien Palard <julien(a)palard.fr> committer: GitHub <noreply(a)github.com> date: 2018-11-03T19:06:33+01:00 summary: Doc: -W flag for sphinx-build can be disabled (GH-10303) files: M Doc/Makefile diff --git a/Doc/Makefile b/Doc/Makefile index 50beac58ec38..4b85e9eb6058 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -11,9 +11,10 @@ BLURB = PATH=$(VENVDIR)/bin:$$PATH blurb PAPER = SOURCES = DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py) +SPHINXERRORHANDLING = -W -ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -W -D latex_elements.papersize=$(PAPER) \ - $(SPHINXOPTS) . build/$(BUILDER) $(SOURCES) +ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_elements.papersize=$(PAPER) \ + $(SPHINXOPTS) $(SPHINXERRORHANDLING) . build/$(BUILDER) $(SOURCES) .PHONY: help build html htmlhelp latex text changes linkcheck \ suspicious coverage doctest pydoc-topics htmlview clean dist check serve \

1 0

Fix a typo about a comma. (GH-10306)
by Miss Islington (bot) 03 Nov '18

03 Nov '18

https://github.com/python/cpython/commit/421b41b096fa953819e223dc3e0bcce5d5… commit: 421b41b096fa953819e223dc3e0bcce5d57231ea branch: 2.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-03T10:41:56-07:00 summary: Fix a typo about a comma. (GH-10306) (cherry picked from commit fe62d877e300e1ee4145fff8f2bdba498b685f91) Co-authored-by: İsmail Arılık <arilik.ismail(a)gmail.com> files: M Doc/tutorial/errors.rst diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst index 466009e51e7b..247dda761c00 100644 --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -315,7 +315,7 @@ to create specific exception classes for different error conditions:: self.next = next self.msg = msg -Most exceptions are defined with names that end in "Error," similar to the +Most exceptions are defined with names that end in "Error", similar to the naming of the standard exceptions. Many standard modules define their own exceptions to report errors that may

1 0

Fix a typo about a comma. (GH-10306)
by Miss Islington (bot) 03 Nov '18

03 Nov '18

https://github.com/python/cpython/commit/4614b983b600425ed198d2d2407ca77316… commit: 4614b983b600425ed198d2d2407ca77316762531 branch: 3.6 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-03T10:41:45-07:00 summary: Fix a typo about a comma. (GH-10306) (cherry picked from commit fe62d877e300e1ee4145fff8f2bdba498b685f91) Co-authored-by: İsmail Arılık <arilik.ismail(a)gmail.com> files: M Doc/tutorial/errors.rst diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst index aba61da5f7c3..957cbf962b20 100644 --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -314,7 +314,7 @@ to create specific exception classes for different error conditions:: self.next = next self.message = message -Most exceptions are defined with names that end in "Error," similar to the +Most exceptions are defined with names that end in "Error", similar to the naming of the standard exceptions. Many standard modules define their own exceptions to report errors that may

1 0

Fix a typo about a comma. (GH-10306)
by Miss Islington (bot) 03 Nov '18

03 Nov '18

https://github.com/python/cpython/commit/133fd6527d66e0e744210e0494762a67ff… commit: 133fd6527d66e0e744210e0494762a67ff02a6c4 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2018-11-03T10:41:38-07:00 summary: Fix a typo about a comma. (GH-10306) (cherry picked from commit fe62d877e300e1ee4145fff8f2bdba498b685f91) Co-authored-by: İsmail Arılık <arilik.ismail(a)gmail.com> files: M Doc/tutorial/errors.rst diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst index aba61da5f7c3..957cbf962b20 100644 --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -314,7 +314,7 @@ to create specific exception classes for different error conditions:: self.next = next self.message = message -Most exceptions are defined with names that end in "Error," similar to the +Most exceptions are defined with names that end in "Error", similar to the naming of the standard exceptions. Many standard modules define their own exceptions to report errors that may

1 0

bpo-34969: Add --fast, --best on the gzip CLI (GH-9833)
by Julien Palard 03 Nov '18

03 Nov '18

https://github.com/python/cpython/commit/3e28eed9ec2249bb11ad0db4629271b7ce… commit: 3e28eed9ec2249bb11ad0db4629271b7ce9b7918 branch: master author: Stéphane Wirtel <stephane(a)wirtel.be> committer: Julien Palard <julien(a)palard.fr> date: 2018-11-03T16:24:23+01:00 summary: bpo-34969: Add --fast, --best on the gzip CLI (GH-9833) files: A Misc/NEWS.d/next/Library/2018-10-13-07-46-50.bpo-34969.Mfnhjb.rst M Doc/library/gzip.rst M Lib/gzip.py M Lib/test/test_gzip.py diff --git a/Doc/library/gzip.rst b/Doc/library/gzip.rst index b52dd1a11aa9..a93f37743854 100644 --- a/Doc/library/gzip.rst +++ b/Doc/library/gzip.rst @@ -222,25 +222,26 @@ Once executed the :mod:`gzip` module keeps the input file(s). .. versionchanged:: 3.8 Add a new command line interface with a usage. + By default, when you will execute the CLI, the default compression level is 6. Command line options ^^^^^^^^^^^^^^^^^^^^ .. cmdoption:: file - .. code-block:: shell-session + If *file* is not specified, read from :attr:`sys.stdin`. - $ python -m gzip file +.. cmdoption:: --fast - If *file* is not specified, read from :attr:`sys.stdin`. + Indicates the fastest compression method (less compression). -.. cmdoption:: -d, --decompress +.. cmdoption:: --best - Decompress the given file + Indicates the slowest compression method (best compression). - .. code-block:: shell-session +.. cmdoption:: -d, --decompress - $ python -m gzip -d file.gz + Decompress the given file. .. cmdoption:: -h, --help diff --git a/Lib/gzip.py b/Lib/gzip.py index a34d01ae36e1..151ff1405b16 100644 --- a/Lib/gzip.py +++ b/Lib/gzip.py @@ -17,7 +17,12 @@ READ, WRITE = 1, 2 -def open(filename, mode="rb", compresslevel=9, +_COMPRESS_LEVEL_FAST = 1 +_COMPRESS_LEVEL_TRADEOFF = 6 +_COMPRESS_LEVEL_BEST = 9 + + +def open(filename, mode="rb", compresslevel=_COMPRESS_LEVEL_BEST, encoding=None, errors=None, newline=None): """Open a gzip-compressed file in binary or text mode. @@ -121,7 +126,7 @@ class GzipFile(_compression.BaseStream): myfileobj = None def __init__(self, filename=None, mode=None, - compresslevel=9, fileobj=None, mtime=None): + compresslevel=_COMPRESS_LEVEL_BEST, fileobj=None, mtime=None): """Constructor for the GzipFile class. At least one of fileobj and filename must be given a @@ -515,7 +520,7 @@ def _rewind(self): super()._rewind() self._new_member = True -def compress(data, compresslevel=9): +def compress(data, compresslevel=_COMPRESS_LEVEL_BEST): """Compress data in one shot and return the compressed string. Optional argument is the compression level, in range of 0-9. """ @@ -537,10 +542,21 @@ def main(): parser = ArgumentParser(description= "A simple command line interface for the gzip module: act like gzip, " "but do not delete the input file.") - parser.add_argument("-d", "--decompress", action="store_true", + group = parser.add_mutually_exclusive_group() + group.add_argument('--fast', action='store_true', help='compress faster') + group.add_argument('--best', action='store_true', help='compress better') + group.add_argument("-d", "--decompress", action="store_true", help="act like gunzip instead of gzip") + parser.add_argument("args", nargs="*", default=["-"], metavar='file') args = parser.parse_args() + + compresslevel = _COMPRESS_LEVEL_TRADEOFF + if args.fast: + compresslevel = _COMPRESS_LEVEL_FAST + elif args.best: + compresslevel = _COMPRESS_LEVEL_BEST + for arg in args.args: if args.decompress: if arg == "-": @@ -555,7 +571,8 @@ def main(): else: if arg == "-": f = sys.stdin.buffer - g = GzipFile(filename="", mode="wb", fileobj=sys.stdout.buffer) + g = GzipFile(filename="", mode="wb", fileobj=sys.stdout.buffer, + compresslevel=compresslevel) else: f = builtins.open(arg, "rb") g = open(arg + ".gz", "wb") diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py index b072ce4682c0..1e8b41f07b3e 100644 --- a/Lib/test/test_gzip.py +++ b/Lib/test/test_gzip.py @@ -12,7 +12,7 @@ from subprocess import PIPE, Popen from test import support from test.support import _4G, bigmemtest -from test.support.script_helper import assert_python_ok +from test.support.script_helper import assert_python_ok, assert_python_failure gzip = support.import_module('gzip') @@ -746,10 +746,38 @@ def test_compress_infile_outfile(self): rc, out, err = assert_python_ok('-m', 'gzip', local_testgzip) self.assertTrue(os.path.exists(gzipname)) - self.assertEqual(rc, 0) self.assertEqual(out, b'') self.assertEqual(err, b'') + @create_and_remove_directory(TEMPDIR) + def test_compress_infile_outfile(self): + for compress_level in ('--fast', '--best'): + with self.subTest(compress_level=compress_level): + local_testgzip = os.path.join(TEMPDIR, 'testgzip') + gzipname = local_testgzip + '.gz' + self.assertFalse(os.path.exists(gzipname)) + + with open(local_testgzip, 'wb') as fp: + fp.write(self.data) + + rc, out, err = assert_python_ok('-m', 'gzip', compress_level, local_testgzip) + + self.assertTrue(os.path.exists(gzipname)) + self.assertEqual(out, b'') + self.assertEqual(err, b'') + os.remove(gzipname) + self.assertFalse(os.path.exists(gzipname)) + + def test_compress_fast_best_are_exclusive(self): + rc, out, err = assert_python_failure('-m', 'gzip', '--fast', '--best') + self.assertIn(b"error: argument --best: not allowed with argument --fast", err) + self.assertEqual(out, b'') + + def test_decompress_cannot_have_flags_compression(self): + rc, out, err = assert_python_failure('-m', 'gzip', '--fast', '-d') + self.assertIn(b'error: argument -d/--decompress: not allowed with argument --fast', err) + self.assertEqual(out, b'') + def test_main(verbose=None): support.run_unittest(TestGzip, TestOpen, TestCommandLine) diff --git a/Misc/NEWS.d/next/Library/2018-10-13-07-46-50.bpo-34969.Mfnhjb.rst b/Misc/NEWS.d/next/Library/2018-10-13-07-46-50.bpo-34969.Mfnhjb.rst new file mode 100644 index 000000000000..e3b713261406 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-10-13-07-46-50.bpo-34969.Mfnhjb.rst @@ -0,0 +1,3 @@ +gzip: Add --fast, --best on the gzip CLI, these parameters will be used for the +fast compression method (quick) or the best method compress (slower, but smaller +file). Also, change the default compression level to 6 (tradeoff).

1 0

Fix a typo about a comma. (GH-10306)
by Serhiy Storchaka 03 Nov '18

03 Nov '18

https://github.com/python/cpython/commit/fe62d877e300e1ee4145fff8f2bdba498b… commit: fe62d877e300e1ee4145fff8f2bdba498b685f91 branch: master author: İsmail Arılık <arilik.ismail(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2018-11-03T17:05:59+02:00 summary: Fix a typo about a comma. (GH-10306) files: M Doc/tutorial/errors.rst diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst index aba61da5f7c3..957cbf962b20 100644 --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -314,7 +314,7 @@ to create specific exception classes for different error conditions:: self.next = next self.message = message -Most exceptions are defined with names that end in "Error," similar to the +Most exceptions are defined with names that end in "Error", similar to the naming of the standard exceptions. Many standard modules define their own exceptions to report errors that may

1 0

Daily reference leaks (4243df51fe43): sum=12
by solipsis＠pitrou.net 03 Nov '18

03 Nov '18

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

1 0

[3.7] bpo-35147: Fix _Py_NO_RETURN for GCC (GH-10300) (GH-10301)
by Miss Islington (bot) 02 Nov '18

02 Nov '18

https://github.com/python/cpython/commit/a9122d183b1fbc4484d72aec69fc0979c7… commit: a9122d183b1fbc4484d72aec69fc0979c7fd91f2 branch: 3.7 author: Alexey Izbyshev <izbyshev(a)ispras.ru> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2018-11-02T18:30:11-07:00 summary: [3.7] bpo-35147: Fix _Py_NO_RETURN for GCC (GH-10300) (GH-10301) Use `__GNUC__` instead of non-existing `__GNUC_MAJOR__`. (cherry picked from commit e2ed5adcb5db2d70cfa72da1ba8446f7aa9e05cd) https://bugs.python.org/issue35147 files: M Include/pyerrors.h diff --git a/Include/pyerrors.h b/Include/pyerrors.h index f289471be20c..f49d4e8bd08c 100644 --- a/Include/pyerrors.h +++ b/Include/pyerrors.h @@ -94,9 +94,9 @@ PyAPI_FUNC(void) PyErr_SetExcInfo(PyObject *, PyObject *, PyObject *); #endif #if defined(__clang__) || \ - (defined(__GNUC_MAJOR__) && \ - ((__GNUC_MAJOR__ >= 3) || \ - (__GNUC_MAJOR__ == 2) && (__GNUC_MINOR__ >= 5))) + (defined(__GNUC__) && \ + ((__GNUC__ >= 3) || \ + (__GNUC__ == 2) && (__GNUC_MINOR__ >= 5))) #define _Py_NO_RETURN __attribute__((__noreturn__)) #else #define _Py_NO_RETURN

1 0

[3.6] bpo-35147: Fix _Py_NO_RETURN for GCC (GH-10300) (GH-10302)
by Victor Stinner 02 Nov '18

02 Nov '18

https://github.com/python/cpython/commit/29abad099535f4bcb1531df93bafbd75b2… commit: 29abad099535f4bcb1531df93bafbd75b26d6adc branch: 3.6 author: Alexey Izbyshev <izbyshev(a)ispras.ru> committer: Victor Stinner <vstinner(a)redhat.com> date: 2018-11-02T19:23:51+01:00 summary: [3.6] bpo-35147: Fix _Py_NO_RETURN for GCC (GH-10300) (GH-10302) Use `__GNUC__` instead of non-existing `__GNUC_MAJOR__`. (cherry picked from commit e2ed5adcb5db2d70cfa72da1ba8446f7aa9e05cd) files: M Include/pyerrors.h diff --git a/Include/pyerrors.h b/Include/pyerrors.h index c28c1373f82f..44f20303c299 100644 --- a/Include/pyerrors.h +++ b/Include/pyerrors.h @@ -93,9 +93,9 @@ PyAPI_FUNC(void) PyErr_SetExcInfo(PyObject *, PyObject *, PyObject *); #endif #if defined(__clang__) || \ - (defined(__GNUC_MAJOR__) && \ - ((__GNUC_MAJOR__ >= 3) || \ - (__GNUC_MAJOR__ == 2) && (__GNUC_MINOR__ >= 5))) + (defined(__GNUC__) && \ + ((__GNUC__ >= 3) || \ + (__GNUC__ == 2) && (__GNUC_MINOR__ >= 5))) #define _Py_NO_RETURN __attribute__((__noreturn__)) #else #define _Py_NO_RETURN

1 0