Mailman 3 October 2021 - Python-checkins

bpo-45679: Fix caching of multi-value typing.Literal (GH-29334)
by miss-islington Oct. 31, 2021

Oct. 31, 2021

https://github.com/python/cpython/commit/3997f3ce8ab15269fc800062f75411865d… commit: 3997f3ce8ab15269fc800062f75411865dbc0d55 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-10-31T01:43:40-07:00 summary: bpo-45679: Fix caching of multi-value typing.Literal (GH-29334) Literal[True, 2] is no longer equal to Literal[1, 2]. (cherry picked from commit 634984d7dbdd91e0a51a793eed4d870e139ae1e0) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: A Misc/NEWS.d/next/Library/2021-10-30-21-11-37.bpo-45679.Dq8Cpu.rst M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index 762c0cc8f6be0..fdec29ea58773 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -708,6 +708,8 @@ def test_equal(self): self.assertNotEqual(Literal[True], Literal[1]) self.assertNotEqual(Literal[1], Literal[2]) self.assertNotEqual(Literal[1, True], Literal[1]) + self.assertNotEqual(Literal[1, True], Literal[1, 1]) + self.assertNotEqual(Literal[1, 2], Literal[True, 2]) self.assertEqual(Literal[1], Literal[1]) self.assertEqual(Literal[1, 2], Literal[2, 1]) self.assertEqual(Literal[1, 2, 3], Literal[1, 2, 3, 3]) @@ -4917,6 +4919,8 @@ def test_special_attrs(self): typing.Concatenate[Any, SpecialAttrsP]: 'Concatenate', typing.Final[Any]: 'Final', typing.Literal[Any]: 'Literal', + typing.Literal[1, 2]: 'Literal', + typing.Literal[True, 2]: 'Literal', typing.Optional[Any]: 'Optional', typing.TypeGuard[Any]: 'TypeGuard', typing.Union[Any]: 'Any', diff --git a/Lib/typing.py b/Lib/typing.py index f842fc23da6c6..21caabb5d3e67 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -403,9 +403,10 @@ def __getitem__(self, parameters): class _LiteralSpecialForm(_SpecialForm, _root=True): - @_tp_cache(typed=True) def __getitem__(self, parameters): - return self._getitem(self, parameters) + if not isinstance(parameters, tuple): + parameters = (parameters,) + return self._getitem(self, *parameters) @_SpecialForm @@ -528,7 +529,8 @@ def Optional(self, parameters): return Union[arg, type(None)] @_LiteralSpecialForm -def Literal(self, parameters): +@_tp_cache(typed=True) +def Literal(self, *parameters): """Special typing form to define literal types (a.k.a. value types). This form can be used to indicate to type checkers that the corresponding @@ -551,9 +553,6 @@ def open_helper(file: str, mode: MODE) -> str: """ # There is no '_type_check' call because arguments to Literal[...] are # values, not types. - if not isinstance(parameters, tuple): - parameters = (parameters,) - parameters = _flatten_literal_params(parameters) try: diff --git a/Misc/NEWS.d/next/Library/2021-10-30-21-11-37.bpo-45679.Dq8Cpu.rst b/Misc/NEWS.d/next/Library/2021-10-30-21-11-37.bpo-45679.Dq8Cpu.rst new file mode 100644 index 0000000000000..a644492a12d17 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-10-30-21-11-37.bpo-45679.Dq8Cpu.rst @@ -0,0 +1,2 @@ +Fix caching of multi-value :data:`typing.Literal`. ``Literal[True, 2]`` is no +longer equal to ``Literal[1, 2]``.

1 0

bpo-45679: Fix caching of multi-value typing.Literal (GH-29334)
by serhiy-storchaka Oct. 31, 2021

Oct. 31, 2021

