Mailman 3 December 2020 - Python-checkins

bpo-41781: Fix typo in internal function name in typing (GH-23957)
by serhiy-storchaka Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/c1af128f5a5893839536453dcc8b2ed7b9… commit: c1af128f5a5893839536453dcc8b2ed7b95b3c3a branch: master author: Ross <rrhodes(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2020-12-29T13:55:28+02:00 summary: bpo-41781: Fix typo in internal function name in typing (GH-23957) files: M Lib/typing.py diff --git a/Lib/typing.py b/Lib/typing.py index d1db76f2f8c19..b140b0e669626 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -1249,7 +1249,7 @@ def _no_init(self, *args, **kwargs): raise TypeError('Protocols cannot be instantiated') -def _allow_reckless_class_cheks(): +def _allow_reckless_class_checks(): """Allow instance and class checks for special stdlib modules. The abc and functools modules indiscriminately call isinstance() and @@ -1338,12 +1338,12 @@ def _proto_hook(other): # First, perform various sanity checks. if not getattr(cls, '_is_runtime_protocol', False): - if _allow_reckless_class_cheks(): + if _allow_reckless_class_checks(): return NotImplemented raise TypeError("Instance and class checks can only be used with" " @runtime_checkable protocols") if not _is_callable_members_only(cls): - if _allow_reckless_class_cheks(): + if _allow_reckless_class_checks(): return NotImplemented raise TypeError("Protocols with non-method members" " don't support issubclass()")

1 0

bpo-16396: fix BPO number in changelog (GH-23951) (GH-23956)
by serhiy-storchaka Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/71d73900ebd4a93a64dae9d2fbef4337fa… commit: 71d73900ebd4a93a64dae9d2fbef4337fa975e66 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2020-12-29T13:52:12+02:00 summary: bpo-16396: fix BPO number in changelog (GH-23951) (GH-23956) Automerge-Triggered-By: GH:jaraco (cherry picked from commit 7865f516f313bd31ca48ee1fdae2a80add2293b6) Co-authored-by: Shantanu <12621235+hauntsaninja(a)users.noreply.github.com> files: M Misc/NEWS.d/3.9.1rc1.rst diff --git a/Misc/NEWS.d/3.9.1rc1.rst b/Misc/NEWS.d/3.9.1rc1.rst index ac4bf36f5c217..51edf2fed7e83 100644 --- a/Misc/NEWS.d/3.9.1rc1.rst +++ b/Misc/NEWS.d/3.9.1rc1.rst @@ -475,7 +475,7 @@ compression header. .. -.. bpo: 16936 +.. bpo: 16396 .. date: 2020-07-08-09-45-00 .. nonce: z8o8Pn .. section: Library

1 0

Fix typo in NEWS (GH23958)
by serhiy-storchaka Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/40c2c83899053d004ac2df8e58b2b4145b… commit: 40c2c83899053d004ac2df8e58b2b4145b01370e branch: master author: Zackery Spytz <zspytz(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2020-12-29T13:50:22+02:00 summary: Fix typo in NEWS (GH23958) files: M Misc/NEWS.d/3.8.0a1.rst diff --git a/Misc/NEWS.d/3.8.0a1.rst b/Misc/NEWS.d/3.8.0a1.rst index b7164a5b4e0fa..89811c12a7948 100644 --- a/Misc/NEWS.d/3.8.0a1.rst +++ b/Misc/NEWS.d/3.8.0a1.rst @@ -1784,7 +1784,7 @@ instead of an OrderedDict. .. nonce: Q0ktFC .. section: Library -An ExitStack is now used internally within subprocess.POpen to clean up pipe +An ExitStack is now used internally within subprocess.Popen to clean up pipe file handles. No behavior change in normal operation. But if closing one handle were ever to cause an exception, the others will now be closed instead of leaked. (patch by Giampaolo Rodola)

1 0

bpo-42759: Fix equality comparison of Variable and Font in Tkinter (GH-23968)
by miss-islington Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/578caafabe1de652a8f31dbeb8cc660e1e… commit: 578caafabe1de652a8f31dbeb8cc660e1ed725eb branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2020-12-29T03:18:26-08:00 summary: bpo-42759: Fix equality comparison of Variable and Font in Tkinter (GH-23968) Objects which belong to different Tcl interpreters are now always different, even if they have the same name. (cherry picked from commit 1df56bc0597a051c13d53514e120e9b6764185f8) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: A Misc/NEWS.d/next/Library/2020-12-27-22-19-26.bpo-42759.lGi_03.rst M Lib/tkinter/__init__.py M Lib/tkinter/font.py M Lib/tkinter/test/test_tkinter/test_font.py M Lib/tkinter/test/test_tkinter/test_variables.py diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index bf0342e27b21f..98e95ad44866f 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -491,15 +491,11 @@ def trace_vinfo(self): self._tk.call("trace", "vinfo", self._name))] def __eq__(self, other): - """Comparison for equality (==). - - Note: if the Variable's master matters to behavior - also compare self._master == other._master - """ if not isinstance(other, Variable): return NotImplemented - return self.__class__.__name__ == other.__class__.__name__ \ - and self._name == other._name + return (self._name == other._name + and self.__class__.__name__ == other.__class__.__name__ + and self._tk == other._tk) class StringVar(Variable): diff --git a/Lib/tkinter/font.py b/Lib/tkinter/font.py index 2b58030c1fb5a..78b660c54be31 100644 --- a/Lib/tkinter/font.py +++ b/Lib/tkinter/font.py @@ -103,7 +103,7 @@ def __str__(self): def __eq__(self, other): if not isinstance(other, Font): return NotImplemented - return self.name == other.name + return self.name == other.name and self._tk == other._tk def __getitem__(self, key): return self.cget(key) diff --git a/Lib/tkinter/test/test_tkinter/test_font.py b/Lib/tkinter/test/test_tkinter/test_font.py index 28d8c7b2f8963..0ea7924f5d5c9 100644 --- a/Lib/tkinter/test/test_tkinter/test_font.py +++ b/Lib/tkinter/test/test_tkinter/test_font.py @@ -63,15 +63,22 @@ def test_name(self): self.assertEqual(self.font.name, fontname) self.assertEqual(str(self.font), fontname) - def test_eq(self): + def test_equality(self): font1 = font.Font(root=self.root, name=fontname, exists=True) font2 = font.Font(root=self.root, name=fontname, exists=True) self.assertIsNot(font1, font2) self.assertEqual(font1, font2) self.assertNotEqual(font1, font1.copy()) + self.assertNotEqual(font1, 0) self.assertEqual(font1, ALWAYS_EQ) + root2 = tkinter.Tk() + self.addCleanup(root2.destroy) + font3 = font.Font(root=root2, name=fontname, exists=True) + self.assertEqual(str(font1), str(font3)) + self.assertNotEqual(font1, font3) + def test_measure(self): self.assertIsInstance(self.font.measure('abc'), int) diff --git a/Lib/tkinter/test/test_tkinter/test_variables.py b/Lib/tkinter/test/test_tkinter/test_variables.py index 63d7c21059e38..6aebe8d16d556 100644 --- a/Lib/tkinter/test/test_tkinter/test_variables.py +++ b/Lib/tkinter/test/test_tkinter/test_variables.py @@ -58,22 +58,32 @@ def test_dont_unset_not_existing(self): del v2 self.assertFalse(self.info_exists("name")) - def test___eq__(self): + def test_equality(self): # values doesn't matter, only class and name are checked v1 = Variable(self.root, name="abc") v2 = Variable(self.root, name="abc") self.assertIsNot(v1, v2) self.assertEqual(v1, v2) - v3 = StringVar(self.root, name="abc") + v3 = Variable(self.root, name="cba") self.assertNotEqual(v1, v3) + v4 = StringVar(self.root, name="abc") + self.assertEqual(str(v1), str(v4)) + self.assertNotEqual(v1, v4) + V = type('Variable', (), {}) self.assertNotEqual(v1, V()) self.assertNotEqual(v1, object()) self.assertEqual(v1, ALWAYS_EQ) + root2 = tkinter.Tk() + self.addCleanup(root2.destroy) + v5 = Variable(root2, name="abc") + self.assertEqual(str(v1), str(v5)) + self.assertNotEqual(v1, v5) + def test_invalid_name(self): with self.assertRaises(TypeError): Variable(self.root, name=123) diff --git a/Misc/NEWS.d/next/Library/2020-12-27-22-19-26.bpo-42759.lGi_03.rst b/Misc/NEWS.d/next/Library/2020-12-27-22-19-26.bpo-42759.lGi_03.rst new file mode 100644 index 0000000000000..a5ec7d5820336 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-12-27-22-19-26.bpo-42759.lGi_03.rst @@ -0,0 +1,3 @@ +Fixed equality comparison of :class:`tkinter.Variable` and +:class:`tkinter.font.Font`. Objects which belong to different Tcl +interpreters are now always different, even if they have the same name.

1 0

bpo-42749: Use dynamic version to test for unsupported bignum in Tk (GH-23966)
by miss-islington Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/7bdb3e08251894b49e7893db1dc4868e26… commit: 7bdb3e08251894b49e7893db1dc4868e2656b342 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2020-12-29T03:17:43-08:00 summary: bpo-42749: Use dynamic version to test for unsupported bignum in Tk (GH-23966) Tk can internally support bignum even if Tkinter is built without support of bignum. (cherry picked from commit 156b7f7052102ee1633a18e9a136ad8c38f66db0) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Lib/test/test_tcl.py diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py index a126b68a108fa..0bbb39b147ea1 100644 --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -447,7 +447,7 @@ def test_expr_bignum(self): else: self.assertEqual(result, str(i)) self.assertIsInstance(result, str) - if tcl_version < (8, 5): # bignum was added in Tcl 8.5 + if get_tk_patchlevel() < (8, 5): # bignum was added in Tcl 8.5 self.assertRaises(TclError, tcl.call, 'expr', str(2**1000)) def test_passing_values(self):

1 0

bpo-42749: Use dynamic version to test for unsupported bignum in Tk (GH-23966)
by miss-islington Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/323cbb5531eb72527d0e3b02f28c1cdc5b… commit: 323cbb5531eb72527d0e3b02f28c1cdc5b7fce92 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2020-12-29T03:16:43-08:00 summary: bpo-42749: Use dynamic version to test for unsupported bignum in Tk (GH-23966) Tk can internally support bignum even if Tkinter is built without support of bignum. (cherry picked from commit 156b7f7052102ee1633a18e9a136ad8c38f66db0) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: M Lib/test/test_tcl.py diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py index 6ac0db4dc4a9c..c41235c1971a2 100644 --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -446,7 +446,7 @@ def test_expr_bignum(self): else: self.assertEqual(result, str(i)) self.assertIsInstance(result, str) - if tcl_version < (8, 5): # bignum was added in Tcl 8.5 + if get_tk_patchlevel() < (8, 5): # bignum was added in Tcl 8.5 self.assertRaises(TclError, tcl.call, 'expr', str(2**1000)) def test_passing_values(self):

1 0

bpo-42759: Fix equality comparison of Variable and Font in Tkinter (GH-23968)
by serhiy-storchaka Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/1df56bc0597a051c13d53514e120e9b676… commit: 1df56bc0597a051c13d53514e120e9b6764185f8 branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2020-12-29T12:56:55+02:00 summary: bpo-42759: Fix equality comparison of Variable and Font in Tkinter (GH-23968) Objects which belong to different Tcl interpreters are now always different, even if they have the same name. files: A Misc/NEWS.d/next/Library/2020-12-27-22-19-26.bpo-42759.lGi_03.rst M Lib/tkinter/__init__.py M Lib/tkinter/font.py M Lib/tkinter/test/test_tkinter/test_font.py M Lib/tkinter/test/test_tkinter/test_variables.py diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index fec56553e4208..57ac3fb5cf6ef 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -516,15 +516,11 @@ def trace_vinfo(self): self._tk.call("trace", "vinfo", self._name))] def __eq__(self, other): - """Comparison for equality (==). - - Note: if the Variable's master matters to behavior - also compare self._master == other._master - """ if not isinstance(other, Variable): return NotImplemented - return self.__class__.__name__ == other.__class__.__name__ \ - and self._name == other._name + return (self._name == other._name + and self.__class__.__name__ == other.__class__.__name__ + and self._tk == other._tk) class StringVar(Variable): diff --git a/Lib/tkinter/font.py b/Lib/tkinter/font.py index 06ed01b99cfc3..3e24e28ef58cd 100644 --- a/Lib/tkinter/font.py +++ b/Lib/tkinter/font.py @@ -107,7 +107,7 @@ def __repr__(self): def __eq__(self, other): if not isinstance(other, Font): return NotImplemented - return self.name == other.name + return self.name == other.name and self._tk == other._tk def __getitem__(self, key): return self.cget(key) diff --git a/Lib/tkinter/test/test_tkinter/test_font.py b/Lib/tkinter/test/test_tkinter/test_font.py index 0354c5f3044e7..91f9974117197 100644 --- a/Lib/tkinter/test/test_tkinter/test_font.py +++ b/Lib/tkinter/test/test_tkinter/test_font.py @@ -63,15 +63,22 @@ def test_name(self): self.assertEqual(self.font.name, fontname) self.assertEqual(str(self.font), fontname) - def test_eq(self): + def test_equality(self): font1 = font.Font(root=self.root, name=fontname, exists=True) font2 = font.Font(root=self.root, name=fontname, exists=True) self.assertIsNot(font1, font2) self.assertEqual(font1, font2) self.assertNotEqual(font1, font1.copy()) + self.assertNotEqual(font1, 0) self.assertEqual(font1, ALWAYS_EQ) + root2 = tkinter.Tk() + self.addCleanup(root2.destroy) + font3 = font.Font(root=root2, name=fontname, exists=True) + self.assertEqual(str(font1), str(font3)) + self.assertNotEqual(font1, font3) + def test_measure(self): self.assertIsInstance(self.font.measure('abc'), int) diff --git a/Lib/tkinter/test/test_tkinter/test_variables.py b/Lib/tkinter/test/test_tkinter/test_variables.py index 63d7c21059e38..6aebe8d16d556 100644 --- a/Lib/tkinter/test/test_tkinter/test_variables.py +++ b/Lib/tkinter/test/test_tkinter/test_variables.py @@ -58,22 +58,32 @@ def test_dont_unset_not_existing(self): del v2 self.assertFalse(self.info_exists("name")) - def test___eq__(self): + def test_equality(self): # values doesn't matter, only class and name are checked v1 = Variable(self.root, name="abc") v2 = Variable(self.root, name="abc") self.assertIsNot(v1, v2) self.assertEqual(v1, v2) - v3 = StringVar(self.root, name="abc") + v3 = Variable(self.root, name="cba") self.assertNotEqual(v1, v3) + v4 = StringVar(self.root, name="abc") + self.assertEqual(str(v1), str(v4)) + self.assertNotEqual(v1, v4) + V = type('Variable', (), {}) self.assertNotEqual(v1, V()) self.assertNotEqual(v1, object()) self.assertEqual(v1, ALWAYS_EQ) + root2 = tkinter.Tk() + self.addCleanup(root2.destroy) + v5 = Variable(root2, name="abc") + self.assertEqual(str(v1), str(v5)) + self.assertNotEqual(v1, v5) + def test_invalid_name(self): with self.assertRaises(TypeError): Variable(self.root, name=123) diff --git a/Misc/NEWS.d/next/Library/2020-12-27-22-19-26.bpo-42759.lGi_03.rst b/Misc/NEWS.d/next/Library/2020-12-27-22-19-26.bpo-42759.lGi_03.rst new file mode 100644 index 0000000000000..a5ec7d5820336 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-12-27-22-19-26.bpo-42759.lGi_03.rst @@ -0,0 +1,3 @@ +Fixed equality comparison of :class:`tkinter.Variable` and +:class:`tkinter.font.Font`. Objects which belong to different Tcl +interpreters are now always different, even if they have the same name.

