Mailman 3 January 2019 - Python-checkins

bpo-35794: Catch PermissionError in test_no_such_executable (GH-11635)
by Pablo Galindo Jan. 21, 2019

Jan. 21, 2019

https://github.com/python/cpython/commit/e9b185f2a493cc54f0d49eac44bf21e8d7… commit: e9b185f2a493cc54f0d49eac44bf21e8d7de2990 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-01-21T14:35:43Z summary: bpo-35794: Catch PermissionError in test_no_such_executable (GH-11635) PermissionError can be raised if there are directories in the $PATH that are not accessible when using posix_spawnp. files: M Lib/test/test_posix.py diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py index 79fc3c264418..165b83713408 100644 --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -1522,7 +1522,9 @@ def test_no_such_executable(self): pid = self.spawn_func(no_such_executable, [no_such_executable], os.environ) - except FileNotFoundError as exc: + # bpo-35794: PermissionError can be raised if there are + # directories in the $PATH that are not accessible. + except (FileNotFoundError, PermissionError) as exc: self.assertEqual(exc.filename, no_such_executable) else: pid2, status = os.waitpid(pid, 0)

1 0

bpo-35772: Fix test_tarfile on ppc64 (GH-11606)
by Miss Islington (bot) Jan. 21, 2019

Jan. 21, 2019

https://github.com/python/cpython/commit/d1dd6be613381b996b9071443ef081de8e… commit: d1dd6be613381b996b9071443ef081de8e5f3aff branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-21T01:44:30-08:00 summary: bpo-35772: Fix test_tarfile on ppc64 (GH-11606) Fix sparse file tests of test_tarfile on ppc64le with the tmpfs filesystem. Fix the function testing if the filesystem supports sparse files: create a file which contains data and "holes", instead of creating a file which contains no data. tmpfs effective block size is a page size (tmpfs lives in the page cache). RHEL uses 64 KiB pages on aarch64, ppc64 and ppc64le, only s390x and x86_64 use 4 KiB pages, whereas the test punch holes of 4 KiB. test.pythoninfo: Add resource.getpagesize(). (cherry picked from commit b2385458ceddaf3d0d91456923716259d3915023) Co-authored-by: Victor Stinner <vstinner(a)redhat.com> files: A Misc/NEWS.d/next/Tests/2019-01-18-12-19-19.bpo-35772.sGBbsn.rst M Lib/test/pythoninfo.py M Lib/test/test_tarfile.py diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py index 085c45d9cc04..94abfdd86ca2 100644 --- a/Lib/test/pythoninfo.py +++ b/Lib/test/pythoninfo.py @@ -516,6 +516,8 @@ def collect_resource(info_add): value = resource.getrlimit(key) info_add('resource.%s' % name, value) + call_func(info_add, 'resource.pagesize', resource, 'getpagesize') + def collect_test_socket(info_add): try: diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 7d2eec8a7ccf..5e4d75ecfce1 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -973,16 +973,21 @@ def test_sparse_file_10(self): def _fs_supports_holes(): # Return True if the platform knows the st_blocks stat attribute and # uses st_blocks units of 512 bytes, and if the filesystem is able to - # store holes in files. + # store holes of 4 KiB in files. + # + # The function returns False if page size is larger than 4 KiB. + # For example, ppc64 uses pages of 64 KiB. if sys.platform.startswith("linux"): # Linux evidentially has 512 byte st_blocks units. name = os.path.join(TEMPDIR, "sparse-test") with open(name, "wb") as fobj: + # Seek to "punch a hole" of 4 KiB fobj.seek(4096) + fobj.write(b'x' * 4096) fobj.truncate() s = os.stat(name) support.unlink(name) - return s.st_blocks == 0 + return (s.st_blocks * 512 < s.st_size) else: return False diff --git a/Misc/NEWS.d/next/Tests/2019-01-18-12-19-19.bpo-35772.sGBbsn.rst b/Misc/NEWS.d/next/Tests/2019-01-18-12-19-19.bpo-35772.sGBbsn.rst new file mode 100644 index 000000000000..cfd282f1d090 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-01-18-12-19-19.bpo-35772.sGBbsn.rst @@ -0,0 +1,6 @@ +Fix sparse file tests of test_tarfile on ppc64 with the tmpfs filesystem. Fix +the function testing if the filesystem supports sparse files: create a file +which contains data and "holes", instead of creating a file which contains no +data. tmpfs effective block size is a page size (tmpfs lives in the page cache). +RHEL uses 64 KiB pages on aarch64, ppc64, ppc64le, only s390x and x86_64 use 4 +KiB pages, whereas the test punch holes of 4 KiB.