https://github.com/python/cpython/commit/634984d7dbdd91e0a51a793eed4d870e13… commit: 634984d7dbdd91e0a51a793eed4d870e139ae1e0 branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-10-31T10:22:16+02:00 summary: bpo-45679: Fix caching of multi-value typing.Literal (GH-29334) Literal[True, 2] is no longer equal to Literal[1, 2]. files: A Misc/NEWS.d/next/Library/2021-10-30-21-11-37.bpo-45679.Dq8Cpu.rst M Lib/test/test_typing.py M Lib/typing.py diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py index b1414dc82bae0..90d6bea59f899 100644 --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -714,6 +714,8 @@ def test_equal(self): self.assertNotEqual(Literal[True], Literal[1]) self.assertNotEqual(Literal[1], Literal[2]) self.assertNotEqual(Literal[1, True], Literal[1]) + self.assertNotEqual(Literal[1, True], Literal[1, 1]) + self.assertNotEqual(Literal[1, 2], Literal[True, 2]) self.assertEqual(Literal[1], Literal[1]) self.assertEqual(Literal[1, 2], Literal[2, 1]) self.assertEqual(Literal[1, 2, 3], Literal[1, 2, 3, 3]) @@ -4963,6 +4965,8 @@ def test_special_attrs(self): typing.Concatenate[Any, SpecialAttrsP]: 'Concatenate', typing.Final[Any]: 'Final', typing.Literal[Any]: 'Literal', + typing.Literal[1, 2]: 'Literal', + typing.Literal[True, 2]: 'Literal', typing.Optional[Any]: 'Optional', typing.TypeGuard[Any]: 'TypeGuard', typing.Union[Any]: 'Any', diff --git a/Lib/typing.py b/Lib/typing.py index 78d973d2bba05..031aa24eaf442 100644 --- a/Lib/typing.py +++ b/Lib/typing.py @@ -411,9 +411,10 @@ def __getitem__(self, parameters): class _LiteralSpecialForm(_SpecialForm, _root=True): - @_tp_cache(typed=True) def __getitem__(self, parameters): - return self._getitem(self, parameters) + if not isinstance(parameters, tuple): + parameters = (parameters,) + return self._getitem(self, *parameters) @_SpecialForm @@ -536,7 +537,8 @@ def Optional(self, parameters): return Union[arg, type(None)] @_LiteralSpecialForm -def Literal(self, parameters): +@_tp_cache(typed=True) +def Literal(self, *parameters): """Special typing form to define literal types (a.k.a. value types). This form can be used to indicate to type checkers that the corresponding @@ -559,9 +561,6 @@ def open_helper(file: str, mode: MODE) -> str: """ # There is no '_type_check' call because arguments to Literal[...] are # values, not types. - if not isinstance(parameters, tuple): - parameters = (parameters,) - parameters = _flatten_literal_params(parameters) try: diff --git a/Misc/NEWS.d/next/Library/2021-10-30-21-11-37.bpo-45679.Dq8Cpu.rst b/Misc/NEWS.d/next/Library/2021-10-30-21-11-37.bpo-45679.Dq8Cpu.rst new file mode 100644 index 0000000000000..a644492a12d17 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-10-30-21-11-37.bpo-45679.Dq8Cpu.rst @@ -0,0 +1,2 @@ +Fix caching of multi-value :data:`typing.Literal`. ``Literal[True, 2]`` is no +longer equal to ``Literal[1, 2]``.

1 0

bpo-45666: fixes warning with `swprintf` and `%s` (GH-29307)
by Fidget-Spinner Oct. 31, 2021

Oct. 31, 2021

https://github.com/python/cpython/commit/aad48062ef8f983fbb95f9dc0c3c3cef9c… commit: aad48062ef8f983fbb95f9dc0c3c3cef9c89df02 branch: main author: Nikita Sobolev <mail(a)sobolevn.me> committer: Fidget-Spinner <28750310+Fidget-Spinner(a)users.noreply.github.com> date: 2021-10-31T10:13:54+08:00 summary: bpo-45666: fixes warning with `swprintf` and `%s` (GH-29307) files: A Misc/NEWS.d/next/Build/2021-10-29-12-54-53.bpo-45666.w2G63u.rst M Programs/_testembed.c diff --git a/Misc/NEWS.d/next/Build/2021-10-29-12-54-53.bpo-45666.w2G63u.rst b/Misc/NEWS.d/next/Build/2021-10-29-12-54-53.bpo-45666.w2G63u.rst new file mode 100644 index 0000000000000..8a3e6feded856 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2021-10-29-12-54-53.bpo-45666.w2G63u.rst @@ -0,0 +1 @@ +Fix warning of ``swprintf`` and ``%s`` usage in ``_testembed.c`` diff --git a/Programs/_testembed.c b/Programs/_testembed.c index 6fe18d93a73ae..1ed3bd00edff6 100644 --- a/Programs/_testembed.c +++ b/Programs/_testembed.c @@ -1733,7 +1733,7 @@ static int check_use_frozen_modules(const char *rawval) if (rawval == NULL) { wcscpy(optval, L"frozen_modules"); } - else if (swprintf(optval, 100, L"frozen_modules=%s", rawval) < 0) { + else if (swprintf(optval, 100, L"frozen_modules=%S", rawval) < 0) { error("rawval is too long"); return -1; }

