Mailman 3 June 2021 - Python-checkins

Update nonstandard variable names (GH-26540)
by rhettinger June 4, 2021

June 4, 2021

https://github.com/python/cpython/commit/3668e118f77c4e53167b75352c53674e75… commit: 3668e118f77c4e53167b75352c53674e758e1877 branch: main author: Raymond Hettinger <rhettinger(a)users.noreply.github.com> committer: rhettinger <rhettinger(a)users.noreply.github.com> date: 2021-06-04T16:28:31-07:00 summary: Update nonstandard variable names (GH-26540) files: M Lib/statistics.py diff --git a/Lib/statistics.py b/Lib/statistics.py index 26009b0cbe430..1314095332a15 100644 --- a/Lib/statistics.py +++ b/Lib/statistics.py @@ -924,10 +924,10 @@ def correlation(x, y, /): xbar = fsum(x) / n ybar = fsum(y) / n sxy = fsum((xi - xbar) * (yi - ybar) for xi, yi in zip(x, y)) - s2x = fsum((xi - xbar) ** 2.0 for xi in x) - s2y = fsum((yi - ybar) ** 2.0 for yi in y) + sxx = fsum((xi - xbar) ** 2.0 for xi in x) + syy = fsum((yi - ybar) ** 2.0 for yi in y) try: - return sxy / sqrt(s2x * s2y) + return sxy / sqrt(sxx * syy) except ZeroDivisionError: raise StatisticsError('at least one of the inputs is constant') @@ -968,9 +968,9 @@ def linear_regression(x, y, /): xbar = fsum(x) / n ybar = fsum(y) / n sxy = fsum((xi - xbar) * (yi - ybar) for xi, yi in zip(x, y)) - s2x = fsum((xi - xbar) ** 2.0 for xi in x) + sxx = fsum((xi - xbar) ** 2.0 for xi in x) try: - slope = sxy / s2x # equivalent to: covariance(x, y) / variance(x) + slope = sxy / sxx # equivalent to: covariance(x, y) / variance(x) except ZeroDivisionError: raise StatisticsError('x is constant') intercept = ybar - slope * xbar

1 0

bpo-44279: revert 'exceptions are raised' back to 'exceptions occur' (GH-26492) (GH-26538)
by iritkatriel June 4, 2021

June 4, 2021

https://github.com/python/cpython/commit/1065ba66b535b786d6dc5f7d912c6486d9… commit: 1065ba66b535b786d6dc5f7d912c6486d9a834ae branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2021-06-04T23:10:07+01:00 summary: bpo-44279: revert 'exceptions are raised' back to 'exceptions occur' (GH-26492) (GH-26538) (cherry picked from commit dda9ecbfece28aad7b8ba7eaf7951dd9816f78b1) Co-authored-by: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> files: M Doc/library/contextlib.rst diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst index 98df29277e3b7d..c9065be32e6386 100644 --- a/Doc/library/contextlib.rst +++ b/Doc/library/contextlib.rst @@ -267,7 +267,7 @@ Functions and classes provided: .. function:: suppress(*exceptions) Return a context manager that suppresses any of the specified exceptions - if they are raised in the body of a :keyword:`!with` statement and then + if they occur in the body of a :keyword:`!with` statement and then resumes execution with the first statement following the end of the :keyword:`!with` statement.

1 0

bpo-44279: revert 'exceptions are raised' back to 'exceptions occur' (GH-26492) (GH-26539)
by iritkatriel June 4, 2021

June 4, 2021

https://github.com/python/cpython/commit/ea298e1e33eb03b2b4ea2f4556e59b11e3… commit: ea298e1e33eb03b2b4ea2f4556e59b11e3bf240f branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2021-06-04T23:09:45+01:00 summary: bpo-44279: revert 'exceptions are raised' back to 'exceptions occur' (GH-26492) (GH-26539) (cherry picked from commit dda9ecbfece28aad7b8ba7eaf7951dd9816f78b1) Co-authored-by: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> files: M Doc/library/contextlib.rst diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst index cfc37a63aedbf3..f87ee210550cc6 100644 --- a/Doc/library/contextlib.rst +++ b/Doc/library/contextlib.rst @@ -191,7 +191,7 @@ Functions and classes provided: .. function:: suppress(*exceptions) Return a context manager that suppresses any of the specified exceptions - if they are raised in the body of a :keyword:`!with` statement and then + if they occur in the body of a :keyword:`!with` statement and then resumes execution with the first statement following the end of the :keyword:`!with` statement.