1 0

bpo-42749: Use dynamic version to test for unsupported bignum in Tk (GH-23966)
by serhiy-storchaka Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/156b7f7052102ee1633a18e9a136ad8c38… commit: 156b7f7052102ee1633a18e9a136ad8c38f66db0 branch: master author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2020-12-29T12:55:55+02:00 summary: bpo-42749: Use dynamic version to test for unsupported bignum in Tk (GH-23966) Tk can internally support bignum even if Tkinter is built without support of bignum. files: M Lib/test/test_tcl.py diff --git a/Lib/test/test_tcl.py b/Lib/test/test_tcl.py index 5bc4f9bda171e..ee7344c48ed0b 100644 --- a/Lib/test/test_tcl.py +++ b/Lib/test/test_tcl.py @@ -449,7 +449,7 @@ def test_expr_bignum(self): else: self.assertEqual(result, str(i)) self.assertIsInstance(result, str) - if tcl_version < (8, 5): # bignum was added in Tcl 8.5 + if get_tk_patchlevel() < (8, 5): # bignum was added in Tcl 8.5 self.assertRaises(TclError, tcl.call, 'expr', str(2**1000)) def test_passing_values(self):

1 0

bpo-42770: Fix a typo in the email.headerregistry docs (GH-23982)
by miss-islington Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/0b43778b3cd222761beb850178492b6bd0… commit: 0b43778b3cd222761beb850178492b6bd0ea2370 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2020-12-28T20:37:20-08:00 summary: bpo-42770: Fix a typo in the email.headerregistry docs (GH-23982) Automerge-Triggered-By: GH:zware (cherry picked from commit c56988b88fecf6dc70f039704fda6051a0754db1) Co-authored-by: Zackery Spytz <zspytz(a)gmail.com> files: M Doc/library/email.headerregistry.rst diff --git a/Doc/library/email.headerregistry.rst b/Doc/library/email.headerregistry.rst index 9376da2b8d39c..3e1d97a03264b 100644 --- a/Doc/library/email.headerregistry.rst +++ b/Doc/library/email.headerregistry.rst @@ -289,7 +289,7 @@ variant, :attr:`~.BaseHeader.max_count` is set to 1. A :class:`ParameterizedMIMEHeader` class that handles the :mailheader:`Content-Disposition` header. - .. attribute:: content-disposition + .. attribute:: content_disposition ``inline`` and ``attachment`` are the only valid values in common use.

