Mailman 3 April 2019 - Python-checkins

bpo-36546: More tests: type preservation and equal inputs (#13000)
by Raymond Hettinger April 29, 2019

April 29, 2019

https://github.com/python/cpython/commit/db81ba1393af40ba920a996651e2c11943… commit: db81ba1393af40ba920a996651e2c11943c3663c branch: master author: Raymond Hettinger <rhettinger(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-04-28T21:31:55-07:00 summary: bpo-36546: More tests: type preservation and equal inputs (#13000) files: M Lib/test/test_statistics.py diff --git a/Lib/test/test_statistics.py b/Lib/test/test_statistics.py index c988d7fd8be7..… [View More]0a967055f0fe 100644 --- a/Lib/test/test_statistics.py +++ b/Lib/test/test_statistics.py @@ -2153,12 +2153,11 @@ def test_specific_cases(self): ]: self.assertEqual(expected, quantiles(data, n=n)) self.assertEqual(len(quantiles(data, n=n)), n - 1) - self.assertEqual(list(map(float, expected)), - quantiles(map(Decimal, data), n=n)) - self.assertEqual(list(map(Decimal, expected)), - quantiles(map(Decimal, data), n=n)) - self.assertEqual(list(map(Fraction, expected)), - quantiles(map(Fraction, data), n=n)) + # Preserve datatype when possible + for datatype in (float, Decimal, Fraction): + result = quantiles(map(datatype, data), n=n) + self.assertTrue(all(type(x) == datatype) for x in result) + self.assertEqual(result, list(map(datatype, expected))) # Invariant under tranlation and scaling def f(x): return 3.5 * x - 1234.675 @@ -2199,12 +2198,11 @@ def test_specific_cases_inclusive(self): ]: self.assertEqual(expected, quantiles(data, n=n, method="inclusive")) self.assertEqual(len(quantiles(data, n=n, method="inclusive")), n - 1) - self.assertEqual(list(map(float, expected)), - quantiles(map(Decimal, data), n=n, method="inclusive")) - self.assertEqual(list(map(Decimal, expected)), - quantiles(map(Decimal, data), n=n, method="inclusive")) - self.assertEqual(list(map(Fraction, expected)), - quantiles(map(Fraction, data), n=n, method="inclusive")) + # Preserve datatype when possible + for datatype in (float, Decimal, Fraction): + result = quantiles(map(datatype, data), n=n, method="inclusive") + self.assertTrue(all(type(x) == datatype) for x in result) + self.assertEqual(result, list(map(datatype, expected))) # Invariant under tranlation and scaling def f(x): return 3.5 * x - 1234.675 @@ -2222,6 +2220,14 @@ def f(x): self.assertTrue(all(math.isclose(e, a, abs_tol=0.0001) for e, a in zip(expected, actual))) + def test_equal_inputs(self): + quantiles = statistics.quantiles + for n in range(2, 10): + data = [10.0] * n + self.assertEqual(quantiles(data), [10.0, 10.0, 10.0]) + self.assertEqual(quantiles(data, method='inclusive'), + [10.0, 10.0, 10.0]) + def test_equal_sized_groups(self): quantiles = statistics.quantiles total = 10_000 [View Less]

1 0

bpo-36729: Delete unused text variable on tests. (GH-12959)
by Serhiy Storchaka April 29, 2019

April 29, 2019

https://github.com/python/cpython/commit/86f0c8215c2fdaeef58d185ff00b854a45… commit: 86f0c8215c2fdaeef58d185ff00b854a45971f84 branch: master author: Emmanuel Arias <emmanuelarias30(a)gmail.com> committer: Serhiy Storchaka <storchaka(a)gmail.com> date: 2019-04-29T05:24:24+03:00 summary: bpo-36729: Delete unused text variable on tests. (GH-12959) files: M Lib/test/test_pydoc.py diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py index c2bd9f3012c1..67c6c5d42d48 100644 --- … [View More]

1 0

bpo-36745: Fix a possible reference leak in PyObject_SetAttr() (GH-12993)
by Miss Islington (bot) April 28, 2019

April 28, 2019

https://github.com/python/cpython/commit/896c6357f3267fe5dc5a33979f8cf46b0a… commit: 896c6357f3267fe5dc5a33979f8cf46b0a74cfee branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-04-28T06:17:40-07:00 summary: bpo-36745: Fix a possible reference leak in PyObject_SetAttr() (GH-12993) https://bugs.python.org/issue36745 (cherry picked from commit e0dcb85b7d64153d1741698c04a6736c9669603a) Co-… [View More]

1 0

bpo-36745: Fix a possible reference leak in PyObject_SetAttr() (GH-12993)
by Miss Islington (bot) April 28, 2019

April 28, 2019

https://github.com/python/cpython/commit/e0dcb85b7d64153d1741698c04a6736c96… commit: e0dcb85b7d64153d1741698c04a6736c9669603a branch: master author: Zackery Spytz <zspytz(a)gmail.com> committer: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> date: 2019-04-28T05:58:52-07:00 summary: bpo-36745: Fix a possible reference leak in PyObject_SetAttr() (GH-12993) https://bugs.python.org/issue36745 files: M Objects/object.c diff --git a/Objects/object.c b/… [View More]

1 0

bpo-36715: Add usage note for dict.fromkeys() (GH-12974)
by Raymond Hettinger April 28, 2019

April 28, 2019

https://github.com/python/cpython/commit/da63b321f63b697f75e7ab2f88f55d907f… commit: da63b321f63b697f75e7ab2f88f55d907f56c187 branch: master author: Raymond Hettinger <rhettinger(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-04-28T00:22:36-07:00 summary: bpo-36715: Add usage note for dict.fromkeys() (GH-12974) files: M Doc/library/stdtypes.rst diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index aeecdbb24a57..0a6bb149075f 100644 … [View More]

1 0

bpo-32424: Improve test coverage for xml.etree.ElementTree (GH-12891)
by Stefan Behnel April 28, 2019

April 28, 2019

https://github.com/python/cpython/commit/50fed0b64faa3053300008ef5607b570fe… commit: 50fed0b64faa3053300008ef5607b570fe209de6 branch: master author: Gordon P. Hemsley <me(a)gphemsley.org> committer: Stefan Behnel <stefan_ml(a)behnel.de> date: 2019-04-28T06:41:43+02:00 summary: bpo-32424: Improve test coverage for xml.etree.ElementTree (GH-12891) * Fix typo in test_cyclic_gc subtest * Improve test coverage for xml.etree.ElementTree files: A Misc/NEWS.d/next/Tests/2019-04-21-17-53-… [View More]50.bpo-32424.Q4rBmn.rst A Misc/NEWS.d/next/Tests/2019-04-21-17-55-18.bpo-32424.yDy49h.rst M Lib/test/test_xml_etree.py M Misc/ACKS diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py index 14ce32af8026..e0d2cb7b9952 100644 --- a/Lib/test/test_xml_etree.py +++ b/Lib/test/test_xml_etree.py @@ -9,6 +9,7 @@ import functools import html import io +import itertools import locale import operator import pickle @@ -1929,6 +1930,88 @@ def test_expat224_utf8_bug_file(self): class BasicElementTest(ElementTestCase, unittest.TestCase): + + def test___init__(self): + tag = "foo" + attrib = { "zix": "wyp" } + + element_foo = ET.Element(tag, attrib) + + # traits of an element + self.assertIsInstance(element_foo, ET.Element) + self.assertIn("tag", dir(element_foo)) + self.assertIn("attrib", dir(element_foo)) + self.assertIn("text", dir(element_foo)) + self.assertIn("tail", dir(element_foo)) + + # string attributes have expected values + self.assertEqual(element_foo.tag, tag) + self.assertIsNone(element_foo.text) + self.assertIsNone(element_foo.tail) + + # attrib is a copy + self.assertIsNot(element_foo.attrib, attrib) + self.assertEqual(element_foo.attrib, attrib) + + # attrib isn't linked + attrib["bar"] = "baz" + self.assertIsNot(element_foo.attrib, attrib) + self.assertNotEqual(element_foo.attrib, attrib) + + def test___copy__(self): + element_foo = ET.Element("foo", { "zix": "wyp" }) + element_foo.append(ET.Element("bar", { "baz": "qix" })) + + element_foo2 = copy.copy(element_foo) + + # elements are not the same + self.assertIsNot(element_foo2, element_foo) + + # string attributes are equal + self.assertEqual(element_foo2.tag, element_foo.tag) + self.assertEqual(element_foo2.text, element_foo.text) + self.assertEqual(element_foo2.tail, element_foo.tail) + + # number of children is the same + self.assertEqual(len(element_foo2), len(element_foo)) + + # children are the same + for (child1, child2) in itertools.zip_longest(element_foo, element_foo2): + self.assertIs(child1, child2) + + # attrib is a copy + self.assertEqual(element_foo2.attrib, element_foo.attrib) + + def test___deepcopy__(self): + element_foo = ET.Element("foo", { "zix": "wyp" }) + element_foo.append(ET.Element("bar", { "baz": "qix" })) + + element_foo2 = copy.deepcopy(element_foo) + + # elements are not the same + self.assertIsNot(element_foo2, element_foo) + + # string attributes are equal + self.assertEqual(element_foo2.tag, element_foo.tag) + self.assertEqual(element_foo2.text, element_foo.text) + self.assertEqual(element_foo2.tail, element_foo.tail) + + # number of children is the same + self.assertEqual(len(element_foo2), len(element_foo)) + + # children are not the same + for (child1, child2) in itertools.zip_longest(element_foo, element_foo2): + self.assertIsNot(child1, child2) + + # attrib is a copy + self.assertIsNot(element_foo2.attrib, element_foo.attrib) + self.assertEqual(element_foo2.attrib, element_foo.attrib) + + # attrib isn't linked + element_foo.attrib["bar"] = "baz" + self.assertIsNot(element_foo2.attrib, element_foo.attrib) + self.assertNotEqual(element_foo2.attrib, element_foo.attrib) + def test_augmentation_type_errors(self): e = ET.Element('joe') self.assertRaises(TypeError, e.append, 'b') @@ -1984,9 +2067,9 @@ class Dummy: e1 = ET.Element('e1') e2 = ET.Element('e2') e3 = ET.Element('e3') - e1.append(e2) - e2.append(e2) e3.append(e1) + e2.append(e3) + e1.append(e2) wref = weakref.ref(e1) del e1, e2, e3 gc_collect() diff --git a/Misc/ACKS b/Misc/ACKS index 393ea205ac1d..300e78894078 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -647,6 +647,7 @@ Christian Heimes Thomas Heller Malte Helmert Lance Finn Helsten +Gordon P. Hemsley Jonathan Hendry Nathan Henrie Michael Henry diff --git a/Misc/NEWS.d/next/Tests/2019-04-21-17-53-50.bpo-32424.Q4rBmn.rst b/Misc/NEWS.d/next/Tests/2019-04-21-17-53-50.bpo-32424.Q4rBmn.rst new file mode 100644 index 000000000000..f057d7e7730e --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-04-21-17-53-50.bpo-32424.Q4rBmn.rst @@ -0,0 +1,2 @@ +Fix typo in test_cyclic_gc() test for xml.etree.ElementTree. Patch by Gordon +P. Hemsley. diff --git a/Misc/NEWS.d/next/Tests/2019-04-21-17-55-18.bpo-32424.yDy49h.rst b/Misc/NEWS.d/next/Tests/2019-04-21-17-55-18.bpo-32424.yDy49h.rst new file mode 100644 index 000000000000..bb0839f7a318 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2019-04-21-17-55-18.bpo-32424.yDy49h.rst @@ -0,0 +1 @@ +Improve test coverage for xml.etree.ElementTree. Patch by Gordon P. Hemsley. [View Less]

1 0

Zdravstvuyte! Vas interesuyut kliyentskiye bazy dannykh?
by python-checkins＠python.org April 27, 2019

April 27, 2019

Zdravstvuyte! Vas interesuyut kliyentskiye bazy dannykh?

1 0

bpo-2091: Fix typo in exception message (GH-12987)
by Berker Peksag April 27, 2019

April 27, 2019

https://github.com/python/cpython/commit/f5972cc0c9a8e3315207e2d67534f330d6… commit: f5972cc0c9a8e3315207e2d67534f330d619af4e branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: Berker Peksag <berker.peksag(a)gmail.com> date: 2019-04-27T23:39:06+03:00 summary: bpo-2091: Fix typo in exception message (GH-12987) (cherry picked from commit 21a9ba1992775b5a833da28bfa0a9f028d1b6761) Co-authored-by: Berker Peksag <berker.peksag(a)… [View More]

1 0

bpo-2091: Fix typo in exception message (GH-12987)
by Berker Peksag April 27, 2019

April 27, 2019

https://github.com/python/cpython/commit/21a9ba1992775b5a833da28bfa0a9f028d… commit: 21a9ba1992775b5a833da28bfa0a9f028d1b6761 branch: master author: Berker Peksag <berker.peksag(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2019-04-27T22:40:45+03:00 summary: bpo-2091: Fix typo in exception message (GH-12987) files: M Modules/_io/_iomodule.c diff --git a/Modules/_io/_iomodule.c b/Modules/_io/_iomodule.c index 965c4846bdb8..d482142d0804 100644 --- a/Modules/_io/… [View More]

1 0

bpo-36025: Fix PyDate_FromTimestamp API (GH-11922)
by Berker Peksag April 27, 2019

April 27, 2019

https://github.com/python/cpython/commit/4d8c8c0ad6163c24136d3419eb04f310b3… commit: 4d8c8c0ad6163c24136d3419eb04f310b31f7e64 branch: master author: Paul Ganssle <pganssle(a)users.noreply.github.com> committer: Berker Peksag <berker.peksag(a)gmail.com> date: 2019-04-27T22:39:40+03:00 summary: bpo-36025: Fix PyDate_FromTimestamp API (GH-11922) In the process of converting the date.fromtimestamp function to use argument clinic in GH-8535, the C API for PyDate_FromTimestamp was … [View More]inadvertently changed to expect a timestamp object rather than an argument tuple. This PR fixes this backwards-incompatible change by adding a new wrapper function for the C API function that unwraps the argument tuple and passes it to the underlying function. This PR also adds tests for both PyDate_FromTimestamp and PyDateTime_FromTimestamp to prevent any further regressions. files: A Misc/NEWS.d/next/C API/2019-02-19-08-23-42.bpo-36025.tnwylQ.rst M Lib/test/datetimetester.py M Modules/_datetimemodule.c M Modules/_testcapimodule.c diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py index 715f0ea6b40d..617bf9a25587 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py @@ -5942,6 +5942,41 @@ class TZInfoSubclass(tzinfo): with self.subTest(arg=arg, exact=exact): self.assertFalse(is_tzinfo(arg, exact)) + def test_date_from_timestamp(self): + ts = datetime(1995, 4, 12).timestamp() + + for macro in [0, 1]: + with self.subTest(macro=macro): + d = _testcapi.get_date_fromtimestamp(int(ts), macro) + + self.assertEqual(d, date(1995, 4, 12)) + + def test_datetime_from_timestamp(self): + ts0 = datetime(1995, 4, 12).timestamp() + ts1 = datetime(1995, 4, 12, 12, 30).timestamp() + + cases = [ + ((1995, 4, 12), None, False), + ((1995, 4, 12), None, True), + ((1995, 4, 12), timezone(timedelta(hours=1)), True), + ((1995, 4, 12, 14, 30), None, False), + ((1995, 4, 12, 14, 30), None, True), + ((1995, 4, 12, 14, 30), timezone(timedelta(hours=1)), True), + ] + + from_timestamp = _testcapi.get_datetime_fromtimestamp + for case in cases: + for macro in [0, 1]: + with self.subTest(case=case, macro=macro): + dtup, tzinfo, usetz = case + dt_orig = datetime(*dtup, tzinfo=tzinfo) + ts = int(dt_orig.timestamp()) + + dt_rt = from_timestamp(ts, tzinfo, usetz, macro) + + self.assertEqual(dt_orig, dt_rt) + + def load_tests(loader, standard_tests, pattern): standard_tests.addTest(ZoneInfoCompleteTest()) return standard_tests diff --git a/Misc/NEWS.d/next/C API/2019-02-19-08-23-42.bpo-36025.tnwylQ.rst b/Misc/NEWS.d/next/C API/2019-02-19-08-23-42.bpo-36025.tnwylQ.rst new file mode 100644 index 000000000000..b00a33d109c2 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2019-02-19-08-23-42.bpo-36025.tnwylQ.rst @@ -0,0 +1,5 @@ +Fixed an accidental change to the datetime C API where the arguments to the +:c:func:`PyDate_FromTimestamp` function were incorrectly interpreted as a +single timestamp rather than an arguments tuple, which causes existing code to +start raising :exc:`TypeError`. The backwards-incompatible change was only +present in alpha releases of Python 3.8. Patch by Paul Ganssle. diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index c1557b5e6f49..b3954c98ee7d 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -2921,6 +2921,23 @@ datetime_date_fromtimestamp(PyTypeObject *type, PyObject *timestamp) return date_fromtimestamp((PyObject *) type, timestamp); } +/* bpo-36025: This is a wrapper for API compatibility with the public C API, + * which expects a function that takes an *args tuple, whereas the argument + * clinic generates code that takes METH_O. + */ +static PyObject * +datetime_date_fromtimestamp_capi(PyObject *cls, PyObject *args) +{ + PyObject *timestamp; + PyObject *result = NULL; + + if (PyArg_UnpackTuple(args, "fromtimestamp", 1, 1, &timestamp)) { + result = date_fromtimestamp(cls, timestamp); + } + + return result; +} + /* Return new date from proleptic Gregorian ordinal. Raises ValueError if * the ordinal is out of range. */ @@ -6275,7 +6292,7 @@ static PyDateTime_CAPI CAPI = { new_delta_ex, new_timezone, datetime_fromtimestamp, - date_fromtimestamp, + datetime_date_fromtimestamp_capi, new_datetime_ex2, new_time_ex2 }; diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 6f4eb53d7e92..c52e34996385 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -2340,6 +2340,71 @@ get_timezone_utc_capi(PyObject* self, PyObject *args) { } } +static PyObject * +get_date_fromtimestamp(PyObject* self, PyObject *args) +{ + PyObject *tsargs = NULL, *ts = NULL, *rv = NULL; + int macro = 0; + + if (!PyArg_ParseTuple(args, "O|p", &ts, &macro)) { + return NULL; + } + + // Construct the argument tuple + if ((tsargs = PyTuple_Pack(1, ts)) == NULL) { + return NULL; + } + + // Pass along to the API function + if (macro) { + rv = PyDate_FromTimestamp(tsargs); + } + else { + rv = PyDateTimeAPI->Date_FromTimestamp( + (PyObject *)PyDateTimeAPI->DateType, tsargs + ); + } + + Py_DECREF(tsargs); + return rv; +} + +static PyObject * +get_datetime_fromtimestamp(PyObject* self, PyObject *args) +{ + int macro = 0; + int usetz = 0; + PyObject *tsargs = NULL, *ts = NULL, *tzinfo = Py_None, *rv = NULL; + if (!PyArg_ParseTuple(args, "OO|pp", &ts, &tzinfo, &usetz, &macro)) { + return NULL; + } + + // Construct the argument tuple + if (usetz) { + tsargs = PyTuple_Pack(2, ts, tzinfo); + } + else { + tsargs = PyTuple_Pack(1, ts); + } + + if (tsargs == NULL) { + return NULL; + } + + // Pass along to the API function + if (macro) { + rv = PyDateTime_FromTimestamp(tsargs); + } + else { + rv = PyDateTimeAPI->DateTime_FromTimestamp( + (PyObject *)PyDateTimeAPI->DateTimeType, tsargs, NULL + ); + } + + Py_DECREF(tsargs); + return rv; +} + /* test_thread_state spawns a thread of its own, and that thread releases * `thread_done` when it's finished. The driver code has to know when the @@ -4769,7 +4834,9 @@ static PyMethodDef TestMethods[] = { {"datetime_check_tzinfo", datetime_check_tzinfo, METH_VARARGS}, {"make_timezones_capi", make_timezones_capi, METH_NOARGS}, {"get_timezones_offset_zero", get_timezones_offset_zero, METH_NOARGS}, - {"get_timezone_utc_capi", get_timezone_utc_capi, METH_VARARGS}, + {"get_timezone_utc_capi", get_timezone_utc_capi, METH_VARARGS}, + {"get_date_fromtimestamp", get_date_fromtimestamp, METH_VARARGS}, + {"get_datetime_fromtimestamp", get_datetime_fromtimestamp, METH_VARARGS}, {"test_list_api", test_list_api, METH_NOARGS}, {"test_dict_iteration", test_dict_iteration, METH_NOARGS}, {"dict_getitem_knownhash", dict_getitem_knownhash, METH_VARARGS}, [View Less]

1 0