1 0

Fix docs source link for importlib.metadata (GH-29025)
by miss-islington Oct. 30, 2021

Oct. 30, 2021

https://github.com/python/cpython/commit/da222b7cc804adb1508f806d7fc6a2e65b… commit: da222b7cc804adb1508f806d7fc6a2e65b8423e8 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-10-30T08:32:14-07:00 summary: Fix docs source link for importlib.metadata (GH-29025) The link broke for Python 3.10 since importlib.metadata was made from a module into a package I think this is trivial enough to not need a bpo issue. Automerge-Triggered-By: GH:jaraco (cherry picked from commit aae18a17401dc36917c0f64f971d60ab1a5b477e) Co-authored-by: Philipp A <flying-sheep(a)web.de> files: M Doc/library/importlib.metadata.rst diff --git a/Doc/library/importlib.metadata.rst b/Doc/library/importlib.metadata.rst index 58c582d712413..99bcfeb2d1b55 100644 --- a/Doc/library/importlib.metadata.rst +++ b/Doc/library/importlib.metadata.rst @@ -11,7 +11,7 @@ .. versionchanged:: 3.10 ``importlib.metadata`` is no longer provisional. -**Source code:** :source:`Lib/importlib/metadata.py` +**Source code:** :source:`Lib/importlib/metadata/__init__.py` ``importlib.metadata`` is a library that provides for access to installed package metadata. Built in part on Python's import system, this library

1 0

Fix docs source link for importlib.metadata (GH-29025)
by miss-islington Oct. 30, 2021

Oct. 30, 2021

https://github.com/python/cpython/commit/aae18a17401dc36917c0f64f971d60ab1a… commit: aae18a17401dc36917c0f64f971d60ab1a5b477e branch: main author: Philipp A <flying-sheep(a)web.de> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-10-30T08:12:47-07:00 summary: Fix docs source link for importlib.metadata (GH-29025) The link broke for Python 3.10 since importlib.metadata was made from a module into a package I think this is trivial enough to not need a bpo issue. Automerge-Triggered-By: GH:jaraco files: M Doc/library/importlib.metadata.rst diff --git a/Doc/library/importlib.metadata.rst b/Doc/library/importlib.metadata.rst index 58c582d712413..99bcfeb2d1b55 100644 --- a/Doc/library/importlib.metadata.rst +++ b/Doc/library/importlib.metadata.rst @@ -11,7 +11,7 @@ .. versionchanged:: 3.10 ``importlib.metadata`` is no longer provisional. -**Source code:** :source:`Lib/importlib/metadata.py` +**Source code:** :source:`Lib/importlib/metadata/__init__.py` ``importlib.metadata`` is a library that provides for access to installed package metadata. Built in part on Python's import system, this library

1 0

bpo-10572: Move `sqlite3` tests to `Lib/test` (GH-29304)
by miss-islington Oct. 29, 2021

Oct. 29, 2021

