Mailman 3 May 2020 - Python-checkins

bpo-29587: Update gen.throw() to chain exceptions (#19823)
by Chris Jerdonek 01 May '20

01 May '20

https://github.com/python/cpython/commit/02047265eb83a43ba18cc7fee81756f1a1… commit: 02047265eb83a43ba18cc7fee81756f1a1a1f968 branch: master author: Chris Jerdonek <chris.jerdonek(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-05-01T18:14:19-07:00 summary: bpo-29587: Update gen.throw() to chain exceptions (#19823) Before this commit, if an exception was active inside a generator when calling gen.throw(), that exception was lost (i.e. there was no implicit exception chaining). This commit fixes that by setting exc.__context__ when calling gen.throw(exc). files: A Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst M Lib/test/test_generators.py M Objects/genobject.c diff --git a/Lib/test/test_generators.py b/Lib/test/test_generators.py index 3e42bc6b69a81..4d96f44b15062 100644 --- a/Lib/test/test_generators.py +++ b/Lib/test/test_generators.py @@ -316,6 +316,23 @@ def g(): self.assertEqual(cm.exception.value.value, 2) +class GeneratorThrowTest(unittest.TestCase): + + def test_exception_context_set(self): + def f(): + try: + raise KeyError('a') + except Exception: + yield + + gen = f() + gen.send(None) + with self.assertRaises(ValueError) as cm: + gen.throw(ValueError) + context = cm.exception.__context__ + self.assertEqual((type(context), context.args), (KeyError, ('a',))) + + class YieldFromTests(unittest.TestCase): def test_generator_gi_yieldfrom(self): def a(): diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst b/Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst new file mode 100644 index 0000000000000..f44aa360cc2ef --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-04-30-00-50-25.bpo-29587.oEwSq.rst @@ -0,0 +1 @@ +Enable implicit exception chaining when calling :meth:`generator.throw`. diff --git a/Objects/genobject.c b/Objects/genobject.c index 6e36690b65148..41a63ae2e666a 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -512,6 +512,15 @@ _gen_throw(PyGenObject *gen, int close_on_genexit, } PyErr_Restore(typ, val, tb); + /* XXX Should we also handle the case where exc_type is true and + exc_value is false? */ + if (gen->gi_exc_state.exc_type && gen->gi_exc_state.exc_value) { + Py_INCREF(gen->gi_exc_state.exc_type); + Py_INCREF(gen->gi_exc_state.exc_value); + Py_XINCREF(gen->gi_exc_state.exc_traceback); + _PyErr_ChainExceptions(gen->gi_exc_state.exc_type, + gen->gi_exc_state.exc_value, gen->gi_exc_state.exc_traceback); + } return gen_send_ex(gen, Py_None, 1, 0); failed_throw:

1 0

bpo-40417: Fix deprecation warning in PyImport_ReloadModule (GH-19750)
by Robert Rouhani 01 May '20

01 May '20

https://github.com/python/cpython/commit/f40bd466bf14029e2687e36e965875adf9… commit: f40bd466bf14029e2687e36e965875adf9d4be1a branch: master author: Robert Rouhani <robert.rouhani(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-05-01T16:28:06-07:00 summary: bpo-40417: Fix deprecation warning in PyImport_ReloadModule (GH-19750) I can add another commit with the new test case I wrote to verify that the warning was being printed before my change, stopped printing after my change, and that the function does not return null after my change. Automerge-Triggered-By: @brettcannon files: A Misc/NEWS.d/next/Core and Builtins/2020-05-01-19-04-52.bpo-40417.Sti2lJ.rst M Python/import.c diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-05-01-19-04-52.bpo-40417.Sti2lJ.rst b/Misc/NEWS.d/next/Core and Builtins/2020-05-01-19-04-52.bpo-40417.Sti2lJ.rst new file mode 100644 index 0000000000000..932e853a8933d --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-05-01-19-04-52.bpo-40417.Sti2lJ.rst @@ -0,0 +1 @@ +Fix imp module deprecation warning when PyImport_ReloadModule is called. Patch by Robert Rouhani. diff --git a/Python/import.c b/Python/import.c index 400b02abbdba0..0e2e7c370868f 100644 --- a/Python/import.c +++ b/Python/import.c @@ -1978,23 +1978,23 @@ PyImport_ImportModuleLevel(const char *name, PyObject *globals, PyObject *locals PyObject * PyImport_ReloadModule(PyObject *m) { - _Py_IDENTIFIER(imp); + _Py_IDENTIFIER(importlib); _Py_IDENTIFIER(reload); PyObject *reloaded_module = NULL; - PyObject *imp = _PyImport_GetModuleId(&PyId_imp); - if (imp == NULL) { + PyObject *importlib = _PyImport_GetModuleId(&PyId_importlib); + if (importlib == NULL) { if (PyErr_Occurred()) { return NULL; } - imp = PyImport_ImportModule("imp"); - if (imp == NULL) { + importlib = PyImport_ImportModule("importlib"); + if (importlib == NULL) { return NULL; } } - reloaded_module = _PyObject_CallMethodIdOneArg(imp, &PyId_reload, m); - Py_DECREF(imp); + reloaded_module = _PyObject_CallMethodIdOneArg(importlib, &PyId_reload, m); + Py_DECREF(importlib); return reloaded_module; }

1 0

bpo-40412: Nullify inittab_copy during finalization (GH-19746)
by Miss Islington (bot) 01 May '20

01 May '20

https://github.com/python/cpython/commit/1205afb3e10194fe22fa76385abb7e5221… commit: 1205afb3e10194fe22fa76385abb7e522144eb29 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-05-01T16:06:23-07:00 summary: bpo-40412: Nullify inittab_copy during finalization (GH-19746) Otherwise we leave a dangling pointer to free'd memory. If we then initialize a new interpreter in the same process and call PyImport_ExtendInittab, we will (likely) crash when calling PyMem_RawRealloc(inittab_copy, ...) since the pointer address is bogus. Automerge-Triggered-By: @brettcannon (cherry picked from commit 64224a4727321a8dd33e6f769edda401193ebef0) Co-authored-by: Gregory Szorc <gregory.szorc(a)gmail.com> files: A Misc/NEWS.d/next/C API/2020-05-01-17-28-04.bpo-40412.dE0D8N.rst M Python/import.c diff --git a/Misc/NEWS.d/next/C API/2020-05-01-17-28-04.bpo-40412.dE0D8N.rst b/Misc/NEWS.d/next/C API/2020-05-01-17-28-04.bpo-40412.dE0D8N.rst new file mode 100644 index 0000000000000..92bfcddf115a6 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2020-05-01-17-28-04.bpo-40412.dE0D8N.rst @@ -0,0 +1 @@ +Nullify inittab_copy during finalization, preventing future interpreter initializations in an embedded situation from crashing. Patch by Gregory Szorc. diff --git a/Python/import.c b/Python/import.c index 495012d1c7da6..b4074d1dfc3fa 100644 --- a/Python/import.c +++ b/Python/import.c @@ -300,6 +300,7 @@ _PyImport_Fini2(void) /* Free memory allocated by PyImport_ExtendInittab() */ PyMem_RawFree(inittab_copy); + inittab_copy = NULL; PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc); }

1 0

bpo-40334: use the TOKENS file when checking dangling rules (GH-19849)
by Pablo Galindo 01 May '20

01 May '20

https://github.com/python/cpython/commit/7ba08ff7b41911f972d0750e068a2270e0… commit: 7ba08ff7b41911f972d0750e068a2270e0dbd68f branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-05-01T23:14:12+01:00 summary: bpo-40334: use the TOKENS file when checking dangling rules (GH-19849) files: M Tools/peg_generator/pegen/build.py M Tools/peg_generator/pegen/c_generator.py M Tools/peg_generator/pegen/parser_generator.py M Tools/peg_generator/pegen/python_generator.py M Tools/peg_generator/pegen/testutil.py diff --git a/Tools/peg_generator/pegen/build.py b/Tools/peg_generator/pegen/build.py index d33dd049d63c7..907feeaf122de 100644 --- a/Tools/peg_generator/pegen/build.py +++ b/Tools/peg_generator/pegen/build.py @@ -17,6 +17,8 @@ MOD_DIR = pathlib.Path(__file__).resolve().parent +TokenDefinitions = Tuple[Dict[int, str], Dict[str, int], Set[str]] + def get_extra_flags(compiler_flags: str, compiler_py_flags_nodist: str) -> List[str]: flags = sysconfig.get_config_var(compiler_flags) @@ -112,7 +114,8 @@ def build_parser( return grammar, parser, tokenizer -def generate_token_definitions(tokens: IO[str]) -> Tuple[Dict[str, int], Set[str]]: +def generate_token_definitions(tokens: IO[str]) -> TokenDefinitions: + all_tokens = {} exact_tokens = {} non_exact_tokens = set() numbers = itertools.count(0) @@ -129,13 +132,15 @@ def generate_token_definitions(tokens: IO[str]) -> Tuple[Dict[str, int], Set[str if len(pieces) == 1: (token,) = pieces non_exact_tokens.add(token) + all_tokens[index] = token elif len(pieces) == 2: - _, op = pieces + token, op = pieces exact_tokens[op.strip("'")] = index + all_tokens[index] = token else: raise ValueError(f"Unexpected line found in Tokens file: {line}") - return exact_tokens, non_exact_tokens + return all_tokens, exact_tokens, non_exact_tokens def build_c_generator( @@ -149,10 +154,10 @@ def build_c_generator( skip_actions: bool = False, ) -> ParserGenerator: with open(tokens_file, "r") as tok_file: - exact_tok, non_exact_tok = generate_token_definitions(tok_file) + all_tokens, exact_tok, non_exact_tok = generate_token_definitions(tok_file) with open(output_file, "w") as file: gen: ParserGenerator = CParserGenerator( - grammar, exact_tok, non_exact_tok, file, skip_actions=skip_actions + grammar, all_tokens, exact_tok, non_exact_tok, file, skip_actions=skip_actions ) gen.generate(grammar_file) diff --git a/Tools/peg_generator/pegen/c_generator.py b/Tools/peg_generator/pegen/c_generator.py index 6c77f43991bbe..c9c67067d4677 100644 --- a/Tools/peg_generator/pegen/c_generator.py +++ b/Tools/peg_generator/pegen/c_generator.py @@ -265,13 +265,14 @@ class CParserGenerator(ParserGenerator, GrammarVisitor): def __init__( self, grammar: grammar.Grammar, + tokens: Dict[int, str], exact_tokens: Dict[str, int], non_exact_tokens: Set[str], file: Optional[IO[Text]], debug: bool = False, skip_actions: bool = False, ): - super().__init__(grammar, file) + super().__init__(grammar, tokens, file) self.callmakervisitor: CCallMakerVisitor = CCallMakerVisitor( self, exact_tokens, non_exact_tokens ) diff --git a/Tools/peg_generator/pegen/parser_generator.py b/Tools/peg_generator/pegen/parser_generator.py index b92df2267762d..03452510b9669 100644 --- a/Tools/peg_generator/pegen/parser_generator.py +++ b/Tools/peg_generator/pegen/parser_generator.py @@ -1,5 +1,4 @@ import contextlib -import token from abc import abstractmethod from typing import AbstractSet, Dict, IO, Iterator, List, Optional, Set, Text, Tuple @@ -19,11 +18,12 @@ class RuleCheckingVisitor(GrammarVisitor): - def __init__(self, rules: Dict[str, Rule]): + def __init__(self, rules: Dict[str, Rule], tokens: Dict[int, str]): self.rules = rules + self.tokens = tokens def visit_NameLeaf(self, node: NameLeaf) -> None: - if node.value not in self.rules and node.value not in token.tok_name.values(): + if node.value not in self.rules and node.value not in self.tokens.values(): # TODO: Add line/col info to (leaf) nodes raise GrammarError(f"Dangling reference to rule {node.value!r}") @@ -32,12 +32,13 @@ class ParserGenerator: callmakervisitor: GrammarVisitor - def __init__(self, grammar: Grammar, file: Optional[IO[Text]]): + def __init__(self, grammar: Grammar, tokens: Dict[int, str], file: Optional[IO[Text]]): self.grammar = grammar + self.tokens = tokens self.rules = grammar.rules if "trailer" not in grammar.metas and "start" not in self.rules: raise GrammarError("Grammar without a trailer must have a 'start' rule") - checker = RuleCheckingVisitor(self.rules) + checker = RuleCheckingVisitor(self.rules, self.tokens) for rule in self.rules.values(): checker.visit(rule) self.file = file diff --git a/Tools/peg_generator/pegen/python_generator.py b/Tools/peg_generator/pegen/python_generator.py index bde27890c15a6..64336552f24f6 100644 --- a/Tools/peg_generator/pegen/python_generator.py +++ b/Tools/peg_generator/pegen/python_generator.py @@ -1,3 +1,4 @@ +import token from typing import Any, Dict, Optional, IO, Text, Tuple from pegen.grammar import ( @@ -123,8 +124,13 @@ def visit_Cut(self, node: Cut) -> Tuple[str, str]: class PythonParserGenerator(ParserGenerator, GrammarVisitor): - def __init__(self, grammar: grammar.Grammar, file: Optional[IO[Text]]): - super().__init__(grammar, file) + def __init__( + self, + grammar: grammar.Grammar, + file: Optional[IO[Text]], + tokens: Dict[int, str] = token.tok_name, + ): + super().__init__(grammar, tokens, file) self.callmakervisitor = PythonCallMakerVisitor(self) def generate(self, filename: str) -> None: diff --git a/Tools/peg_generator/pegen/testutil.py b/Tools/peg_generator/pegen/testutil.py index 1f79d8f702fb1..264659e71768c 100644 --- a/Tools/peg_generator/pegen/testutil.py +++ b/Tools/peg_generator/pegen/testutil.py @@ -17,6 +17,7 @@ from pegen.python_generator import PythonParserGenerator from pegen.tokenizer import Tokenizer +ALL_TOKENS = token.tok_name EXACT_TOKENS = token.EXACT_TOKEN_TYPES # type: ignore NON_EXACT_TOKENS = { name for index, name in token.tok_name.items() if index not in EXACT_TOKENS.values() @@ -76,7 +77,7 @@ def import_file(full_name: str, path: str) -> Any: def generate_c_parser_source(grammar: Grammar) -> str: out = io.StringIO() - genr = CParserGenerator(grammar, EXACT_TOKENS, NON_EXACT_TOKENS, out) + genr = CParserGenerator(grammar, ALL_TOKENS, EXACT_TOKENS, NON_EXACT_TOKENS, out) genr.generate("<string>") return out.getvalue() @@ -96,7 +97,9 @@ def generate_parser_c_extension( assert not os.listdir(path) source = path / "parse.c" with open(source, "w") as file: - genr = CParserGenerator(grammar, EXACT_TOKENS, NON_EXACT_TOKENS, file, debug=debug) + genr = CParserGenerator( + grammar, ALL_TOKENS, EXACT_TOKENS, NON_EXACT_TOKENS, file, debug=debug + ) genr.generate("parse.c") compile_c_extension(str(source), build_dir=str(path))

1 0

Fix the Tools/peg_generator/scripts/benchmark.py script (GH-19848)
by Pablo Galindo 01 May '20

01 May '20

https://github.com/python/cpython/commit/6bd99d5f002f1cfcc3a975e87684c52384… commit: 6bd99d5f002f1cfcc3a975e87684c5238490644a branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-05-01T22:33:54+01:00 summary: Fix the Tools/peg_generator/scripts/benchmark.py script (GH-19848) files: M Tools/peg_generator/pegen/build.py M Tools/peg_generator/scripts/benchmark.py diff --git a/Tools/peg_generator/pegen/build.py b/Tools/peg_generator/pegen/build.py index 94248ffd9431c..d33dd049d63c7 100644 --- a/Tools/peg_generator/pegen/build.py +++ b/Tools/peg_generator/pegen/build.py @@ -15,7 +15,7 @@ from pegen.python_generator import PythonParserGenerator from pegen.tokenizer import Tokenizer -MOD_DIR = pathlib.Path(__file__).parent +MOD_DIR = pathlib.Path(__file__).resolve().parent def get_extra_flags(compiler_flags: str, compiler_py_flags_nodist: str) -> List[str]: diff --git a/Tools/peg_generator/scripts/benchmark.py b/Tools/peg_generator/scripts/benchmark.py index bc751156e8972..6b4287cd8cecc 100644 --- a/Tools/peg_generator/scripts/benchmark.py +++ b/Tools/peg_generator/scripts/benchmark.py @@ -11,7 +11,7 @@ sys.path.insert(0, os.getcwd()) from peg_extension import parse -from pegen.build import build_parser_and_generator +from pegen.build import build_c_parser_and_generator from scripts.test_parse_directory import parse_directory argparser = argparse.ArgumentParser( @@ -93,8 +93,9 @@ def run_benchmark_stdlib(subcommand, parser): modes = {"compile": 2, "parse": 1, "check": 0} extension = None if parser == "pegen": - extension = build_parser_and_generator( + extension = build_c_parser_and_generator( "../../Grammar/python.gram", + "../../Grammar/Tokens", "peg_extension/parse.c", compile_extension=True, skip_actions=False,

1 0

[3.8] bpo-39435: Fix docs for pickle.loads (GH-18160) (GH-19843)
by Antoine Pitrou 01 May '20

01 May '20

https://github.com/python/cpython/commit/e05828055e5165cc7268ea3bea33adc502… commit: e05828055e5165cc7268ea3bea33adc502e054a1 branch: 3.8 author: Antoine Pitrou <antoine(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-05-01T12:54:44-07:00 summary: [3.8] bpo-39435: Fix docs for pickle.loads (GH-18160) (GH-19843) (cherry picked from commit 289842a) Co-authored-by: Shantanu <hauntsaninja(a)users.noreply.github.com> Automerge-Triggered-By: @pitrou files: A Misc/NEWS.d/next/Documentation/2020-01-24-05-42-57.bpo-39435.EFcdFU.rst M Doc/library/pickle.rst M Misc/ACKS diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst index a7b92bb9538d9..d92e947a76403 100644 --- a/Doc/library/pickle.rst +++ b/Doc/library/pickle.rst @@ -252,10 +252,10 @@ process more convenient: .. versionchanged:: 3.8 The *buffers* argument was added. -.. function:: loads(bytes_object, \*, fix_imports=True, encoding="ASCII", errors="strict", buffers=None) +.. function:: loads(data, \*, fix_imports=True, encoding="ASCII", errors="strict", buffers=None) Return the reconstituted object hierarchy of the pickled representation - *bytes_object* of an object. + *data* of an object. *data* must be a :term:`bytes-like object`. The protocol version of the pickle is detected automatically, so no protocol argument is needed. Bytes past the pickled representation diff --git a/Misc/ACKS b/Misc/ACKS index 9d8c0f9a48626..34a6fc439e89c 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -769,6 +769,7 @@ Manuel Jacob David Jacobs Kevin Jacobs Kjetil Jacobsen +Shantanu Jain Bertrand Janin Geert Jansen Jack Jansen diff --git a/Misc/NEWS.d/next/Documentation/2020-01-24-05-42-57.bpo-39435.EFcdFU.rst b/Misc/NEWS.d/next/Documentation/2020-01-24-05-42-57.bpo-39435.EFcdFU.rst new file mode 100644 index 0000000000000..40294c10df00a --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-01-24-05-42-57.bpo-39435.EFcdFU.rst @@ -0,0 +1 @@ +Fix an incorrect signature for :func:`pickle.loads` in the docs \ No newline at end of file

1 0

[3.7] bpo-39435: Fix docs for pickle.loads (GH-18160). (GH-19844)
by Antoine Pitrou 01 May '20

01 May '20

https://github.com/python/cpython/commit/3859b1ac1d7014f8ff673962d94a01a408… commit: 3859b1ac1d7014f8ff673962d94a01a408546e24 branch: 3.7 author: Antoine Pitrou <antoine(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-05-01T12:53:35-07:00 summary: [3.7] bpo-39435: Fix docs for pickle.loads (GH-18160). (GH-19844) (cherry picked from commit 289842ae820f99908d3a345f1f3b6d4e5b4b97fc) Co-authored-by: Shantanu <hauntsaninja(a)users.noreply.github.com> Automerge-Triggered-By: @pitrou files: A Misc/NEWS.d/next/Documentation/2020-01-24-05-42-57.bpo-39435.EFcdFU.rst M Doc/library/pickle.rst M Misc/ACKS diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst index d638944756e7a..25044899f242a 100644 --- a/Doc/library/pickle.rst +++ b/Doc/library/pickle.rst @@ -242,10 +242,10 @@ process more convenient: instances of :class:`~datetime.datetime`, :class:`~datetime.date` and :class:`~datetime.time` pickled by Python 2. -.. function:: loads(bytes_object, \*, fix_imports=True, encoding="ASCII", errors="strict") +.. function:: loads(data, \*, fix_imports=True, encoding="ASCII", errors="strict") Return the reconstituted object hierarchy of the pickled representation - *bytes_object* of an object. + *data* of an object. *data* must be a :term:`bytes-like object`. The protocol version of the pickle is detected automatically, so no protocol argument is needed. Bytes past the pickled representation diff --git a/Misc/ACKS b/Misc/ACKS index 27ef39754afd9..ce269edbd51bf 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -746,6 +746,7 @@ Manuel Jacob David Jacobs Kevin Jacobs Kjetil Jacobsen +Shantanu Jain Bertrand Janin Geert Jansen Jack Jansen diff --git a/Misc/NEWS.d/next/Documentation/2020-01-24-05-42-57.bpo-39435.EFcdFU.rst b/Misc/NEWS.d/next/Documentation/2020-01-24-05-42-57.bpo-39435.EFcdFU.rst new file mode 100644 index 0000000000000..40294c10df00a --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-01-24-05-42-57.bpo-39435.EFcdFU.rst @@ -0,0 +1 @@ +Fix an incorrect signature for :func:`pickle.loads` in the docs \ No newline at end of file

1 0

bpo-39435: Fix docs for pickle.loads (GH-18160)
by Shantanu 01 May '20

01 May '20

https://github.com/python/cpython/commit/289842ae820f99908d3a345f1f3b6d4e5b… commit: 289842ae820f99908d3a345f1f3b6d4e5b4b97fc branch: master author: Shantanu <hauntsaninja(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-05-01T12:46:01-07:00 summary: bpo-39435: Fix docs for pickle.loads (GH-18160) files: A Misc/NEWS.d/next/Documentation/2020-01-24-05-42-57.bpo-39435.EFcdFU.rst M Doc/library/pickle.rst M Misc/ACKS diff --git a/Doc/library/pickle.rst b/Doc/library/pickle.rst index a7b92bb9538d9..d92e947a76403 100644 --- a/Doc/library/pickle.rst +++ b/Doc/library/pickle.rst @@ -252,10 +252,10 @@ process more convenient: .. versionchanged:: 3.8 The *buffers* argument was added. -.. function:: loads(bytes_object, \*, fix_imports=True, encoding="ASCII", errors="strict", buffers=None) +.. function:: loads(data, \*, fix_imports=True, encoding="ASCII", errors="strict", buffers=None) Return the reconstituted object hierarchy of the pickled representation - *bytes_object* of an object. + *data* of an object. *data* must be a :term:`bytes-like object`. The protocol version of the pickle is detected automatically, so no protocol argument is needed. Bytes past the pickled representation diff --git a/Misc/ACKS b/Misc/ACKS index 21822dd7524cf..9221f6aae439e 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -790,6 +790,7 @@ Manuel Jacob David Jacobs Kevin Jacobs Kjetil Jacobsen +Shantanu Jain Bertrand Janin Geert Jansen Jack Jansen diff --git a/Misc/NEWS.d/next/Documentation/2020-01-24-05-42-57.bpo-39435.EFcdFU.rst b/Misc/NEWS.d/next/Documentation/2020-01-24-05-42-57.bpo-39435.EFcdFU.rst new file mode 100644 index 0000000000000..40294c10df00a --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2020-01-24-05-42-57.bpo-39435.EFcdFU.rst @@ -0,0 +1 @@ +Fix an incorrect signature for :func:`pickle.loads` in the docs \ No newline at end of file

1 0

bpo-40412: Nullify inittab_copy during finalization (GH-19746)
by Gregory Szorc 01 May '20

01 May '20

https://github.com/python/cpython/commit/64224a4727321a8dd33e6f769edda40119… commit: 64224a4727321a8dd33e6f769edda401193ebef0 branch: master author: Gregory Szorc <gregory.szorc(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-05-01T11:07:54-07:00 summary: bpo-40412: Nullify inittab_copy during finalization (GH-19746) Otherwise we leave a dangling pointer to free'd memory. If we then initialize a new interpreter in the same process and call PyImport_ExtendInittab, we will (likely) crash when calling PyMem_RawRealloc(inittab_copy, ...) since the pointer address is bogus. Automerge-Triggered-By: @brettcannon files: A Misc/NEWS.d/next/C API/2020-05-01-17-28-04.bpo-40412.dE0D8N.rst M Python/import.c diff --git a/Misc/NEWS.d/next/C API/2020-05-01-17-28-04.bpo-40412.dE0D8N.rst b/Misc/NEWS.d/next/C API/2020-05-01-17-28-04.bpo-40412.dE0D8N.rst new file mode 100644 index 0000000000000..92bfcddf115a6 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2020-05-01-17-28-04.bpo-40412.dE0D8N.rst @@ -0,0 +1 @@ +Nullify inittab_copy during finalization, preventing future interpreter initializations in an embedded situation from crashing. Patch by Gregory Szorc. diff --git a/Python/import.c b/Python/import.c index 8c94e0ec54655..400b02abbdba0 100644 --- a/Python/import.c +++ b/Python/import.c @@ -298,6 +298,7 @@ _PyImport_Fini2(void) /* Free memory allocated by PyImport_ExtendInittab() */ PyMem_RawFree(inittab_copy); + inittab_copy = NULL; PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc); }

1 0

bpo-39691: Clarify io.open_code behavior (GH-19824)
by Miss Islington (bot) 01 May '20

01 May '20

https://github.com/python/cpython/commit/c9d7d32b6dc6140f7fcbf1ae1120df6d59… commit: c9d7d32b6dc6140f7fcbf1ae1120df6d59fc28d0 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-05-01T11:04:25-07:00 summary: bpo-39691: Clarify io.open_code behavior (GH-19824) (cherry picked from commit 831d58d7865cb98fa09227dc614f4f3ce6af968b) Co-authored-by: Shantanu <hauntsaninja(a)users.noreply.github.com> files: M Doc/library/io.rst diff --git a/Doc/library/io.rst b/Doc/library/io.rst index 70e01153d4196..32151a0ace458 100644 --- a/Doc/library/io.rst +++ b/Doc/library/io.rst @@ -132,12 +132,13 @@ High-level Module Interface Opens the provided file with mode ``'rb'``. This function should be used when the intent is to treat the contents as executable code. - ``path`` should be an absolute path. + ``path`` should be a :class:`str` and an absolute path. The behavior of this function may be overridden by an earlier call to the - :c:func:`PyFile_SetOpenCodeHook`, however, it should always be considered - interchangeable with ``open(path, 'rb')``. Overriding the behavior is - intended for additional validation or preprocessing of the file. + :c:func:`PyFile_SetOpenCodeHook`. However, assuming that ``path`` is a + :class:`str` and an absolute path, ``open_code(path)`` should always behave + the same as ``open(path, 'rb')``. Overriding the behavior is intended for + additional validation or preprocessing of the file. .. versionadded:: 3.8

1 0