1 0

bpo-20239: Allow repeated deletion of unittest.mock.Mock attributes (GH-11629)
by Chris Withers Jan. 21, 2019

Jan. 21, 2019

https://github.com/python/cpython/commit/d358a8cda75446a8e0b5d99149f709395d… commit: d358a8cda75446a8e0b5d99149f709395d5eae19 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Chris Withers <chris(a)withers.org> date: 2019-01-21T09:37:54Z summary: bpo-20239: Allow repeated deletion of unittest.mock.Mock attributes (GH-11629) * Allow repeated deletion of unittest.mock.Mock attributes * fixup! Allow repeated deletion of unittest.mock.Mock attributes * fixup! fixup! Allow repeated deletion of unittest.mock.Mock attributes (cherry picked from commit 222d303ade8aadf0adcae5190fac603bdcafe3f0) Co-authored-by: Pablo Galindo <Pablogsal(a)gmail.com> files: A Misc/NEWS.d/next/Library/2018-12-09-21-35-49.bpo-20239.V4mWBL.rst M Lib/unittest/mock.py M Lib/unittest/test/testmock/testmock.py diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 955af5d2b85d..42fbc22e748c 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -728,11 +728,10 @@ def __delattr__(self, name): # not set on the instance itself return - if name in self.__dict__: - object.__delattr__(self, name) - obj = self._mock_children.get(name, _missing) - if obj is _deleted: + if name in self.__dict__: + super().__delattr__(name) + elif obj is _deleted: raise AttributeError(name) if obj is not _missing: del self._mock_children[name] diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py index 49ecbb446629..cf0ee8fbb234 100644 --- a/Lib/unittest/test/testmock/testmock.py +++ b/Lib/unittest/test/testmock/testmock.py @@ -1739,6 +1739,33 @@ def test_attribute_deletion(self): self.assertRaises(AttributeError, getattr, mock, 'f') + def test_mock_does_not_raise_on_repeated_attribute_deletion(self): + # bpo-20239: Assigning and deleting twice an attribute raises. + for mock in (Mock(), MagicMock(), NonCallableMagicMock(), + NonCallableMock()): + mock.foo = 3 + self.assertTrue(hasattr(mock, 'foo')) + self.assertEqual(mock.foo, 3) + + del mock.foo + self.assertFalse(hasattr(mock, 'foo')) + + mock.foo = 4 + self.assertTrue(hasattr(mock, 'foo')) + self.assertEqual(mock.foo, 4) + + del mock.foo + self.assertFalse(hasattr(mock, 'foo')) + + + def test_mock_raises_when_deleting_nonexistent_attribute(self): + for mock in (Mock(), MagicMock(), NonCallableMagicMock(), + NonCallableMock()): + del mock.foo + with self.assertRaises(AttributeError): + del mock.foo + + def test_reset_mock_does_not_raise_on_attr_deletion(self): # bpo-31177: reset_mock should not raise AttributeError when attributes # were deleted in a mock instance diff --git a/Misc/NEWS.d/next/Library/2018-12-09-21-35-49.bpo-20239.V4mWBL.rst b/Misc/NEWS.d/next/Library/2018-12-09-21-35-49.bpo-20239.V4mWBL.rst new file mode 100644 index 000000000000..fe9c69d234cf --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-12-09-21-35-49.bpo-20239.V4mWBL.rst @@ -0,0 +1,2 @@ +Allow repeated assignment deletion of :class:`unittest.mock.Mock` attributes. +Patch by Pablo Galindo.

1 0