https://github.com/python/cpython/commit/62bf263a775f4444d8b5d5841cc09be3bd… commit: 62bf263a775f4444d8b5d5841cc09be3bd53e933 branch: main author: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-10-29T15:08:19-07:00 summary: bpo-10572: Move `sqlite3` tests to `Lib/test` (GH-29304) Automerge-Triggered-By: GH:brettcannon files: A Lib/test/test_sqlite3/__init__.py A Lib/test/test_sqlite3/__main__.py A Lib/test/test_sqlite3/test_backup.py A Lib/test/test_sqlite3/test_dbapi.py A Lib/test/test_sqlite3/test_dump.py A Lib/test/test_sqlite3/test_factory.py A Lib/test/test_sqlite3/test_hooks.py A Lib/test/test_sqlite3/test_regression.py A Lib/test/test_sqlite3/test_transactions.py A Lib/test/test_sqlite3/test_types.py A Lib/test/test_sqlite3/test_userfunctions.py A Misc/NEWS.d/next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst D Lib/sqlite3/test/__init__.py D Lib/sqlite3/test/test_backup.py D Lib/sqlite3/test/test_dbapi.py D Lib/sqlite3/test/test_dump.py D Lib/sqlite3/test/test_factory.py D Lib/sqlite3/test/test_hooks.py D Lib/sqlite3/test/test_regression.py D Lib/sqlite3/test/test_transactions.py D Lib/sqlite3/test/test_types.py D Lib/sqlite3/test/test_userfunctions.py D Lib/test/test_sqlite.py M Makefile.pre.in M PCbuild/lib.pyproj diff --git a/Lib/sqlite3/test/__init__.py b/Lib/sqlite3/test/__init__.py deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/Lib/test/test_sqlite.py b/Lib/test/test_sqlite.py deleted file mode 100644 index 9992a02e5d90a..0000000000000 --- a/Lib/test/test_sqlite.py +++ /dev/null @@ -1,20 +0,0 @@ -import test.support -from test.support import import_helper -from test.support import load_package_tests - -# Skip test if _sqlite3 module not installed -import_helper.import_module('_sqlite3') - -import unittest -import os -import sqlite3.test - -def load_tests(loader, tests, pattern): - if test.support.verbose: - print("test_sqlite: testing with version", - "{!r}, sqlite_version {!r}".format(sqlite3.version, - sqlite3.sqlite_version)) - return load_package_tests(os.path.dirname(sqlite3.test.__file__), loader, tests, pattern) - -if __name__ == "__main__": - unittest.main() diff --git a/Lib/test/test_sqlite3/__init__.py b/Lib/test/test_sqlite3/__init__.py new file mode 100644 index 0000000000000..099c01e3b3cc7 --- /dev/null +++ b/Lib/test/test_sqlite3/__init__.py @@ -0,0 +1,18 @@ +from test.support import import_helper, load_package_tests, verbose + +# Skip test if _sqlite3 module not installed. +import_helper.import_module('_sqlite3') + +import unittest +import os +import sqlite3 + +# Implement the unittest "load tests" protocol. +def load_tests(*args): + pkg_dir = os.path.dirname(__file__) + return load_package_tests(pkg_dir, *args) + +if verbose: + print("test_sqlite3: testing with version", + "{!r}, sqlite_version {!r}".format(sqlite3.version, + sqlite3.sqlite_version)) diff --git a/Lib/test/test_sqlite3/__main__.py b/Lib/test/test_sqlite3/__main__.py new file mode 100644 index 0000000000000..51eddc3c2fde0 --- /dev/null +++ b/Lib/test/test_sqlite3/__main__.py @@ -0,0 +1,5 @@ +from test.test_sqlite3 import load_tests # Needed for the "load tests" protocol. +import unittest + +if __name__ == "__main__": + unittest.main() diff --git a/Lib/sqlite3/test/test_backup.py b/Lib/test/test_sqlite3/test_backup.py similarity index 100% rename from Lib/sqlite3/test/test_backup.py rename to Lib/test/test_sqlite3/test_backup.py diff --git a/Lib/sqlite3/test/test_dbapi.py b/Lib/test/test_sqlite3/test_dbapi.py similarity index 100% rename from Lib/sqlite3/test/test_dbapi.py rename to Lib/test/test_sqlite3/test_dbapi.py diff --git a/Lib/sqlite3/test/test_dump.py b/Lib/test/test_sqlite3/test_dump.py similarity index 100% rename from Lib/sqlite3/test/test_dump.py rename to Lib/test/test_sqlite3/test_dump.py diff --git a/Lib/sqlite3/test/test_factory.py b/Lib/test/test_sqlite3/test_factory.py similarity index 100% rename from Lib/sqlite3/test/test_factory.py rename to Lib/test/test_sqlite3/test_factory.py diff --git a/Lib/sqlite3/test/test_hooks.py b/Lib/test/test_sqlite3/test_hooks.py similarity index 100% rename from Lib/sqlite3/test/test_hooks.py rename to Lib/test/test_sqlite3/test_hooks.py diff --git a/Lib/sqlite3/test/test_regression.py b/Lib/test/test_sqlite3/test_regression.py similarity index 100% rename from Lib/sqlite3/test/test_regression.py rename to Lib/test/test_sqlite3/test_regression.py diff --git a/Lib/sqlite3/test/test_transactions.py b/Lib/test/test_sqlite3/test_transactions.py similarity index 100% rename from Lib/sqlite3/test/test_transactions.py rename to Lib/test/test_sqlite3/test_transactions.py diff --git a/Lib/sqlite3/test/test_types.py b/Lib/test/test_sqlite3/test_types.py similarity index 100% rename from Lib/sqlite3/test/test_types.py rename to Lib/test/test_sqlite3/test_types.py diff --git a/Lib/sqlite3/test/test_userfunctions.py b/Lib/test/test_sqlite3/test_userfunctions.py similarity index 100% rename from Lib/sqlite3/test/test_userfunctions.py rename to Lib/test/test_sqlite3/test_userfunctions.py diff --git a/Makefile.pre.in b/Makefile.pre.in index 322800ae26e4c..7c3c046f711a5 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1562,7 +1562,6 @@ TESTSUBDIRS= ctypes/test \ lib2to3/tests/data \ lib2to3/tests/data/fixers \ lib2to3/tests/data/fixers/myfixes \ - sqlite3/test \ test test/audiodata \ test/capath test/cjkencodings \ test/data test/decimaltestdata \ diff --git a/Misc/NEWS.d/next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst b/Misc/NEWS.d/next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst new file mode 100644 index 0000000000000..45f44bcbb110b --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-01-07-01-25-38.bpo-10572.gEEZ9z.rst @@ -0,0 +1,2 @@ +Move :mod:`sqlite3` tests to ``/Lib/test/test_sqlite3``. Patch by Erlend E. +Aasland. diff --git a/PCbuild/lib.pyproj b/PCbuild/lib.pyproj index 06e0a8b0d1c53..43c570f1dab37 100644 --- a/PCbuild/lib.pyproj +++ b/PCbuild/lib.pyproj @@ -1272,7 +1272,17 @@ <Compile Include="test\test_sort.py" /> <Compile Include="test\test_source_encoding.py" /> <Compile Include="test\test_spwd.py" /> - <Compile Include="test\test_sqlite.py" /> + <Compile Include="test\test_sqlite3" /> + <Compile Include="test\test_sqlite3\__init__.py" /> + <Compile Include="test\test_sqlite3\test_backup.py" /> + <Compile Include="test\test_sqlite3\test_dbapi.py" /> + <Compile Include="test\test_sqlite3\test_dump.py" /> + <Compile Include="test\test_sqlite3\test_factory.py" /> + <Compile Include="test\test_sqlite3\test_hooks.py" /> + <Compile Include="test\test_sqlite3\test_regression.py" /> + <Compile Include="test\test_sqlite3\test_transactions.py" /> + <Compile Include="test\test_sqlite3\test_types.py" /> + <Compile Include="test\test_sqlite3\test_userfunctions.py" /> <Compile Include="test\test_ssl.py" /> <Compile Include="test\test_startfile.py" /> <Compile Include="test\test_stat.py" />