1 0

bpo-44279: revert 'exceptions are raised' back to 'exceptions occur' (GH-26492)
by iritkatriel June 4, 2021

June 4, 2021

https://github.com/python/cpython/commit/dda9ecbfece28aad7b8ba7eaf7951dd981… commit: dda9ecbfece28aad7b8ba7eaf7951dd9816f78b1 branch: main author: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2021-06-04T23:07:57+01:00 summary: bpo-44279: revert 'exceptions are raised' back to 'exceptions occur' (GH-26492) files: M Doc/library/contextlib.rst diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst index 98df29277e3b7..c9065be32e638 100644 --- a/Doc/library/contextlib.rst +++ b/Doc/library/contextlib.rst @@ -267,7 +267,7 @@ Functions and classes provided: .. function:: suppress(*exceptions) Return a context manager that suppresses any of the specified exceptions - if they are raised in the body of a :keyword:`!with` statement and then + if they occur in the body of a :keyword:`!with` statement and then resumes execution with the first statement following the end of the :keyword:`!with` statement.

1 0

Align comment for better readability. (GH-26192)
by nanjekyejoannah June 4, 2021

June 4, 2021

https://github.com/python/cpython/commit/2780df478129c4f1042df2868b6adf2bf5… commit: 2780df478129c4f1042df2868b6adf2bf507cd6e branch: main author: Kazantcev Andrey <45011689+heckad(a)users.noreply.github.com> committer: nanjekyejoannah <33177550+nanjekyejoannah(a)users.noreply.github.com> date: 2021-06-04T18:41:23-03:00 summary: Align comment for better readability. (GH-26192) files: M Modules/_ctypes/_ctypes.c diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 5f8a723f6373ae..b31e912933450a 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -24,16 +24,16 @@ Name methods, members, getsets ============================================================================== PyCStructType_Type __new__(), from_address(), __mul__(), from_param() -UnionType_Type __new__(), from_address(), __mul__(), from_param() -PyCPointerType_Type __new__(), from_address(), __mul__(), from_param(), set_type() +UnionType_Type __new__(), from_address(), __mul__(), from_param() +PyCPointerType_Type __new__(), from_address(), __mul__(), from_param(), set_type() PyCArrayType_Type __new__(), from_address(), __mul__(), from_param() PyCSimpleType_Type __new__(), from_address(), __mul__(), from_param() PyCData_Type - Struct_Type __new__(), __init__() + Struct_Type __new__(), __init__() PyCPointer_Type __new__(), __init__(), _as_parameter_, contents - PyCArray_Type __new__(), __init__(), _as_parameter_, __get/setitem__(), __len__() - Simple_Type __new__(), __init__(), _as_parameter_ + PyCArray_Type __new__(), __init__(), _as_parameter_, __get/setitem__(), __len__() + Simple_Type __new__(), __init__(), _as_parameter_ PyCField_Type PyCStgDict_Type

1 0

bpo-44315: Remove unused connection argument from pysqlite_step() (GH-26535)
by pablogsal June 4, 2021

June 4, 2021

