Mailman 3 December 2019 - Python-checkins

Fix idlelib README typo. (GH-17770)
by Miss Islington (bot) Dec. 31, 2019

Dec. 31, 2019

https://github.com/python/cpython/commit/302b35f82bdaac817966638e2630b452f4… commit: 302b35f82bdaac817966638e2630b452f4123958 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-12-31T10:52:38-08:00 summary: Fix idlelib README typo. (GH-17770) (cherry picked from commit ba82ee894cf0f6ec9e9f6a313c870ffd2db377e6) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: M Lib/idlelib/README.txt diff --git a/Lib/idlelib/README.txt b/Lib/idlelib/README.txt index 48a1f4a425c9e..bc3d978f43f1a 100644 --- a/Lib/idlelib/README.txt +++ b/Lib/idlelib/README.txt @@ -90,7 +90,7 @@ Configuration config-extensions.def # Defaults for extensions config-highlight.def # Defaults for colorizing config-keys.def # Defaults for key bindings -config-main.def # Defai;ts fpr font and geneal +config-main.def # Defaults for font and general tabs Text ----

1 0

Fix idlelib README typo. (GH-17770)
by Miss Islington (bot) Dec. 31, 2019

Dec. 31, 2019

https://github.com/python/cpython/commit/88938e415f4160dbccc3a6826394cf0d46… commit: 88938e415f4160dbccc3a6826394cf0d460e273c branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-12-31T10:51:23-08:00 summary: Fix idlelib README typo. (GH-17770) (cherry picked from commit ba82ee894cf0f6ec9e9f6a313c870ffd2db377e6) Co-authored-by: Terry Jan Reedy <tjreedy(a)udel.edu> files: M Lib/idlelib/README.txt diff --git a/Lib/idlelib/README.txt b/Lib/idlelib/README.txt index 48a1f4a425c9e..bc3d978f43f1a 100644 --- a/Lib/idlelib/README.txt +++ b/Lib/idlelib/README.txt @@ -90,7 +90,7 @@ Configuration config-extensions.def # Defaults for extensions config-highlight.def # Defaults for colorizing config-keys.def # Defaults for key bindings -config-main.def # Defai;ts fpr font and geneal +config-main.def # Defaults for font and general tabs Text ----

1 0

Fix idlelib README typo. (GH-17770)
by Terry Jan Reedy Dec. 31, 2019

Dec. 31, 2019

https://github.com/python/cpython/commit/ba82ee894cf0f6ec9e9f6a313c870ffd2d… commit: ba82ee894cf0f6ec9e9f6a313c870ffd2db377e6 branch: master author: Terry Jan Reedy <tjreedy(a)udel.edu> committer: GitHub <noreply(a)github.com> date: 2019-12-31T13:34:22-05:00 summary: Fix idlelib README typo. (GH-17770) files: M Lib/idlelib/README.txt diff --git a/Lib/idlelib/README.txt b/Lib/idlelib/README.txt index 48a1f4a425c9e..bc3d978f43f1a 100644 --- a/Lib/idlelib/README.txt +++ b/Lib/idlelib/README.txt @@ -90,7 +90,7 @@ Configuration config-extensions.def # Defaults for extensions config-highlight.def # Defaults for colorizing config-keys.def # Defaults for key bindings -config-main.def # Defai;ts fpr font and geneal +config-main.def # Defaults for font and general tabs Text ----

1 0

Minor doc fixes in urllib.parse (GH-17745)
by Miss Islington (bot) Dec. 31, 2019

Dec. 31, 2019