1 0

[3.9] bpo-45581: Raise `MemoryError` in `sqlite3.connect` if SQLite signals memory error (GH-29171) (GH-29324)
by ambv Oct. 29, 2021

Oct. 29, 2021

https://github.com/python/cpython/commit/ed807bf333cdc78b92c9861600acf1a435… commit: ed807bf333cdc78b92c9861600acf1a435c52193 branch: 3.9 author: Łukasz Langa <lukasz(a)langa.pl> committer: ambv <lukasz(a)langa.pl> date: 2021-10-29T23:02:19+02:00 summary: [3.9] bpo-45581: Raise `MemoryError` in `sqlite3.connect` if SQLite signals memory error (GH-29171) (GH-29324) (cherry picked from commit e2e62b3808691e15fa44b883270023e42dcad958) Co-authored-by: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> files: A Misc/NEWS.d/next/Library/2021-10-22-21-57-02.bpo-45581.rlH6ay.rst M Modules/_sqlite/connection.c diff --git a/Misc/NEWS.d/next/Library/2021-10-22-21-57-02.bpo-45581.rlH6ay.rst b/Misc/NEWS.d/next/Library/2021-10-22-21-57-02.bpo-45581.rlH6ay.rst new file mode 100644 index 0000000000000..13a3b237434eb --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-10-22-21-57-02.bpo-45581.rlH6ay.rst @@ -0,0 +1,2 @@ +:meth:`sqlite3.connect` now correctly raises :exc:`MemoryError` if the +underlying SQLite API signals memory error. Patch by Erlend E. Aasland. diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 68bf97389a7cd..30e333a4b86d8 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -134,6 +134,10 @@ int pysqlite_connection_init(pysqlite_Connection* self, PyObject* args, PyObject Py_DECREF(database_obj); + if (self->db == NULL && rc == SQLITE_NOMEM) { + PyErr_NoMemory(); + return -1; + } if (rc != SQLITE_OK) { _pysqlite_seterror(self->db, NULL); return -1;