https://github.com/python/cpython/commit/7459208de194db6222d7e3aa301c2b831d… commit: 7459208de194db6222d7e3aa301c2b831dbe566d branch: main author: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-06-04T21:42:20+01:00 summary: bpo-44315: Remove unused connection argument from pysqlite_step() (GH-26535) files: M Modules/_sqlite/connection.c M Modules/_sqlite/cursor.c M Modules/_sqlite/util.c M Modules/_sqlite/util.h diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index e310dc3b43c5b9..c2f3bc0f201250 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -432,7 +432,7 @@ pysqlite_connection_commit_impl(pysqlite_Connection *self) goto error; } - rc = pysqlite_step(statement, self); + rc = pysqlite_step(statement); if (rc != SQLITE_DONE) { _pysqlite_seterror(self->db); } @@ -482,7 +482,7 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self) goto error; } - rc = pysqlite_step(statement, self); + rc = pysqlite_step(statement); if (rc != SQLITE_DONE) { _pysqlite_seterror(self->db); } diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index 7f33b3deb30f7b..c2e8de5b6c0f00 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -568,7 +568,7 @@ _pysqlite_query_execute(pysqlite_Cursor* self, int multiple, PyObject* operation goto error; } - rc = pysqlite_step(self->statement->st, self->connection); + rc = pysqlite_step(self->statement->st); if (rc != SQLITE_DONE && rc != SQLITE_ROW) { if (PyErr_Occurred()) { /* there was an error that occurred in a user-defined callback */ @@ -773,7 +773,7 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj) /* execute statement, and ignore results of SELECT statements */ do { - rc = pysqlite_step(statement, self->connection); + rc = pysqlite_step(statement); if (PyErr_Occurred()) { (void)sqlite3_finalize(statement); goto error; @@ -847,7 +847,7 @@ pysqlite_cursor_iternext(pysqlite_Cursor *self) } if (self->statement) { - rc = pysqlite_step(self->statement->st, self->connection); + rc = pysqlite_step(self->statement->st); if (PyErr_Occurred()) { (void)pysqlite_statement_reset(self->statement); Py_DECREF(next_row); diff --git a/Modules/_sqlite/util.c b/Modules/_sqlite/util.c index 3676935b9e9beb..2de819e9e85293 100644 --- a/Modules/_sqlite/util.c +++ b/Modules/_sqlite/util.c @@ -24,7 +24,8 @@ #include "module.h" #include "connection.h" -int pysqlite_step(sqlite3_stmt* statement, pysqlite_Connection* connection) +int +pysqlite_step(sqlite3_stmt *statement) { int rc; diff --git a/Modules/_sqlite/util.h b/Modules/_sqlite/util.h index 82e58139d02f9c..f308f03f71f440 100644 --- a/Modules/_sqlite/util.h +++ b/Modules/_sqlite/util.h @@ -29,7 +29,7 @@ #include "sqlite3.h" #include "connection.h" -int pysqlite_step(sqlite3_stmt* statement, pysqlite_Connection* connection); +int pysqlite_step(sqlite3_stmt *statement); /** * Checks the SQLite error code and sets the appropriate DB-API exception.

1 0

bpo-43853: Handle sqlite3_value_text() errors (GH-25422)
by miss-islington June 4, 2021

June 4, 2021

https://github.com/python/cpython/commit/067d6d46575b5cf30bbf7c812defee1517… commit: 067d6d46575b5cf30bbf7c812defee1517106a34 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-06-04T11:54:39-07:00 summary: bpo-43853: Handle sqlite3_value_text() errors (GH-25422) (cherry picked from commit 006fd869e4798b68e266f5de89c83ddb531a756b) Co-authored-by: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> files: A Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst M Lib/sqlite3/test/userfunctions.py M Modules/_sqlite/connection.c diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py index 148d9f596a91c8..6f57d1911b24d8 100644 --- a/Lib/sqlite3/test/userfunctions.py +++ b/Lib/sqlite3/test/userfunctions.py @@ -236,9 +236,11 @@ def test_func_exception(self): def test_param_string(self): cur = self.con.cursor() - cur.execute("select isstring(?)", ("foo",)) - val = cur.fetchone()[0] - self.assertEqual(val, 1) + for text in ["foo", str()]: + with self.subTest(text=text): + cur.execute("select isstring(?)", (text,)) + val = cur.fetchone()[0] + self.assertEqual(val, 1) def test_param_int(self): cur = self.con.cursor() @@ -391,9 +393,9 @@ def test_aggr_exception_in_finalize(self): def test_aggr_check_param_str(self): cur = self.con.cursor() - cur.execute("select checkType('str', ?)", ("foo",)) + cur.execute("select checkTypes('str', ?, ?)", ("foo", str())) val = cur.fetchone()[0] - self.assertEqual(val, 1) + self.assertEqual(val, 2) def test_aggr_check_param_int(self): cur = self.con.cursor() diff --git a/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst b/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst new file mode 100644 index 00000000000000..c5c3a0ae83c7f4 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst @@ -0,0 +1,3 @@ +Improve :mod:`sqlite3` error handling: ``sqlite3_value_text()`` errors that +set ``SQLITE_NOMEM`` now raise :exc:`MemoryError`. Patch by Erlend E. +Aasland. diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index e124b17782dfe5..fccffabc4b2a0b 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -576,7 +576,6 @@ _pysqlite_build_py_params(sqlite3_context *context, int argc, int i; sqlite3_value* cur_value; PyObject* cur_py_value; - const char* val_str; args = PyTuple_New(argc); if (!args) { @@ -592,15 +591,19 @@ _pysqlite_build_py_params(sqlite3_context *context, int argc, case SQLITE_FLOAT: cur_py_value = PyFloat_FromDouble(sqlite3_value_double(cur_value)); break; - case SQLITE_TEXT: - val_str = (const char*)sqlite3_value_text(cur_value); - cur_py_value = PyUnicode_FromString(val_str); - /* TODO: have a way to show errors here */ - if (!cur_py_value) { - PyErr_Clear(); - cur_py_value = Py_NewRef(Py_None); + case SQLITE_TEXT: { + sqlite3 *db = sqlite3_context_db_handle(context); + const char *text = (const char *)sqlite3_value_text(cur_value); + + if (text == NULL && sqlite3_errcode(db) == SQLITE_NOMEM) { + PyErr_NoMemory(); + goto error; } + + Py_ssize_t size = sqlite3_value_bytes(cur_value); + cur_py_value = PyUnicode_FromStringAndSize(text, size); break; + } case SQLITE_BLOB: { sqlite3 *db = sqlite3_context_db_handle(context); const void *blob = sqlite3_value_blob(cur_value);