bpo-35772: Fix test_tarfile on ppc64 (GH-11606)
by Victor Stinner Jan. 21, 2019

Jan. 21, 2019

https://github.com/python/cpython/commit/b2385458ceddaf3d0d91456923716259d3… commit: b2385458ceddaf3d0d91456923716259d3915023 branch: master author: Victor Stinner <vstinner(a)redhat.com> committer: GitHub <noreply(a)github.com> date: 2019-01-21T10:24:12+01:00 summary: bpo-35772: Fix test_tarfile on ppc64 (GH-11606) Fix sparse file tests of test_tarfile on ppc64le with the tmpfs filesystem. Fix the function testing if the filesystem supports sparse files: create a file which contains data and "holes", instead of creating a file which contains no data. tmpfs effective block size is a page size (tmpfs lives in the page cache). RHEL uses 64 KiB pages on aarch64, ppc64 and ppc64le, only s390x and x86_64 use 4 KiB pages, whereas the test punch holes of 4 KiB. test.pythoninfo: Add resource.getpagesize(). files: A Misc/NEWS.d/next/Tests/2019-01-18-12-19-19.bpo-35772.sGBbsn.rst M Lib/test/pythoninfo.py M Lib/test/test_tarfile.py diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py index 7e94a31cecea..07f3cb3bea42 100644 --- a/Lib/test/pythoninfo.py +++ b/Lib/test/pythoninfo.py @@ -529,6 +529,8 @@ def collect_resource(info_add): value = resource.getrlimit(key) info_add('resource.%s' % name, value) + call_func(info_add, 'resource.pagesize', resource, 'getpagesize') + def collect_test_socket(info_add): try: diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py index 7d2eec8a7ccf..5e4d75ecfce1 100644 --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -973,16 +973,21 @@ def test_sparse_file_10(self): def _fs_supports_holes(): # Return True if the platform knows the st_blocks stat attribute and # uses st_blocks units of 512 bytes, and if the filesystem is able to - # store holes in files. + # store holes of 4 KiB in files. + # + # The function returns False if page size is larger than 4 KiB. + # For example, ppc64 uses pages of 64 KiB. if sys.platform.startswith("linux"): # Linux evidentially has 512 byte st_blocks units. name = os.path.join(TEMPDIR, "sparse-test") with open(name, "wb") as fobj: + # Seek to "punch a hole" of 4 KiB fobj.seek(4096) + fobj.write(b'x' * 4096) fobj.truncate() s = os.stat(name) support.unlink(name) - return s.st_blocks == 0 + return (s.st_blocks * 512 < s.st_size) else: return False diff --git a/Misc/NEWS.d/next/Tests/2019-01-18-12-19-19.bpo-35772.sGBbsn.rst b/Misc/NEWS.d/next/Tests/2019-01-18-12-19-19.bpo-35772.sGBbsn.rst new file mode 100644 index 000000000000..cfd282f1d090 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-01-18-12-19-19.bpo-35772.sGBbsn.rst @@ -0,0 +1,6 @@ +Fix sparse file tests of test_tarfile on ppc64 with the tmpfs filesystem. Fix +the function testing if the filesystem supports sparse files: create a file +which contains data and "holes", instead of creating a file which contains no +data. tmpfs effective block size is a page size (tmpfs lives in the page cache). +RHEL uses 64 KiB pages on aarch64, ppc64, ppc64le, only s390x and x86_64 use 4 +KiB pages, whereas the test punch holes of 4 KiB.

1 0

Daily reference leaks (4243df51fe43): sum=13
by solipsis＠pitrou.net Jan. 21, 2019

Jan. 21, 2019

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

1 0