https://github.com/python/cpython/commit/8e1f26e4f06c43cf52afa26ce30f27d2c1… commit: 8e1f26e4f06c43cf52afa26ce30f27d2c1129c4a branch: master author: Борис Верховский <boris.verk(a)gmail.com> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-12-31T04:28:18-08:00 summary: Minor doc fixes in urllib.parse (GH-17745) files: M Doc/library/urllib.parse.rst diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst index 2d4d5a9e60969..02f0c01e224dd 100644 --- a/Doc/library/urllib.parse.rst +++ b/Doc/library/urllib.parse.rst @@ -42,8 +42,8 @@ or on combining URL components into a URL string. Parse a URL into six components, returning a 6-item :term:`named tuple`. This corresponds to the general structure of a URL: ``scheme://netloc/path;parameters?query#fragment``. - Each tuple item is a string, possibly empty. The components are not broken up in - smaller parts (for example, the network location is a single string), and % + Each tuple item is a string, possibly empty. The components are not broken up + into smaller parts (for example, the network location is a single string), and % escapes are not expanded. The delimiters as shown above are not part of the result, except for a leading slash in the *path* component, which is retained if present. For example: @@ -328,22 +328,22 @@ or on combining URL components into a URL string. .. note:: - If *url* is an absolute URL (that is, starting with ``//`` or ``scheme://``), - the *url*'s host name and/or scheme will be present in the result. For example: + If *url* is an absolute URL (that is, it starts with ``//`` or ``scheme://``), + the *url*'s hostname and/or scheme will be present in the result. For example: - .. doctest:: + .. doctest:: - >>> urljoin('http://www.cwi.nl/%7Eguido/Python.html', - ... '//www.python.org/%7Eguido') - 'http://www.python.org/%7Eguido' + >>> urljoin('http://www.cwi.nl/%7Eguido/Python.html', + ... '//www.python.org/%7Eguido') + 'http://www.python.org/%7Eguido' - If you do not want that behavior, preprocess the *url* with :func:`urlsplit` and - :func:`urlunsplit`, removing possible *scheme* and *netloc* parts. + If you do not want that behavior, preprocess the *url* with :func:`urlsplit` and + :func:`urlunsplit`, removing possible *scheme* and *netloc* parts. .. versionchanged:: 3.5 - Behaviour updated to match the semantics defined in :rfc:`3986`. + Behavior updated to match the semantics defined in :rfc:`3986`. .. function:: urldefrag(url) @@ -521,11 +521,11 @@ task isn't already covered by the URL parsing functions above. Replace special characters in *string* using the ``%xx`` escape. Letters, digits, and the characters ``'_.-~'`` are never quoted. By default, this - function is intended for quoting the path section of URL. The optional *safe* - parameter specifies additional ASCII characters that should not be quoted - --- its default value is ``'/'``. + function is intended for quoting the path section of a URL. The optional + *safe* parameter specifies additional ASCII characters that should not be + quoted --- its default value is ``'/'``. - *string* may be either a :class:`str` or a :class:`bytes`. + *string* may be either a :class:`str` or a :class:`bytes` object. .. versionchanged:: 3.7 Moved from :rfc:`2396` to :rfc:`3986` for quoting URL strings. "~" is now @@ -547,7 +547,7 @@ task isn't already covered by the URL parsing functions above. .. function:: quote_plus(string, safe='', encoding=None, errors=None) - Like :func:`quote`, but also replace spaces by plus signs, as required for + Like :func:`quote`, but also replace spaces with plus signs, as required for quoting HTML form values when building up a query string to go into a URL. Plus signs in the original string are escaped unless they are included in *safe*. It also does not have *safe* default to ``'/'``. @@ -566,12 +566,12 @@ task isn't already covered by the URL parsing functions above. .. function:: unquote(string, encoding='utf-8', errors='replace') - Replace ``%xx`` escapes by their single-character equivalent. + Replace ``%xx`` escapes with their single-character equivalent. The optional *encoding* and *errors* parameters specify how to decode percent-encoded sequences into Unicode characters, as accepted by the :meth:`bytes.decode` method. - *string* may be either a :class:`str` or a :class:`bytes`. + *string* may be either a :class:`str` or a :class:`bytes` object. *encoding* defaults to ``'utf-8'``. *errors* defaults to ``'replace'``, meaning invalid sequences are replaced @@ -587,8 +587,8 @@ task isn't already covered by the URL parsing functions above. .. function:: unquote_plus(string, encoding='utf-8', errors='replace') - Like :func:`unquote`, but also replace plus signs by spaces, as required for - unquoting HTML form values. + Like :func:`unquote`, but also replace plus signs with spaces, as required + for unquoting HTML form values. *string* must be a :class:`str`. @@ -597,10 +597,10 @@ task isn't already covered by the URL parsing functions above. .. function:: unquote_to_bytes(string) - Replace ``%xx`` escapes by their single-octet equivalent, and return a + Replace ``%xx`` escapes with their single-octet equivalent, and return a :class:`bytes` object. - *string* may be either a :class:`str` or a :class:`bytes`. + *string* may be either a :class:`str` or a :class:`bytes` object. If it is a :class:`str`, unescaped non-ASCII characters in *string* are encoded into UTF-8 bytes. @@ -631,7 +631,7 @@ task isn't already covered by the URL parsing functions above. When a sequence of two-element tuples is used as the *query* argument, the first element of each tuple is a key and the second is a value. The value element in itself can be a sequence and in that case, if - the optional parameter *doseq* is evaluates to ``True``, individual + the optional parameter *doseq* evaluates to ``True``, individual ``key=value`` pairs separated by ``'&'`` are generated for each element of the value sequence for the key. The order of parameters in the encoded string will match the order of parameter tuples in the sequence. @@ -643,11 +643,12 @@ task isn't already covered by the URL parsing functions above. To reverse this encoding process, :func:`parse_qs` and :func:`parse_qsl` are provided in this module to parse query strings into Python data structures. - Refer to :ref:`urllib examples <urllib-examples>` to find out how urlencode - method can be used for generating query string for a URL or data for POST. + Refer to :ref:`urllib examples <urllib-examples>` to find out how the + :func:`urllib.parse.urlencode` method can be used for generating the query + string of a URL or data for a POST request. .. versionchanged:: 3.2 - Query parameter supports bytes and string objects. + *query* supports bytes and string objects. .. versionadded:: 3.5 *quote_via* parameter.

