Mailman 3 June 2021 - Python-checkins

build(deps): bump actions/cache from 2.1.5 to 2.1.6 (GH-26476)
by nanjekyejoannah June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/8916633b768e08af6375c7be9ea6c8ba9b… commit: 8916633b768e08af6375c7be9ea6c8ba9b3962b0 branch: main author: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> committer: nanjekyejoannah <33177550+nanjekyejoannah(a)users.noreply.github.com> date: 2021-06-02T14:34:45-03:00 summary: build(deps): bump actions/cache from 2.1.5 to 2.1.6 (GH-26476) Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6) Signed-off-by: dependabot[bot] <support(a)github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot](a)users.noreply.github.com> files: M .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20d99a1c6ac919..aaa95dbec86c81 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -150,7 +150,7 @@ jobs: echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV - name: 'Restore OpenSSL build' id: cache-openssl - uses: actions/cache(a)v2.1.5 + uses: actions/cache(a)v2.1.6 with: path: ./multissl/openssl/${{ env.OPENSSL_VER }} key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }} @@ -198,7 +198,7 @@ jobs: echo "LD_LIBRARY_PATH=${GITHUB_WORKSPACE}/multissl/openssl/${OPENSSL_VER}/lib" >> $GITHUB_ENV - name: 'Restore OpenSSL build' id: cache-openssl - uses: actions/cache(a)v2.1.5 + uses: actions/cache(a)v2.1.6 with: path: ./multissl/openssl/${{ env.OPENSSL_VER }} key: ${{ runner.os }}-multissl-openssl-${{ env.OPENSSL_VER }}

1 0

Typo fix in asyncio-eventloop.rst (GH-26482)
by nanjekyejoannah June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/225caf78d1096355b7ab072898e28f7ea5… commit: 225caf78d1096355b7ab072898e28f7ea500ab0f branch: main author: Zac Bentley <zbentley(a)users.noreply.github.com> committer: nanjekyejoannah <33177550+nanjekyejoannah(a)users.noreply.github.com> date: 2021-06-02T12:00:25-03:00 summary: Typo fix in asyncio-eventloop.rst (GH-26482) files: M Doc/library/asyncio-eventloop.rst diff --git a/Doc/library/asyncio-eventloop.rst b/Doc/library/asyncio-eventloop.rst index f34fe09591c5b..83ab7360a9b6e 100644 --- a/Doc/library/asyncio-eventloop.rst +++ b/Doc/library/asyncio-eventloop.rst @@ -1440,7 +1440,7 @@ Do not instantiate the class directly. Start accepting connections. This method is idempotent, so it can be called when - the server is already being serving. + the server is already serving. The *start_serving* keyword-only parameter to :meth:`loop.create_server` and

1 0