bpo-20239: Allow repeated deletion of unittest.mock.Mock attributes (#11057)
by Chris Withers Jan. 21, 2019

Jan. 21, 2019

https://github.com/python/cpython/commit/222d303ade8aadf0adcae5190fac603bdc… commit: 222d303ade8aadf0adcae5190fac603bdcafe3f0 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: Chris Withers <chris(a)withers.org> date: 2019-01-21T08:57:46Z summary: bpo-20239: Allow repeated deletion of unittest.mock.Mock attributes (#11057) * Allow repeated deletion of unittest.mock.Mock attributes * fixup! Allow repeated deletion of unittest.mock.Mock attributes * fixup! fixup! Allow repeated deletion of unittest.mock.Mock attributes files: A Misc/NEWS.d/next/Library/2018-12-09-21-35-49.bpo-20239.V4mWBL.rst M Lib/unittest/mock.py M Lib/unittest/test/testmock/testmock.py diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 3a22a48c997f..ef5c55d6a165 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -729,11 +729,10 @@ def __delattr__(self, name): # not set on the instance itself return - if name in self.__dict__: - object.__delattr__(self, name) - obj = self._mock_children.get(name, _missing) - if obj is _deleted: + if name in self.__dict__: + super().__delattr__(name) + elif obj is _deleted: raise AttributeError(name) if obj is not _missing: del self._mock_children[name] diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py index 193ae9f9acbf..64e2fcf61c12 100644 --- a/Lib/unittest/test/testmock/testmock.py +++ b/Lib/unittest/test/testmock/testmock.py @@ -1769,6 +1769,33 @@ def test_attribute_deletion(self): self.assertRaises(AttributeError, getattr, mock, 'f') + def test_mock_does_not_raise_on_repeated_attribute_deletion(self): + # bpo-20239: Assigning and deleting twice an attribute raises. + for mock in (Mock(), MagicMock(), NonCallableMagicMock(), + NonCallableMock()): + mock.foo = 3 + self.assertTrue(hasattr(mock, 'foo')) + self.assertEqual(mock.foo, 3) + + del mock.foo + self.assertFalse(hasattr(mock, 'foo')) + + mock.foo = 4 + self.assertTrue(hasattr(mock, 'foo')) + self.assertEqual(mock.foo, 4) + + del mock.foo + self.assertFalse(hasattr(mock, 'foo')) + + + def test_mock_raises_when_deleting_nonexistent_attribute(self): + for mock in (Mock(), MagicMock(), NonCallableMagicMock(), + NonCallableMock()): + del mock.foo + with self.assertRaises(AttributeError): + del mock.foo + + def test_reset_mock_does_not_raise_on_attr_deletion(self): # bpo-31177: reset_mock should not raise AttributeError when attributes # were deleted in a mock instance diff --git a/Misc/NEWS.d/next/Library/2018-12-09-21-35-49.bpo-20239.V4mWBL.rst b/Misc/NEWS.d/next/Library/2018-12-09-21-35-49.bpo-20239.V4mWBL.rst new file mode 100644 index 000000000000..fe9c69d234cf --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-12-09-21-35-49.bpo-20239.V4mWBL.rst @@ -0,0 +1,2 @@ +Allow repeated assignment deletion of :class:`unittest.mock.Mock` attributes. +Patch by Pablo Galindo.

1 0

bpo-35699: fix distuils cannot detect Build Tools 2017 anymore (GH-11495)
by Miss Islington (bot) Jan. 20, 2019

Jan. 20, 2019

https://github.com/python/cpython/commit/2fa53cfa8960f4bcb36718da4424e980fc… commit: 2fa53cfa8960f4bcb36718da4424e980fc305ef5 branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-01-20T11:06:08-08:00 summary: bpo-35699: fix distuils cannot detect Build Tools 2017 anymore (GH-11495) (cherry picked from commit b2dc4a3313c236fedbd6df664722cd47f3d91a72) Co-authored-by: Marc Schlaich <marc.schlaich(a)googlemail.com> files: A Misc/NEWS.d/next/Library/2019-01-11-07-09-25.bpo-35699.VDiENF.rst M Lib/distutils/_msvccompiler.py diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py index 84b4ef59599d..58b20a210247 100644 --- a/Lib/distutils/_msvccompiler.py +++ b/Lib/distutils/_msvccompiler.py @@ -78,6 +78,7 @@ def _find_vc2017(): "-prerelease", "-requires", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "-property", "installationPath", + "-products", "*", ], encoding="mbcs", errors="strict").strip() except (subprocess.CalledProcessError, OSError, UnicodeDecodeError): return None, None diff --git a/Misc/NEWS.d/next/Library/2019-01-11-07-09-25.bpo-35699.VDiENF.rst b/Misc/NEWS.d/next/Library/2019-01-11-07-09-25.bpo-35699.VDiENF.rst new file mode 100644 index 000000000000..e632e7bdcffe --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-11-07-09-25.bpo-35699.VDiENF.rst @@ -0,0 +1 @@ +Fixed detection of Visual Studio Build Tools 2017 in distutils \ No newline at end of file

1 0

Add information about DeprecationWarning for invalid escaped characters in the re module (GH-5255)
by Pablo Galindo Jan. 20, 2019

Jan. 20, 2019

https://github.com/python/cpython/commit/e8239b8e8199b76ef647ff3bf080ce2eb7… commit: e8239b8e8199b76ef647ff3bf080ce2eb7733e04 branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-01-20T18:57:56Z summary: Add information about DeprecationWarning for invalid escaped characters in the re module (GH-5255) files: M Doc/library/re.rst diff --git a/Doc/library/re.rst b/Doc/library/re.rst index 2f829559ff17..ac6455a22074 100644 --- a/Doc/library/re.rst +++ b/Doc/library/re.rst @@ -28,7 +28,10 @@ character for the same purpose in string literals; for example, to match a literal backslash, one might have to write ``'\\\\'`` as the pattern string, because the regular expression must be ``\\``, and each backslash must be expressed as ``\\`` inside a regular Python string -literal. +literal. Also, please note that any invalid escape sequences in Python's +usage of the backslash in string literals now generate a :exc:`DeprecationWarning` +and in the future this will become a :exc:`SyntaxError`. This behaviour +will happen even if it is a valid escape sequence for a regular expression. The solution is to use Python's raw string notation for regular expression patterns; backslashes are not handled in any special way in a string literal

1 0

bpo-35699: fix distuils cannot detect Build Tools 2017 anymore (GH-11495)
by Ned Deily Jan. 20, 2019

Jan. 20, 2019

https://github.com/python/cpython/commit/b2dc4a3313c236fedbd6df664722cd47f3… commit: b2dc4a3313c236fedbd6df664722cd47f3d91a72 branch: master author: Marc Schlaich <marc.schlaich(a)googlemail.com> committer: Ned Deily <nad(a)python.org> date: 2019-01-20T13:47:42-05:00 summary: bpo-35699: fix distuils cannot detect Build Tools 2017 anymore (GH-11495) files: A Misc/NEWS.d/next/Library/2019-01-11-07-09-25.bpo-35699.VDiENF.rst M Lib/distutils/_msvccompiler.py diff --git a/Lib/distutils/_msvccompiler.py b/Lib/distutils/_msvccompiler.py index 84b4ef59599d..58b20a210247 100644 --- a/Lib/distutils/_msvccompiler.py +++ b/Lib/distutils/_msvccompiler.py @@ -78,6 +78,7 @@ def _find_vc2017(): "-prerelease", "-requires", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "-property", "installationPath", + "-products", "*", ], encoding="mbcs", errors="strict").strip() except (subprocess.CalledProcessError, OSError, UnicodeDecodeError): return None, None diff --git a/Misc/NEWS.d/next/Library/2019-01-11-07-09-25.bpo-35699.VDiENF.rst b/Misc/NEWS.d/next/Library/2019-01-11-07-09-25.bpo-35699.VDiENF.rst new file mode 100644 index 000000000000..e632e7bdcffe --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-11-07-09-25.bpo-35699.VDiENF.rst @@ -0,0 +1 @@ +Fixed detection of Visual Studio Build Tools 2017 in distutils \ No newline at end of file

1 0

Daily reference leaks (4243df51fe43): sum=5
by solipsis＠pitrou.net Jan. 20, 2019

Jan. 20, 2019

results for 4243df51fe43 on branch "default" -------------------------------------------- test_collections leaked [-7, 8, 0] memory blocks, sum=1 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/reflog2FFGXL', '--timeout', '7200']

1 0