1 0

bpo-44048: Fix two hashlib test cases under FIPS mode (GH-26470) (GH-26531)
by pablogsal June 4, 2021

June 4, 2021

https://github.com/python/cpython/commit/3f4d801bf907a5fcab50f3b64475d1410b… commit: 3f4d801bf907a5fcab50f3b64475d1410b90a80f branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-06-04T19:38:02+01:00 summary: bpo-44048: Fix two hashlib test cases under FIPS mode (GH-26470) (GH-26531) test_disallow_instantiation and test_readonly_types try to test all the available digests, however under FIPS mode, while the algorithms are available, trying to use them will fail with a ValueError. (cherry picked from commit a46c220edc5cf716d0b71eb80ac29ecdb4ebb430) Co-authored-by: stratakis <cstratak(a)redhat.com> Co-authored-by: stratakis <cstratak(a)redhat.com> files: M Lib/test/test_hashlib.py diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index ad2ed69e24b2c4..76754b6b8e13da 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -909,7 +909,11 @@ def test_disallow_instantiation(self): continue # all other types have DISALLOW_INSTANTIATION for constructor in constructors: - h = constructor() + # In FIPS mode some algorithms are not available raising ValueError + try: + h = constructor() + except ValueError: + continue with self.subTest(constructor=constructor): hash_type = type(h) self.assertRaises(TypeError, hash_type) @@ -930,7 +934,11 @@ def test_readonly_types(self): for algorithm, constructors in self.constructors_to_test.items(): # all other types have DISALLOW_INSTANTIATION for constructor in constructors: - hash_type = type(constructor()) + # In FIPS mode some algorithms are not available raising ValueError + try: + hash_type = type(constructor()) + except ValueError: + continue with self.subTest(hash_type=hash_type): with self.assertRaisesRegex(TypeError, "immutable type"): hash_type.value = False

1 0

bpo-43853: Handle sqlite3_value_text() errors (GH-25422)
by pablogsal June 4, 2021

June 4, 2021