1 0

bpo-45379: clarify FROZEN_EXCLUDED and FROZEN_INVALID documentation (GH-29189)
by ambv Oct. 29, 2021

Oct. 29, 2021

https://github.com/python/cpython/commit/c2d0ba722a7b3839685af968cf0c304a24… commit: c2d0ba722a7b3839685af968cf0c304a24cdf525 branch: main author: Filipe Laíns <lains(a)riseup.net> committer: ambv <lukasz(a)langa.pl> date: 2021-10-29T22:55:14+02:00 summary: bpo-45379: clarify FROZEN_EXCLUDED and FROZEN_INVALID documentation (GH-29189) Signed-off-by: Filipe Laíns <lains(a)riseup.net> Co-authored-by: Łukasz Langa <lukasz(a)langa.pl> files: M Python/import.c diff --git a/Python/import.c b/Python/import.c index 48ea9129163c8..cdcb903c88207 100644 --- a/Python/import.c +++ b/Python/import.c @@ -1171,8 +1171,10 @@ typedef enum { FROZEN_BAD_NAME, // The given module name wasn't valid. FROZEN_NOT_FOUND, // It wasn't in PyImport_FrozenModules. FROZEN_DISABLED, // -X frozen_modules=off (and not essential) - FROZEN_EXCLUDED, // The PyImport_FrozenModules entry has NULL "code". - FROZEN_INVALID, // The PyImport_FrozenModules entry is bogus. + FROZEN_EXCLUDED, /* The PyImport_FrozenModules entry has NULL "code" + (module is present but marked as unimportable, stops search). */ + FROZEN_INVALID, /* The PyImport_FrozenModules entry is bogus + (eg. does not contain executable code). */ } frozen_status; static inline void @@ -1305,6 +1307,7 @@ find_frozen(PyObject *nameobj, struct frozen_info *info) return FROZEN_EXCLUDED; } if (p->code[0] == '\0' || p->size == 0) { + /* Does not contain executable code. */ return FROZEN_INVALID; } return FROZEN_OKAY; @@ -1315,6 +1318,7 @@ unmarshal_frozen_code(struct frozen_info *info) { PyObject *co = PyMarshal_ReadObjectFromString(info->data, info->size); if (co == NULL) { + /* Does not contain executable code. */ set_frozen_error(FROZEN_INVALID, info->nameobj); return NULL; } @@ -2214,6 +2218,7 @@ _imp_get_frozen_object_impl(PyObject *module, PyObject *name, info.nameobj = name; } if (info.size == 0) { + /* Does not contain executable code. */ set_frozen_error(FROZEN_INVALID, name); return NULL; }

1 0

[3.10] bpo-45581: Raise `MemoryError` in `sqlite3.connect` if SQLite signals memory error (GH-29171) (GH-29323)
by ambv Oct. 29, 2021