bpo-44285: getpath.c: Assert that env_file is NULL during an error check (GH-26486)
by encukou June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/bdb56902a3bfe12b10f85a941d5dd0eae7… commit: bdb56902a3bfe12b10f85a941d5dd0eae739f1a8 branch: main author: stratakis <cstratak(a)redhat.com> committer: encukou <encukou(a)gmail.com> date: 2021-06-02T16:54:33+02:00 summary: bpo-44285: getpath.c: Assert that env_file is NULL during an error check (GH-26486) This was flagged by a static analyzer, but the logic of why this is NULL on error is hard to follow for humans as well. files: M Modules/getpath.c diff --git a/Modules/getpath.c b/Modules/getpath.c index 44453f29df703..363d62a0657eb 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -1263,6 +1263,7 @@ calculate_read_pyenv(PyCalculatePath *calculate) status = calculate_open_pyenv(calculate, &env_file); if (_PyStatus_EXCEPTION(status)) { + assert(env_file == NULL); return status; } if (env_file == NULL) {

1 0

bpo-44165: pysqlite_statement_create now returns a Py object, not an int (GH-26484)
by pablogsal June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/fbf25b8c0dd1e62db59117d53bbd2d4131… commit: fbf25b8c0dd1e62db59117d53bbd2d4131a06867 branch: main author: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-06-02T14:22:15+01:00 summary: bpo-44165: pysqlite_statement_create now returns a Py object, not an int (GH-26484) GH-26206 was broken by GH-26475. files: M Modules/_sqlite/statement.c diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c index c4a790c424e35..c86645ad42b64 100644 --- a/Modules/_sqlite/statement.c +++ b/Modules/_sqlite/statement.c @@ -70,7 +70,7 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql) int max_length = sqlite3_limit(connection->db, SQLITE_LIMIT_LENGTH, -1); if (sql_cstr_len >= max_length) { PyErr_SetString(pysqlite_DataError, "query string is too large"); - return PYSQLITE_TOO_MUCH_SQL; + return NULL; } if (strlen(sql_cstr) != (size_t)sql_cstr_len) { PyErr_SetString(PyExc_ValueError,

1 0

bpo-17792: more accurate error message for unbound variable access exceptions (GH-24976)
by iritkatriel June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/7b1f527d5b37dc3aa085ebbe11a1a2dd29… commit: 7b1f527d5b37dc3aa085ebbe11a1a2dd29ef210f branch: main author: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2021-06-02T14:09:04+01:00 summary: bpo-17792: more accurate error message for unbound variable access exceptions (GH-24976) files: A Misc/NEWS.d/next/Core and Builtins/2021-03-22-17-50-30.bpo-17792._zssjS.rst M Python/ceval.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-03-22-17-50-30.bpo-17792._zssjS.rst b/Misc/NEWS.d/next/Core and Builtins/2021-03-22-17-50-30.bpo-17792._zssjS.rst new file mode 100644 index 00000000000000..768cbf14efad9c --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-03-22-17-50-30.bpo-17792._zssjS.rst @@ -0,0 +1 @@ +More accurate error messages for access of unbound locals or free vars. diff --git a/Python/ceval.c b/Python/ceval.c index 3bbcfe9c237d88..4dff7bd2df9834 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -101,10 +101,10 @@ static int get_exception_handler(PyCodeObject *, int, int*, int*, int*); #define NAME_ERROR_MSG \ "name '%.200s' is not defined" #define UNBOUNDLOCAL_ERROR_MSG \ - "local variable '%.200s' referenced before assignment" + "cannot access local variable '%s' where it is not associated with a value" #define UNBOUNDFREE_ERROR_MSG \ - "free variable '%.200s' referenced before assignment" \ - " in enclosing scope" + "cannot access free variable '%s' where it is not associated with a" \ + " value in enclosing scope" /* Dynamic execution profile */ #ifdef DYNAMIC_EXECUTION_PROFILE

1 0

Remove duplicate address in CommonTestMixin_v4.test_leading_zeros() (GH-26326)
by pablogsal June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/1a8c77847118d16025337f17cf28fd35c9… commit: 1a8c77847118d16025337f17cf28fd35c962694b branch: main author: Mariusz Felisiak <felisiak.mariusz(a)gmail.com> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-06-02T13:30:13+01:00 summary: Remove duplicate address in CommonTestMixin_v4.test_leading_zeros() (GH-26326) files: M Lib/test/test_ipaddress.py diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py index ff77bdb1bbc58..b0605f0be04bb 100644 --- a/Lib/test/test_ipaddress.py +++ b/Lib/test/test_ipaddress.py @@ -102,7 +102,6 @@ def test_leading_zeros(self): "000.000.000.000", "192.168.000.001", "016.016.016.016", - "192.168.000.001", "001.000.008.016", "01.2.3.40", "1.02.3.40",

1 0

bpo-44165: Optimise sqlite3 statement preparation by passing string size (GH-26206)
by pablogsal June 2, 2021

June 2, 2021

https://github.com/python/cpython/commit/a384b6c04054a2c5050a99059836175cf7… commit: a384b6c04054a2c5050a99059836175cf73e2016 branch: main author: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> committer: pablogsal <Pablogsal(a)gmail.com> date: 2021-06-02T13:26:06+01:00 summary: bpo-44165: Optimise sqlite3 statement preparation by passing string size (GH-26206) files: M Modules/_sqlite/connection.c M Modules/_sqlite/cursor.c M Modules/_sqlite/statement.c diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 7252ccab10b4b..e15629c8aba24 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -451,7 +451,7 @@ pysqlite_connection_commit_impl(pysqlite_Connection *self) if (!sqlite3_get_autocommit(self->db)) { Py_BEGIN_ALLOW_THREADS - rc = sqlite3_prepare_v2(self->db, "COMMIT", -1, &statement, NULL); + rc = sqlite3_prepare_v2(self->db, "COMMIT", 7, &statement, NULL); Py_END_ALLOW_THREADS if (rc != SQLITE_OK) { _pysqlite_seterror(self->db); @@ -501,7 +501,7 @@ pysqlite_connection_rollback_impl(pysqlite_Connection *self) pysqlite_do_all_statements(self, ACTION_RESET, 1); Py_BEGIN_ALLOW_THREADS - rc = sqlite3_prepare_v2(self->db, "ROLLBACK", -1, &statement, NULL); + rc = sqlite3_prepare_v2(self->db, "ROLLBACK", 9, &statement, NULL); Py_END_ALLOW_THREADS if (rc != SQLITE_OK) { _pysqlite_seterror(self->db); diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index 7656c903a4acf..757c389c6a44b 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -696,6 +696,7 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj) const char* script_cstr; sqlite3_stmt* statement; int rc; + Py_ssize_t sql_len; PyObject* result; if (!check_cursor(self)) { @@ -705,10 +706,17 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj) self->reset = 0; if (PyUnicode_Check(script_obj)) { - script_cstr = PyUnicode_AsUTF8(script_obj); + script_cstr = PyUnicode_AsUTF8AndSize(script_obj, &sql_len); if (!script_cstr) { return NULL; } + + int max_length = sqlite3_limit(self->connection->db, + SQLITE_LIMIT_LENGTH, -1); + if (sql_len >= max_length) { + PyErr_SetString(pysqlite_DataError, "query string is too large"); + return NULL; + } } else { PyErr_SetString(PyExc_ValueError, "script argument must be unicode."); return NULL; @@ -722,12 +730,14 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj) Py_DECREF(result); while (1) { + const char *tail; + Py_BEGIN_ALLOW_THREADS rc = sqlite3_prepare_v2(self->connection->db, script_cstr, - -1, + (int)sql_len + 1, &statement, - &script_cstr); + &tail); Py_END_ALLOW_THREADS if (rc != SQLITE_OK) { _pysqlite_seterror(self->connection->db); @@ -755,9 +765,11 @@ pysqlite_cursor_executescript(pysqlite_Cursor *self, PyObject *script_obj) goto error; } - if (*script_cstr == (char)0) { + if (*tail == (char)0) { break; } + sql_len -= (tail - script_cstr); + script_cstr = tail; } error: diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c index 3a18ad8331f69..c4a790c424e35 100644 --- a/Modules/_sqlite/statement.c +++ b/Modules/_sqlite/statement.c @@ -66,6 +66,12 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql) Py_TYPE(sql)->tp_name); return NULL; } + + int max_length = sqlite3_limit(connection->db, SQLITE_LIMIT_LENGTH, -1); + if (sql_cstr_len >= max_length) { + PyErr_SetString(pysqlite_DataError, "query string is too large"); + return PYSQLITE_TOO_MUCH_SQL; + } if (strlen(sql_cstr) != (size_t)sql_cstr_len) { PyErr_SetString(PyExc_ValueError, "the query contains a null character"); @@ -106,7 +112,7 @@ pysqlite_statement_create(pysqlite_Connection *connection, PyObject *sql) Py_BEGIN_ALLOW_THREADS rc = sqlite3_prepare_v2(self->db, sql_cstr, - -1, + (int)sql_cstr_len + 1, &self->st, &tail); Py_END_ALLOW_THREADS

1 0

[3.9] bpo-44279: [doc] reword contextlib.suppress documentation (GH-26428) (GH-26481)
by iritkatriel June 1, 2021

June 1, 2021

https://github.com/python/cpython/commit/9a688624973a2b753b84f892b65268543c… commit: 9a688624973a2b753b84f892b65268543c7ff67d branch: 3.9 author: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2021-06-01T23:15:48+01:00 summary: [3.9] bpo-44279: [doc] reword contextlib.suppress documentation (GH-26428) (GH-26481) (cherry picked from commit 87272b70f157af76cb14ff90d73dfc5d9bfb945a) Co-authored-by: MapleCCC <littlelittlemaple(a)gmail.com> files: M Doc/library/contextlib.rst diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst index 3dcedf72a390e..cfc37a63aedbf 100644 --- a/Doc/library/contextlib.rst +++ b/Doc/library/contextlib.rst @@ -191,8 +191,9 @@ Functions and classes provided: .. function:: suppress(*exceptions) Return a context manager that suppresses any of the specified exceptions - if they occur in the body of a with statement and then resumes execution - with the first statement following the end of the with statement. + if they are raised in the body of a :keyword:`!with` statement and then + resumes execution with the first statement following the end of the + :keyword:`!with` statement. As with any other mechanism that completely suppresses exceptions, this context manager should be used only to cover very specific errors where

1 0

[3.10] bpo-44279: [doc] reword contextlib.suppress documentation (GH-26428) (GH-26480)
by iritkatriel June 1, 2021

June 1, 2021

https://github.com/python/cpython/commit/6563ea5c60be2e4896df52eff777aa9374… commit: 6563ea5c60be2e4896df52eff777aa93743f1551 branch: 3.10 author: Irit Katriel <1055913+iritkatriel(a)users.noreply.github.com> committer: iritkatriel <1055913+iritkatriel(a)users.noreply.github.com> date: 2021-06-01T22:58:06+01:00 summary: [3.10] bpo-44279: [doc] reword contextlib.suppress documentation (GH-26428) (GH-26480) (cherry picked from commit 87272b70f157af76cb14ff90d73dfc5d9bfb945a) Co-authored-by: MapleCCC <littlelittlemaple(a)gmail.com> files: M Doc/library/contextlib.rst diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst index 42834fe68bfae..98df29277e3b7 100644 --- a/Doc/library/contextlib.rst +++ b/Doc/library/contextlib.rst @@ -267,8 +267,9 @@ Functions and classes provided: .. function:: suppress(*exceptions) Return a context manager that suppresses any of the specified exceptions - if they occur in the body of a with statement and then resumes execution - with the first statement following the end of the with statement. + if they are raised in the body of a :keyword:`!with` statement and then + resumes execution with the first statement following the end of the + :keyword:`!with` statement. As with any other mechanism that completely suppresses exceptions, this context manager should be used only to cover very specific errors where

1 0

bpo-44263: Py_TPFLAGS_HAVE_GC requires tp_traverse (GH-26463)
by vstinner June 1, 2021

June 1, 2021

https://github.com/python/cpython/commit/ee7637596d8de25f54261bbeabc602d31e… commit: ee7637596d8de25f54261bbeabc602d31e74f482 branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2021-06-01T23:37:12+02:00 summary: bpo-44263: Py_TPFLAGS_HAVE_GC requires tp_traverse (GH-26463) The PyType_Ready() function now raises an error if a type is defined with the Py_TPFLAGS_HAVE_GC flag set but has no traverse function (PyTypeObject.tp_traverse). files: A Misc/NEWS.d/next/C API/2021-05-31-11-31-13.bpo-44263.8mIOfV.rst M Doc/whatsnew/3.11.rst M Objects/typeobject.c diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst index a178095be0d0d..1b3b8240a521f 100644 --- a/Doc/whatsnew/3.11.rst +++ b/Doc/whatsnew/3.11.rst @@ -144,6 +144,11 @@ New Features Porting to Python 3.11 ---------------------- +* The :c:func:`PyType_Ready` function now raises an error if a type is defined + with the :const:`Py_TPFLAGS_HAVE_GC` flag set but has no traverse function + (:c:member:`PyTypeObject.tp_traverse`). + (Contributed by Victor Stinner in :issue:`44263`.) + Deprecated ---------- @@ -180,4 +185,4 @@ Removed parameter of functions :func:`~gettext.translation` and :func:`~gettext.install` are also removed, since they are only used for the ``l*gettext()`` functions. - (Contributed by Dong-hee Na and Serhiy Storchaka in :issue:`44235`.) \ No newline at end of file + (Contributed by Dong-hee Na and Serhiy Storchaka in :issue:`44235`.) diff --git a/Misc/NEWS.d/next/C API/2021-05-31-11-31-13.bpo-44263.8mIOfV.rst b/Misc/NEWS.d/next/C API/2021-05-31-11-31-13.bpo-44263.8mIOfV.rst new file mode 100644 index 0000000000000..aa831a2083c48 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2021-05-31-11-31-13.bpo-44263.8mIOfV.rst @@ -0,0 +1,4 @@ +The :c:func:`PyType_Ready` function now raises an error if a type is defined +with the :const:`Py_TPFLAGS_HAVE_GC` flag set but has no traverse function +(:c:member:`PyTypeObject.tp_traverse`). +Patch by Victor Stinner. diff --git a/Objects/typeobject.c b/Objects/typeobject.c index feb25aa0b78e4..bf792e21c162d 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -158,6 +158,12 @@ _PyType_CheckConsistency(PyTypeObject *type) CHECK(!(type->tp_flags & Py_TPFLAGS_READYING)); CHECK(type->tp_dict != NULL); + if (type->tp_flags & Py_TPFLAGS_HAVE_GC) { + // bpo-44263: tp_traverse is required if Py_TPFLAGS_HAVE_GC is set. + // Note: tp_clear is optional. + CHECK(type->tp_traverse != NULL); + } + if (type->tp_flags & Py_TPFLAGS_DISALLOW_INSTANTIATION) { CHECK(type->tp_new == NULL); CHECK(_PyDict_ContainsId(type->tp_dict, &PyId___new__) == 0); @@ -3607,6 +3613,7 @@ PyType_FromModuleAndSpec(PyObject *module, PyType_Spec *spec, PyObject *bases) } } + assert(_PyType_CheckConsistency(type)); return (PyObject*)res; fail: @@ -5944,7 +5951,7 @@ static int add_tp_new_wrapper(PyTypeObject *type); #define COLLECTION_FLAGS (Py_TPFLAGS_SEQUENCE | Py_TPFLAGS_MAPPING) static int -type_ready_checks(PyTypeObject *type) +type_ready_pre_checks(PyTypeObject *type) { /* Consistency checks for PEP 590: * - Py_TPFLAGS_METHOD_DESCRIPTOR requires tp_descr_get @@ -6305,10 +6312,28 @@ type_ready_set_new(PyTypeObject *type) } +static int +type_ready_post_checks(PyTypeObject *type) +{ + // bpo-44263: tp_traverse is required if Py_TPFLAGS_HAVE_GC is set. + // Note: tp_clear is optional. + if (type->tp_flags & Py_TPFLAGS_HAVE_GC + && type->tp_traverse == NULL) + { + PyErr_Format(PyExc_SystemError, + "type %s has the Py_TPFLAGS_HAVE_GC flag " + "but has no traverse function", + type->tp_name); + return -1; + } + return 0; +} + + static int type_ready(PyTypeObject *type) { - if (type_ready_checks(type) < 0) { + if (type_ready_pre_checks(type) < 0) { return -1; } @@ -6346,6 +6371,9 @@ type_ready(PyTypeObject *type) if (type_ready_add_subclasses(type) < 0) { return -1; } + if (type_ready_post_checks(type) < 0) { + return -1; + } return 0; }

1 0