1 0

[2.7] bpo-27973 - Fix for urllib.urlretrieve() failing on second ftp transfer (#1040)
by Senthil Kumaran Dec. 31, 2019

Dec. 31, 2019

https://github.com/python/cpython/commit/f82e59ac4020a64c262a925230a8eb190b… commit: f82e59ac4020a64c262a925230a8eb190b652e87 branch: 2.7 author: Senthil Kumaran <orsenthil(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-12-30T21:14:56-08:00 summary: [2.7] bpo-27973 - Fix for urllib.urlretrieve() failing on second ftp transfer (#1040) * bpo-27973: Fix urllib.urlretrieve failing on subsequent ftp transfers from the same host. * bpo-35411: Skip test_urllibnet FTP tests on Travis CI. files: A Misc/NEWS.d/next/Library/2019-12-30-07-59-34.bpo-27973.mgWXH1.rst M Lib/test/test_urllibnet.py M Lib/urllib.py diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py index 3f2d8dcd43b0c..df118dc75d1b3 100644 --- a/Lib/test/test_urllibnet.py +++ b/Lib/test/test_urllibnet.py @@ -1,5 +1,7 @@ +import tempfile import unittest from test import test_support +from test.test_urllib2net import skip_ftp_test_on_travis import socket import urllib @@ -213,6 +215,40 @@ def test_context_argument(self): self.assertIn("Python", response.read()) +class urlopen_FTPTest(unittest.TestCase): + FTP_TEST_FILE = 'ftp://www.pythontest.net/README' + NUM_FTP_RETRIEVES = 3 + + @skip_ftp_test_on_travis + def test_multiple_ftp_retrieves(self): + + with test_support.transient_internet(self.FTP_TEST_FILE): + try: + for _ in range(self.NUM_FTP_RETRIEVES): + with tempfile.NamedTemporaryFile() as fp: + urllib.FancyURLopener().retrieve(self.FTP_TEST_FILE, fp.name) + except IOError as e: + self.fail("Failed FTP retrieve while accessing ftp url " + "multiple times.\n Error message was : %s" % e) + + @skip_ftp_test_on_travis + def test_multiple_ftp_urlopen_same_host(self): + with test_support.transient_internet(self.FTP_TEST_FILE): + ftp_fds_to_close = [] + try: + for _ in range(self.NUM_FTP_RETRIEVES): + fd = urllib.urlopen(self.FTP_TEST_FILE) + # test ftp open without closing fd as a supported scenario. + ftp_fds_to_close.append(fd) + except IOError as e: + self.fail("Failed FTP binary file open. " + "Error message was: %s" % e) + finally: + # close the open fds + for fd in ftp_fds_to_close: + fd.close() + + def test_main(): test_support.requires('network') with test_support.check_py3k_warnings( @@ -220,7 +256,8 @@ def test_main(): test_support.run_unittest(URLTimeoutTest, urlopenNetworkTests, urlretrieveNetworkTests, - urlopen_HttpsTests) + urlopen_HttpsTests, + urlopen_FTPTest) if __name__ == "__main__": test_main() diff --git a/Lib/urllib.py b/Lib/urllib.py index 156879dd0a140..87bcd94db5f05 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -934,7 +934,13 @@ def retrfile(self, file, type): return (ftpobj, retrlen) def endtransfer(self): + if not self.busy: + return self.busy = 0 + try: + self.ftp.voidresp() + except ftperrors(): + pass def close(self): self.keepalive = False diff --git a/Misc/NEWS.d/next/Library/2019-12-30-07-59-34.bpo-27973.mgWXH1.rst b/Misc/NEWS.d/next/Library/2019-12-30-07-59-34.bpo-27973.mgWXH1.rst new file mode 100644 index 0000000000000..d50f483889b3d --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-12-30-07-59-34.bpo-27973.mgWXH1.rst @@ -0,0 +1,2 @@ +Fix urllib.urlretrieve failing on subsequent ftp transfers from the same +host.

1 0

[3.8] bpo-38588: Fix possible crashes in dict and list when calling P… (GH-17764)
by Pablo Galindo Dec. 31, 2019

Dec. 31, 2019

https://github.com/python/cpython/commit/2ee87913dde038436a25f1db13ee3fddd2… commit: 2ee87913dde038436a25f1db13ee3fddd2bcc983 branch: 3.8 author: Dong-hee Na <donghee.na92(a)gmail.com> committer: Pablo Galindo <Pablogsal(a)gmail.com> date: 2019-12-31T04:15:36Z summary: [3.8] bpo-38588: Fix possible crashes in dict and list when calling P… (GH-17764) * [3.8] bpo-38588: Fix possible crashes in dict and list when calling PyObject_RichCompareBool (GH-17734) Take strong references before calling PyObject_RichCompareBool to protect against the case where the object dies during the call. (cherry picked from commit 2d5bf568eaa5059402ccce9ba5a366986ba27c8a) Co-authored-by: Dong-hee Na <donghee.na92(a)gmail.com> * Update Objects/listobject.c @methane's suggestion Co-Authored-By: Inada Naoki <songofacandy(a)gmail.com> Co-authored-by: Inada Naoki <songofacandy(a)gmail.com> files: A Misc/NEWS.d/next/Core and Builtins/2019-12-29-19-13-54.bpo-38588.pgXnNS.rst M Lib/test/test_dict.py M Lib/test/test_list.py M Objects/dictobject.c M Objects/listobject.c diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py index 5b513765f7b08..de483ab552155 100644 --- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -1221,7 +1221,7 @@ def test_free_after_iterating(self): support.check_free_after_iterating(self, lambda d: iter(d.items()), dict) def test_equal_operator_modifying_operand(self): - # test fix for seg fault reported in issue 27945 part 3. + # test fix for seg fault reported in bpo-27945 part 3. class X(): def __del__(self): dict_b.clear() @@ -1237,6 +1237,16 @@ def __hash__(self): dict_b = {X(): X()} self.assertTrue(dict_a == dict_b) + # test fix for seg fault reported in bpo-38588 part 1. + class Y: + def __eq__(self, other): + dict_d.clear() + return True + + dict_c = {0: Y()} + dict_d = {0: set()} + self.assertTrue(dict_c == dict_d) + def test_fromkeys_operator_modifying_dict_operand(self): # test fix for seg fault reported in issue 27945 part 4a. class X(int): diff --git a/Lib/test/test_list.py b/Lib/test/test_list.py index 55c6eede527c2..f4dcced9c167f 100644 --- a/Lib/test/test_list.py +++ b/Lib/test/test_list.py @@ -158,6 +158,31 @@ class L(list): pass with self.assertRaises(TypeError): (3,) + L([1,2]) + def test_equal_operator_modifying_operand(self): + # test fix for seg fault reported in bpo-38588 part 2. + class X: + def __eq__(self,other) : + list2.clear() + return NotImplemented + + class Y: + def __eq__(self, other): + list1.clear() + return NotImplemented + + class Z: + def __eq__(self, other): + list3.clear() + return NotImplemented + + list1 = [X()] + list2 = [Y()] + self.assertTrue(list1 == list2) + + list3 = [Z()] + list4 = [1] + self.assertFalse(list3 == list4) + @cpython_only def test_preallocation(self): iterable = [0] * 10 diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-12-29-19-13-54.bpo-38588.pgXnNS.rst b/Misc/NEWS.d/next/Core and Builtins/2019-12-29-19-13-54.bpo-38588.pgXnNS.rst new file mode 100644 index 0000000000000..0b81085a89d25 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-12-29-19-13-54.bpo-38588.pgXnNS.rst @@ -0,0 +1,2 @@ +Fix possible crashes in dict and list when calling +:c:func:`PyObject_RichCompareBool`. diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 76f4fefe0979f..3c56f4a515e8a 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2773,9 +2773,11 @@ dict_equal(PyDictObject *a, PyDictObject *b) return -1; return 0; } + Py_INCREF(bval); cmp = PyObject_RichCompareBool(aval, bval, Py_EQ); Py_DECREF(key); Py_DECREF(aval); + Py_DECREF(bval); if (cmp <= 0) /* error or not equal */ return cmp; } diff --git a/Objects/listobject.c b/Objects/listobject.c index 8b52fa5ef267a..d506c0817336b 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2664,8 +2664,18 @@ list_richcompare(PyObject *v, PyObject *w, int op) /* Search for the first index where items are different */ for (i = 0; i < Py_SIZE(vl) && i < Py_SIZE(wl); i++) { + PyObject *vitem = vl->ob_item[i]; + PyObject *witem = wl->ob_item[i]; + if (vitem == witem) { + continue; + } + + Py_INCREF(vitem); + Py_INCREF(witem); int k = PyObject_RichCompareBool(vl->ob_item[i], wl->ob_item[i], Py_EQ); + Py_DECREF(vitem); + Py_DECREF(witem); if (k < 0) return NULL; if (!k)

1 0

[3.7] bpo-38588: Fix possible crashes in dict and list when calling P… (GH-17765)
by Pablo Galindo Dec. 31, 2019

Dec. 31, 2019

https://github.com/python/cpython/commit/53f11ba7b1498133ce3ff8173d5ae2e018… commit: 53f11ba7b1498133ce3ff8173d5ae2e0182a3603 branch: 3.7 author: Dong-hee Na <donghee.na92(a)gmail.com> committer: Pablo Galindo <Pablogsal(a)gmail.com> date: 2019-12-31T04:15:10Z summary: [3.7] bpo-38588: Fix possible crashes in dict and list when calling P… (GH-17765) * [3.7] bpo-38588: Fix possible crashes in dict and list when calling PyObject_RichCompareBool (GH-17734) Take strong references before calling PyObject_RichCompareBool to protect against the case where the object dies during the call.. (cherry picked from commit 2d5bf568eaa5059402ccce9ba5a366986ba27c8a) Co-authored-by: Dong-hee Na <donghee.na92(a)gmail.com> * methane's suggestion methane's suggestion Co-Authored-By: Inada Naoki <songofacandy(a)gmail.com> Co-authored-by: Inada Naoki <songofacandy(a)gmail.com> files: A Misc/NEWS.d/next/Core and Builtins/2019-12-29-19-13-54.bpo-38588.pgXnNS.rst M Lib/test/test_dict.py M Lib/test/test_list.py M Objects/dictobject.c M Objects/listobject.c diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py index 90c0a3131a78e..ea9dcb6a81c6a 100644 --- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -1138,7 +1138,7 @@ def test_free_after_iterating(self): support.check_free_after_iterating(self, lambda d: iter(d.items()), dict) def test_equal_operator_modifying_operand(self): - # test fix for seg fault reported in issue 27945 part 3. + # test fix for seg fault reported in bpo-27945 part 3. class X(): def __del__(self): dict_b.clear() @@ -1154,6 +1154,16 @@ def __hash__(self): dict_b = {X(): X()} self.assertTrue(dict_a == dict_b) + # test fix for seg fault reported in bpo-38588 part 1. + class Y: + def __eq__(self, other): + dict_d.clear() + return True + + dict_c = {0: Y()} + dict_d = {0: set()} + self.assertTrue(dict_c == dict_d) + def test_fromkeys_operator_modifying_dict_operand(self): # test fix for seg fault reported in issue 27945 part 4a. class X(int): diff --git a/Lib/test/test_list.py b/Lib/test/test_list.py index ece4598e4eaf2..553ac8c1cef81 100644 --- a/Lib/test/test_list.py +++ b/Lib/test/test_list.py @@ -162,6 +162,31 @@ class L(list): pass with self.assertRaises(TypeError): (3,) + L([1,2]) + def test_equal_operator_modifying_operand(self): + # test fix for seg fault reported in bpo-38588 part 2. + class X: + def __eq__(self,other) : + list2.clear() + return NotImplemented + + class Y: + def __eq__(self, other): + list1.clear() + return NotImplemented + + class Z: + def __eq__(self, other): + list3.clear() + return NotImplemented + + list1 = [X()] + list2 = [Y()] + self.assertTrue(list1 == list2) + + list3 = [Z()] + list4 = [1] + self.assertFalse(list3 == list4) + def test_count_index_remove_crashes(self): # bpo-38610: The count(), index(), and remove() methods were not # holding strong references to list elements while calling diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-12-29-19-13-54.bpo-38588.pgXnNS.rst b/Misc/NEWS.d/next/Core and Builtins/2019-12-29-19-13-54.bpo-38588.pgXnNS.rst new file mode 100644 index 0000000000000..0b81085a89d25 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2019-12-29-19-13-54.bpo-38588.pgXnNS.rst @@ -0,0 +1,2 @@ +Fix possible crashes in dict and list when calling +:c:func:`PyObject_RichCompareBool`. diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 9437448849007..3f00002a8991a 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2677,9 +2677,11 @@ dict_equal(PyDictObject *a, PyDictObject *b) return -1; return 0; } + Py_INCREF(bval); cmp = PyObject_RichCompareBool(aval, bval, Py_EQ); Py_DECREF(key); Py_DECREF(aval); + Py_DECREF(bval); if (cmp <= 0) /* error or not equal */ return cmp; } diff --git a/Objects/listobject.c b/Objects/listobject.c index 724f25677a16e..d622da9e0dbf3 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2615,8 +2615,18 @@ list_richcompare(PyObject *v, PyObject *w, int op) /* Search for the first index where items are different */ for (i = 0; i < Py_SIZE(vl) && i < Py_SIZE(wl); i++) { + PyObject *vitem = vl->ob_item[i]; + PyObject *witem = wl->ob_item[i]; + if (vitem == witem) { + continue; + } + + Py_INCREF(vitem); + Py_INCREF(witem); int k = PyObject_RichCompareBool(vl->ob_item[i], wl->ob_item[i], Py_EQ); + Py_DECREF(vitem); + Py_DECREF(witem); if (k < 0) return NULL; if (!k)

1 0

closes bpo-37446: resolve undefined behavior in Python/hamt.c (GH-17727)
by Miss Islington (bot) Dec. 31, 2019

Dec. 31, 2019

https://github.com/python/cpython/commit/a278ae19b4daa1deb11e2a8eed38838027… commit: a278ae19b4daa1deb11e2a8eed38838027e90ece branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-12-30T18:51:18-08:00 summary: closes bpo-37446: resolve undefined behavior in Python/hamt.c (GH-17727) (cherry picked from commit d0c92e81aa2171228a23cb2bed36f7dab975257d) Co-authored-by: Batuhan Taşkaya <47358913+isidentical(a)users.noreply.github.com> files: M Python/hamt.c diff --git a/Python/hamt.c b/Python/hamt.c index 38412596a37b0..5efc8d7fabe8e 100644 --- a/Python/hamt.c +++ b/Python/hamt.c @@ -1864,7 +1864,7 @@ hamt_node_array_without(PyHamtNode_Array *self, continue; } - bitmap |= 1 << i; + bitmap |= 1U << i; if (IS_BITMAP_NODE(node)) { PyHamtNode_Bitmap *child = (PyHamtNode_Bitmap *)node;

1 0

closes bpo-37446: resolve undefined behavior in Python/hamt.c (GH-17727)
by Benjamin Peterson Dec. 31, 2019

Dec. 31, 2019

https://github.com/python/cpython/commit/d0c92e81aa2171228a23cb2bed36f7dab9… commit: d0c92e81aa2171228a23cb2bed36f7dab975257d branch: master author: Batuhan Taşkaya <47358913+isidentical(a)users.noreply.github.com> committer: Benjamin Peterson <benjamin(a)python.org> date: 2019-12-30T18:31:52-08:00 summary: closes bpo-37446: resolve undefined behavior in Python/hamt.c (GH-17727) files: M Python/hamt.c diff --git a/Python/hamt.c b/Python/hamt.c index ea659c800fc46..f5586eec5b076 100644 --- a/Python/hamt.c +++ b/Python/hamt.c @@ -1864,7 +1864,7 @@ hamt_node_array_without(PyHamtNode_Array *self, continue; } - bitmap |= 1 << i; + bitmap |= 1U << i; if (IS_BITMAP_NODE(node)) { PyHamtNode_Bitmap *child = (PyHamtNode_Bitmap *)node;

1 0

bpo-38588: Optimize list comparison. (GH-17766)
by Inada Naoki Dec. 31, 2019

Dec. 31, 2019

https://github.com/python/cpython/commit/dfef986f12dd92bd6434117bba0db3cbb4… commit: dfef986f12dd92bd6434117bba0db3cbb4e65243 branch: master author: Inada Naoki <songofacandy(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-12-31T10:58:37+09:00 summary: bpo-38588: Optimize list comparison. (GH-17766) Mitigate performance regression of the list comparison caused by 2d5bf56. files: M Objects/listobject.c diff --git a/Objects/listobject.c b/Objects/listobject.c index abe2604573f95..bc8425cae63e1 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2664,6 +2664,9 @@ list_richcompare(PyObject *v, PyObject *w, int op) for (i = 0; i < Py_SIZE(vl) && i < Py_SIZE(wl); i++) { PyObject *vitem = vl->ob_item[i]; PyObject *witem = wl->ob_item[i]; + if (vitem == witem) { + continue; + } Py_INCREF(vitem); Py_INCREF(witem);

1 0