Oct. 29, 2021

https://github.com/python/cpython/commit/7e2c0a18b41cb906a354776e6ca52af81e… commit: 7e2c0a18b41cb906a354776e6ca52af81e39820f branch: 3.10 author: Łukasz Langa <lukasz(a)langa.pl> committer: ambv <lukasz(a)langa.pl> date: 2021-10-29T22:54:07+02:00 summary: [3.10] bpo-45581: Raise `MemoryError` in `sqlite3.connect` if SQLite signals memory error (GH-29171) (GH-29323) (cherry picked from commit e2e62b3808691e15fa44b883270023e42dcad958) Co-authored-by: Erlend Egeberg Aasland <erlend.aasland(a)innova.no> files: A Misc/NEWS.d/next/Library/2021-10-22-21-57-02.bpo-45581.rlH6ay.rst M Modules/_sqlite/connection.c diff --git a/Misc/NEWS.d/next/Library/2021-10-22-21-57-02.bpo-45581.rlH6ay.rst b/Misc/NEWS.d/next/Library/2021-10-22-21-57-02.bpo-45581.rlH6ay.rst new file mode 100644 index 0000000000000..13a3b237434eb --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-10-22-21-57-02.bpo-45581.rlH6ay.rst @@ -0,0 +1,2 @@ +:meth:`sqlite3.connect` now correctly raises :exc:`MemoryError` if the +underlying SQLite API signals memory error. Patch by Erlend E. Aasland. diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c index 2cc5f53a30bc0..64610393ec1c3 100644 --- a/Modules/_sqlite/connection.c +++ b/Modules/_sqlite/connection.c @@ -113,6 +113,10 @@ pysqlite_connection_init(pysqlite_Connection *self, PyObject *args, Py_DECREF(database_obj); + if (self->db == NULL && rc == SQLITE_NOMEM) { + PyErr_NoMemory(); + return -1; + } if (rc != SQLITE_OK) { _pysqlite_seterror(self->db, NULL); return -1;

1 0

bpo-45600: Enhanced / clarified the docs for os.environ and os.environb (GH-29204) (GH-29321)
by ambv Oct. 29, 2021

Oct. 29, 2021

https://github.com/python/cpython/commit/3ec1124de289496efabc43a02cc88b3c59… commit: 3ec1124de289496efabc43a02cc88b3c59e1e238 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: ambv <lukasz(a)langa.pl> date: 2021-10-29T22:52:59+02:00 summary: bpo-45600: Enhanced / clarified the docs for os.environ and os.environb (GH-29204) (GH-29321) Co-authored-by: Łukasz Langa <lukasz(a)langa.pl> (cherry picked from commit b17cfd150f4dc2816975d304a71110a2d445eaf0) Co-authored-by: andrei kulakov <andrei.avk(a)gmail.com> files: M Doc/library/os.rst diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 23e220c009d30..d4cc296fbf89a 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -102,9 +102,10 @@ process and user. .. data:: environ - A :term:`mapping` object representing the string environment. For example, - ``environ['HOME']`` is the pathname of your home directory (on some platforms), - and is equivalent to ``getenv("HOME")`` in C. + A :term:`mapping` object where keys and values are strings that represent + the process environment. For example, ``environ['HOME']`` is the pathname + of your home directory (on some platforms), and is equivalent to + ``getenv("HOME")`` in C. This mapping is captured the first time the :mod:`os` module is imported, typically during Python startup as part of processing :file:`site.py`. Changes @@ -141,10 +142,10 @@ process and user. .. data:: environb - Bytes version of :data:`environ`: a :term:`mapping` object representing the - environment as byte strings. :data:`environ` and :data:`environb` are - synchronized (modify :data:`environb` updates :data:`environ`, and vice - versa). + Bytes version of :data:`environ`: a :term:`mapping` object where both keys + and values are :class:`bytes` objects representing the process environment. + :data:`environ` and :data:`environb` are synchronized (modifying + :data:`environb` updates :data:`environ`, and vice versa). :data:`environb` is only available if :data:`supports_bytes_environ` is ``True``.

1 0