1 0

bpo-42770: Fix a typo in the email.headerregistry docs (GH-23982)
by miss-islington Dec. 29, 2020

Dec. 29, 2020

https://github.com/python/cpython/commit/e11639880a73f30b4009efa8d14c350932… commit: e11639880a73f30b4009efa8d14c350932e35332 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2020-12-28T20:21:43-08:00 summary: bpo-42770: Fix a typo in the email.headerregistry docs (GH-23982) Automerge-Triggered-By: GH:zware (cherry picked from commit c56988b88fecf6dc70f039704fda6051a0754db1) Co-authored-by: Zackery Spytz <zspytz(a)gmail.com> files: M Doc/library/email.headerregistry.rst diff --git a/Doc/library/email.headerregistry.rst b/Doc/library/email.headerregistry.rst index 9376da2b8d39c..3e1d97a03264b 100644 --- a/Doc/library/email.headerregistry.rst +++ b/Doc/library/email.headerregistry.rst @@ -289,7 +289,7 @@ variant, :attr:`~.BaseHeader.max_count` is set to 1. A :class:`ParameterizedMIMEHeader` class that handles the :mailheader:`Content-Disposition` header. - .. attribute:: content-disposition + .. attribute:: content_disposition ``inline`` and ``attachment`` are the only valid values in common use.

1 0