https://github.com/python/cpython/commit/006fd869e4798b68e266f5de89c83ddb53… commit: 006fd869e4798b68e266f5de89c83ddb531a756b branch: main author: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-06-04T19:34:00+01:00 summary: bpo-43853: Handle sqlite3_value_text() errors (GH-25422) files: A Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst M Lib/sqlite3/test/userfunctions.py M Modules/_sqlite/connection.c diff --git a/Lib/sqlite3/test/userfunctions.py b/Lib/sqlite3/test/userfunctions.py index 148d9f596a91c8..6f57d1911b24d8 100644 --- a/Lib/sqlite3/test/userfunctions.py +++ b/Lib/sqlite3/test/userfunctions.py @@ -236,9 +236,11 @@ def test_func_exception(self): def test_param_string(self): cur = self.con.cursor() - cur.execute("select isstring(?)", ("foo",)) - val = cur.fetchone()[0] - self.assertEqual(val, 1) + for text in ["foo", str()]: + with self.subTest(text=text): + cur.execute("select isstring(?)", (text,)) + val = cur.fetchone()[0] + self.assertEqual(val, 1) def test_param_int(self): cur = self.con.cursor() @@ -391,9 +393,9 @@ def test_aggr_exception_in_finalize(self): def test_aggr_check_param_str(self): cur = self.con.cursor() - cur.execute("select checkType('str', ?)", ("foo",)) + cur.execute("select checkTypes('str', ?, ?)", ("foo", str())) val = cur.fetchone()[0] - self.assertEqual(val, 1) + self.assertEqual(val, 2) def test_aggr_check_param_int(self): cur = self.con.cursor() diff --git a/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst b/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst new file mode 100644 index 00000000000000..c5c3a0ae83c7f4 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-04-15-12-02-17.bpo-43853.XXCVAp.rst @@ -0,0 +1,3 @@ +Improve :mod:`sqlite3` error handling: ``sqlite3_value_text()`` errors that +set ``SQLITE_NOMEM`` now raise :exc:`MemoryError`. Patch by Erlend E. +Aasland. diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 47ae9aaf4ae683..e310dc3b43c5b9 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -550,7 +550,6 @@ _pysqlite_build_py_params(sqlite3_context *context, int argc, int i; sqlite3_value* cur_value; PyObject* cur_py_value; - const char* val_str; args = PyTuple_New(argc); if (!args) { @@ -566,15 +565,19 @@ _pysqlite_build_py_params(sqlite3_context *context, int argc, case SQLITE_FLOAT: cur_py_value = PyFloat_FromDouble(sqlite3_value_double(cur_value)); break; - case SQLITE_TEXT: - val_str = (const char*)sqlite3_value_text(cur_value); - cur_py_value = PyUnicode_FromString(val_str); - /* TODO: have a way to show errors here */ - if (!cur_py_value) { - PyErr_Clear(); - cur_py_value = Py_NewRef(Py_None); + case SQLITE_TEXT: { + sqlite3 *db = sqlite3_context_db_handle(context); + const char *text = (const char *)sqlite3_value_text(cur_value); + + if (text == NULL && sqlite3_errcode(db) == SQLITE_NOMEM) { + PyErr_NoMemory(); + goto error; } + + Py_ssize_t size = sqlite3_value_bytes(cur_value); + cur_py_value = PyUnicode_FromStringAndSize(text, size); break; + } case SQLITE_BLOB: { sqlite3 *db = sqlite3_context_db_handle(context); const void *blob = sqlite3_value_blob(cur_value);

1 0

bpo-44041: Add test for sqlite3 column count (GH-25907)
by pablogsal June 4, 2021

June 4, 2021

https://github.com/python/cpython/commit/8363ac8607eca7398e568e1336154e1262… commit: 8363ac8607eca7398e568e1336154e1262a995a0 branch: main author: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-06-04T18:36:08+01:00 summary: bpo-44041: Add test for sqlite3 column count (GH-25907) files: M Lib/sqlite3/test/dbapi.py diff --git a/Lib/sqlite3/test/dbapi.py b/Lib/sqlite3/test/dbapi.py index 77fafe093002eb..4bda6aa393e3ff 100644 --- a/Lib/sqlite3/test/dbapi.py +++ b/Lib/sqlite3/test/dbapi.py @@ -555,6 +555,17 @@ def test_last_row_id_insert_o_r(self): ] self.assertEqual(results, expected) + def test_column_count(self): + # Check that column count is updated correctly for cached statements + select = "select * from test" + res = self.cu.execute(select) + old_count = len(res.description) + # Add a new column and execute the cached select query again + self.cu.execute("alter table test add newcol") + res = self.cu.execute(select) + new_count = len(res.description) + self.assertEqual(new_count - old_count, 1) + class ThreadTests(unittest.TestCase): def setUp(self):

1 0