bpo-40355: ast.literal_eval rejects malformed Dict nodes #19868

curtisbucher · 2020-05-02T21:48:11Z

This doesn't fix ast.unparse.

https://bugs.python.org/issue40355

remilapeyre

Hi @curtisbucher, the patch looks appropriate but if the length must be known it seems to me like you need to make sure that keys and values are actual sequences and not just iterables, this used to work but now doesn't:

from ast import Constant, Dict, literal_eval, unparse
keys = iter([Constant('a')])
values = iter([Constant('b')])
nasty_dict = Dict(keys=keys, values=values)
literal_eval(nasty_dict)

Here's the difference between 3.8 and this patch:

➜  cpython git:(bpo-40355) python3
Python 3.8.2 (v3.8.2:7b3ab5921f, Feb 24 2020, 17:52:18) 
[Clang 6.0 (clang-600.0.57)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
>>> from ast import Constant, Dict, literal_eval, unparse
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
ImportError: cannot import name 'unparse' from 'ast' (/Library/Frameworks/Python.framework/Versions/3.8/lib/python3.8/ast.py)
>>> keys = iter([Constant('a')])
>>> values = iter([Constant('b')])
>>> nasty_dict = Dict(keys=keys, values=values)
>>> literal_eval(nasty_dict)
{'a': 'b'}
>>> ^D
➜  cpython git:(bpo-40355) ./python
Python 3.9.0a6+ (heads/bpo-40355:36eb5b8c4b, May  2 2020, 23:57:18) 
[Clang 11.0.3 (clang-1103.0.32.29)] on darwin
Type "help", "copyright", "credits" or "license" for more information.
>>> from ast import Constant, Dict, literal_eval, unparse
>>> keys = iter([Constant('a')])
>>> values = iter([Constant('b')])
>>> nasty_dict = Dict(keys=keys, values=values)
>>> literal_eval(nasty_dict)
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "/Users/remi/src/cpython/Lib/ast.py", line 104, in literal_eval
    return _convert(node_or_string)
  File "/Users/remi/src/cpython/Lib/ast.py", line 91, in _convert
    if len(node.keys) != len(node.values):
TypeError: object of type 'list_iterator' has no len()
>>> ^D

brandtbucher · 2020-05-02T22:16:31Z

...this used to work but now doesn't:

Hm, this seems like a somewhat unusual pattern. Any examples out in the wild of clients generating ASTs with consumable iterators of children?

Either way, I agree that it's easy enough to be defensive here, so we might as well.

brandtbucher · 2020-05-02T22:19:07Z

Lib/ast.py

+            if len(node.keys) != len(node.values):
+                raise ValueError(f'malformed node or string: {node!r}')
            return dict(zip(map(_convert, node.keys),
                            map(_convert, node.values)))


Collecting node.keys and node.values into lists should be fine:

Suggested change

if len(node.keys) != len(node.values):

raise ValueError(f'malformed node or string: {node!r}')

return dict(zip(map(_convert, node.keys),

map(_convert, node.values)))

keys, values = list(node.keys), list(node.values)

if len(keys) != len(values):

raise ValueError(f'malformed node or string: {node!r}')

return dict(zip(map(_convert, keys),

map(_convert, values)))

isidentical · 2020-05-03T10:31:58Z

the patch looks appropriate but if the length must be known it seems to me like you need to make sure that keys and values are actual sequences and not just iterables

I disagree. That was a side effect which used to work, and now it isn't. keys and values are defined as an asdl sequence, and that corresponds to list type in python. IMHO we should just assume those are lists and do our work.

remilapeyre · 2020-05-03T10:54:02Z

IMHO we should just assume those are lists and do our work.

I would have expected it to raise ValueError on initilization then. Should this be changed or we just suppose that nobody would do that?

isidentical · 2020-05-03T11:51:05Z

I would have expected it to raise ValueError on initilization then.

Well it is not possible to raise ValueError on all invalid cases, at least without putting everything inside of a big try/except block and raising ValueError from given error. A simple example would be evaluating something like evaluating List(Constant(1))...

isidentical · 2020-05-03T12:05:44Z

@remilapeyre by the way, you can check out this issue to see all possible errors that can be raised from ast.literal_eval https://bugs.python.org/issue39159

remilapeyre · 2020-05-03T14:00:28Z

Oh thanks, I get it now. Indeed there is not much improvement to just check for that. Thanks for the explanantion @isidentical, sorry for the useless noise @brandtbucher.

isidentical

It looks good, but I'd prefer not having 2 same raise statements. Because it might be change in the future and changing both of them seems unreasonable so IMHO it would be cool to create a subfunction called malformed() or invalid() inside of literal_eval and raise from it.

Abstracted calling ValueError in ast.py

brandtbucher

Looks good, thanks!

brandtbucher · 2020-05-05T18:10:33Z

@pablogsal, does this look good to you?

pablogsal · 2020-05-05T18:32:52Z

Lib/ast.py

        if isinstance(node, Constant):
            if type(node.value) in (int, float, complex):
                return node.value
-        raise ValueError('malformed node or string: ' + repr(node))
+        _malformed(node)


Suggestion: I suppose at this point we can invert the check to make the intent a bit more clear:

if not isinstance(node, Constant) or type(node.value) not in (int, float, complex): _raise_malformed_node(node) return node.value

pablogsal · 2020-05-05T18:33:37Z

Lib/ast.py

@@ -62,11 +62,13 @@ def literal_eval(node_or_string):
        node_or_string = parse(node_or_string, mode='eval')
    if isinstance(node_or_string, Expression):
        node_or_string = node_or_string.body
+    def _malformed(node):


Please, call this function with a verb, not a noun. Finding malformed in the middle of the code is a bit surprising compared with report_malformed_node or raise_malformed_exception or something similar.

Misc/NEWS.d/next/Library/2020-05-02-14-24-48.bpo-40355.xTujaB.rst

pablogsal · 2020-05-05T18:37:53Z

Lib/test/test_ast.py

@@ -965,6 +965,12 @@ def test_literal_eval_complex(self):
        self.assertRaises(ValueError, ast.literal_eval, '3+(0+6j)')
        self.assertRaises(ValueError, ast.literal_eval, '-(3+6j)')

+    def test_literal_eval_malformed(self):


I find this name is too generic. Maybe test_literal_eval_malformed_dict_nodes ?

bedevere-bot · 2020-05-05T18:38:01Z

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

pablogsal · 2020-05-05T18:38:55Z

@pablogsal, does this look good to you?

Thanks for pinging me :)

I left some comments but in general LGTM

@isidentical Could you check again the PR also to see if looks good to you as well?

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>

Address requested changes.

into astliteraleval

pablogsal

LGTM

pablogsal · 2020-05-05T19:06:56Z

Thanks, @curtisbucher, for the quick turnaround!

isidentical

Looks great, thanks @curtisbucher

miss-islington · 2020-05-05T19:41:00Z

Thanks @curtisbucher for the PR, and @pablogsal for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8.
🐍🍒⛏🤖

bedevere-bot · 2020-05-05T19:41:12Z

GH-19947 is a backport of this pull request to the 3.8 branch.

miss-islington · 2020-05-05T19:41:14Z

Sorry, @curtisbucher and @pablogsal, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker c21c51235aa8061da6b0593d6f857f42fd92fd8b 3.7

…Dict nodes (pythonGH-19868) Co-authored-by: Pablo Galindo <Pablogsal@gmail.com> (cherry picked from commit c21c512) Co-authored-by: Curtis Bucher <cpbucher5@gmail.com>

pablogsal · 2020-05-05T19:41:38Z

Thanks for the PR @curtisbucher ! 🎉

pablogsal · 2020-05-05T19:42:24Z

Hummm, seems that the backport to 3.7 failed? @curtisbucher could you follow @miss-islington instructions to do the manual backport? Ping me there so I can merge it

pablogsal · 2020-05-05T19:44:04Z

Actually....is this something we should backport? This can break some code in 3.8 and 3.7 that was previously working (somehow incorrectly). Not sure if is worth the trouble....

pablogsal · 2020-05-05T19:44:18Z

@brandtbucher @isidentical opinions?

isidentical · 2020-05-05T19:48:43Z

Not sure if is worth the trouble....

Agreed. IMHO it is an improvement rather then a bugfix, so we may skip backporting.

…Dict nodes (GH-19868) Co-authored-by: Pablo Galindo <Pablogsal@gmail.com> (cherry picked from commit c21c512) Co-authored-by: Curtis Bucher <cpbucher5@gmail.com>

@gvanrossum

* Update docs. * bpo-40513: Per-interpreter signals pending (GH-19924) Move signals_pending from _PyRuntime.ceval to PyInterpreterState.ceval. * bpo-40513: Per-interpreter gil_drop_request (GH-19927) Move gil_drop_request member from _PyRuntimeState.ceval to PyInterpreterState.ceval. * bpo-40514: Add --with-experimental-isolated-subinterpreters (GH-19926) Add --with-experimental-isolated-subinterpreters build option to configure: better isolate subinterpreters, experimental build mode. When used, force the usage of the libc malloc() memory allocator, since pymalloc relies on the unique global interpreter lock (GIL). * bpo-32117: Updated Simpsons names in docs (GH-19737) `sally` is not a Simpsons character Automerge-Triggered-By: @gvanrossum * bpo-40513: Per-interpreter recursion_limit (GH-19929) Move recursion_limit member from _PyRuntimeState.ceval to PyInterpreterState.ceval. * Py_SetRecursionLimit() now only sets _Py_CheckRecursionLimit of ceval.c if the current Python thread is part of the main interpreter. * Inline _Py_MakeEndRecCheck() into _Py_LeaveRecursiveCall(). * Convert _Py_RecursionLimitLowerWaterMark() macro into a static inline function. * bpo-29587: _PyErr_ChainExceptions() checks exception (GH-19902) _PyErr_ChainExceptions() now ensures that the first parameter is an exception type, as done by _PyErr_SetObject(). * The following function now check PyExceptionInstance_Check() in an assertion using a new _PyBaseExceptionObject_cast() helper function: * PyException_GetTraceback(), PyException_SetTraceback() * PyException_GetCause(), PyException_SetCause() * PyException_GetContext(), PyException_SetContext() * PyExceptionClass_Name() now checks PyExceptionClass_Check() with an assertion. * Remove XXX comment and add gi_exc_state variable to _gen_throw(). * Remove comment from test_generators * bpo-40520: Remove redundant comment in pydebug.h (GH-19931) Automerge-Triggered-By: @corona10 * Revert "bpo-40513: Per-interpreter signals pending (GH-19924)" (GH-19932) This reverts commit 4e01946. * bpo-40521: Disable Unicode caches in isolated subinterpreters (GH-19933) When Python is built in the experimental isolated subinterpreters mode, disable Unicode singletons and Unicode interned strings since they are shared by all interpreters. Temporary workaround until these caches are made per-interpreter. * bpo-40458: Increase reserved stack space to prevent overflow crash on Windows (GH-19845) * bpo-40521: Disable free lists in subinterpreters (GH-19937) When Python is built with experimental isolated interpreters, disable tuple, dict and free free lists. Temporary workaround until these caches are made per-interpreter. Add frame_alloc() and frame_get_builtins() subfunctions to simplify _PyFrame_New_NoTrack(). * bpo-40522: _PyThreadState_Swap() sets autoTSSkey (GH-19939) In the experimental isolated subinterpreters build mode, _PyThreadState_GET() gets the autoTSSkey variable and _PyThreadState_Swap() sets the autoTSSkey variable. * Add _PyThreadState_GetTSS() * _PyRuntimeState_GetThreadState() and _PyThreadState_GET() return _PyThreadState_GetTSS() * PyEval_SaveThread() sets the autoTSSkey variable to current Python thread state rather than NULL. * eval_frame_handle_pending() doesn't check that _PyThreadState_Swap() result is NULL. * _PyThreadState_Swap() gets the current Python thread state with _PyThreadState_GetTSS() rather than _PyRuntimeGILState_GetThreadState(). * PyGILState_Ensure() no longer checks _PyEval_ThreadsInitialized() since it cannot access the current interpreter. * bpo-40513: new_interpreter() init GIL earlier (GH-19942) Fix also code to handle init_interp_main() failure. * bpo-40513: Per-interpreter GIL (GH-19943) In the experimental isolated subinterpreters build mode, the GIL is now per-interpreter. Move gil from _PyRuntimeState.ceval to PyInterpreterState.ceval. new_interpreter() always get the config from the main interpreter. * bpo-40513: _xxsubinterpreters.run_string() releases the GIL (GH-19944) In the experimental isolated subinterpreters build mode, _xxsubinterpreters.run_string() now releases the GIL. * bpo-40355: Improve error messages in ast.literal_eval with malformed Dict nodes (GH-19868) Co-authored-by: Pablo Galindo <Pablogsal@gmail.com> * bpo-40504: Allow weakrefs to lru_cache objects (GH-19938) * bpo-40523: Add pass-throughs for hash() and reversed() to weakref.proxy objects (GH-19946) * bpo-40480 "fnmatch" exponential execution time (GH-19908) bpo-40480: create different regexps in the presence of multiple `*` patterns to prevent fnmatch() from taking exponential time. * bpo-40517: Implement syntax highlighting support for ASDL (#19928) * Revert "bpo-40517: Implement syntax highlighting support for ASDL (#19928)" (#19950) This reverts commit d60040b. * bpo-40527: Fix command line argument parsing (GH-19955) * bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952) * bpo-40521: Disable method cache in subinterpreters (GH-19960) When Python is built with experimental isolated interpreters, disable the type method cache. Temporary workaround until the cache is made per-interpreter. * bpo-40533: Disable GC in subinterpreters (GH-19961) When Python is built with experimental isolated interpreters, a garbage collection now does nothing in an isolated interpreter. Temporary workaround until subinterpreters stop sharing Python objects. * bpo-40521: Disable list free list in subinterpreters (GH-19959) When Python is built with experimental isolated interpreters, disable the list free list. Temporary workaround until this cache is made per-interpreter. * bpo-40334: Add type to the assignment rule in the grammar file (GH-19963) * Fix typo in sqlite3 documentation (GH-19965) *first* is repeated twice. * bpo-40334: Allow trailing comma in parenthesised context managers (GH-19964) * bpo-40334: Generate comments in the parser code to improve debugging (GH-19966) * bpo-40397: Refactor typing._GenericAlias (GH-19719) Make the design more object-oriented. Split _GenericAlias on two almost independent classes: for special generic aliases like List and for parametrized generic aliases like List[int]. Add specialized subclasses for Callable, Callable[...], Tuple and Union[...]. * bpo-1635741: Port errno module to multiphase initialization (GH-19923) * bpo-40334: Fix error location upon parsing an invalid string literal (GH-19962) When parsing a string with an invalid escape, the old parser used to point to the beginning of the invalid string. This commit changes the new parser to match that behaviour, since it's currently pointing to the end of the string (or to be more precise, to the beginning of the next token). * bpo-40334: Error message for invalid default args in function call (GH-19973) When parsing something like `f(g()=2)`, where the name of a default arg is not a NAME, but an arbitrary expression, a specialised error message is emitted. * bpo-38787: C API for module state access from extension methods (PEP 573) (GH-19936) Module C state is now accessible from C-defined heap type methods (PEP 573). Patch by Marcel Plch and Petr Viktorin. Co-authored-by: Marcel Plch <mplch@redhat.com> Co-authored-by: Victor Stinner <vstinner@python.org> * bpo-40545: Export _PyErr_GetTopmostException() function (GH-19978) Declare _PyErr_GetTopmostException() with PyAPI_FUNC() to properly export the function in the C API. The function remains private ("_Py") prefix. Co-Authored-By: Julien Danjou <julien@danjou.info> * bpo-32604: [_xxsubinterpreters] Propagate exceptions. (GH-19768) (Note: PEP 554 is not accepted and the implementation in the code base is a private one for use in the test suite.) If code running in a subinterpreter raises an uncaught exception then the "run" call in the calling interpreter fails. A RunFailedError is raised there that summarizes the original exception as a string. The actual exception type, __cause__, __context__, state, etc. are all discarded. This turned out to be functionally insufficient in practice. There is a more helpful solution (and PEP 554 has been updated appropriately). This change adds the exception propagation behavior described in PEP 554 to the _xxsubinterpreters module. With this change a copy of the original exception is set to __cause__ on the RunFailedError. For now we are using "pickle", which preserves the exception's state. We also preserve the original __cause__, __context__, and __traceback__ (since "pickle" does not preserve those). https://bugs.python.org/issue32604 * bpo-38787: Update structures.rst docs (PEP 573) (GH-19980) * bpo-40548: Always run GitHub action, even on doc PRs (GH-19981) Always run GitHub action jobs, even on documentation-only pull requests. So it will be possible to make a GitHub action job, like the Windows (64-bit) job, mandatory. * bpo-40517: Implement syntax highlighting support for ASDL (GH-19967) * bpo-40555: Check for p->error_indicator in loop rules after the main loop is done (GH-19986) * bpo-40273: Reversible mappingproxy (FH-19513) * bpo-40559: Add Py_DECREF to _asynciomodule.c:task_step_impl() (GH-19990) This fixes a possible memory leak in the C implementation of asyncio.Task. * Make the first dataclass example more useful (GH-19994) * bpo-40541: Add optional *counts* parameter to random.sample() (GH-19970) * bpo-40502: Initialize n->n_col_offset (GH-19988) * initialize n->n_col_offset * 📜🤖 Added by blurb_it. * Move initialization Co-authored-by: nanjekyejoannah <joannah.nanjekye@ibm.com> Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> * bpo-39791: Add files() to importlib.resources (GH-19722) * bpo-39791: Update importlib.resources to support files() API (importlib_resources 1.5). * 📜🤖 Added by blurb_it. * Add some documentation about the new objects added. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> * bpo-40566: Apply PEP 573 to abc module (GH-20005) * bpo-40570: Improve compatibility of uname_result with late-bound .platform (#20015) * bpo-40570: Improve compatibility of uname_result with late-bound .platform. * Add test capturing ability to cast uname to a tuple. * bpo-40334: Avoid collisions between parser variables and grammar variables (GH-19987) This is for the C generator: - Disallow rule and variable names starting with `_` - Rename most local variable names generated by the parser to start with `_` Exceptions: - Renaming `p` to `_p` will be a separate PR - There are still some names that might clash, e.g. - anything starting with `Py` - C reserved words (`if` etc.) - Macros like `EXTRA` and `CHECK` * Add link to Enum class (GH-19884) * bpo-40397: Remove __args__ and __parameters__ from _SpecialGenericAlias (GH-19984) * bpo-40549: Convert posixmodule.c to multiphase init (GH-19982) Convert posixmodule.c ("posix" or "nt" module) to the multiphase initialization (PEP 489). * Create the module using PyModuleDef_Init(). * Create ScandirIteratorType and DirEntryType with the new PyType_FromModuleAndSpec() (PEP 573) * Get the module state from ScandirIteratorType and DirEntryType with the new PyType_GetModule() (PEP 573) * Pass module to functions which access the module state. * convert_sched_param() gets a new module parameter. It is now called directly since Argument Clinic doesn't support passing the module to an argument converter callback. * Remove _posixstate_global macro. * bpo-37986: Improve perfomance of PyLong_FromDouble() (GH-15611) * bpo-37986: Improve perfomance of PyLong_FromDouble() * Use strict bound check for safety and symmetry * Remove possibly outdated performance claims Co-authored-by: Mark Dickinson <dickinsm@gmail.com> * bpo-40397: Fix subscription of nested generic alias without parameters. (GH-20021) * bpo-40257: Tweak docstrings for special generic aliases. (GH-20022) * Add the terminating period. * Omit module name for builtin types. * Improve code clarity for the set lookup logic (GH-20028) * bpo-40585: Normalize errors messages in codeop when comparing them (GH-20030) With the new parser, the error message contains always the trailing newlines, causing the comparison of the repr of the error messages in codeop to fail. This commit makes the new parser mirror the old parser's behaviour regarding trailing newlines. * bpo-40575: Avoid unnecessary overhead in _PyDict_GetItemIdWithError() (GH-20018) Avoid unnecessary overhead in _PyDict_GetItemIdWithError() by calling _PyDict_GetItem_KnownHash() instead of the more generic PyDict_GetItemWithError(), since we already know the hash of interned strings. * bpo-36346: array: Don't use deprecated APIs (GH-19653) * Py_UNICODE -> wchar_t * Py_UNICODE -> unicode in Argument Clinic * PyUnicode_AsUnicode -> PyUnicode_AsWideCharString * Don't use "u#" format. Co-authored-by: Victor Stinner <vstinner@python.org> * bpo-40561: Add docstrings for webbrowser open functions (GH-19999) Co-authored-by: Brad Solomon <brsolomon@deloitte.com> Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> * bpo-40584: Update PyType_FromModuleAndSpec() to process tp_vectorcall_offset (GH-20026) * bpo-40334: produce specialized errors for invalid del targets (GH-19911) * bpo-39465: Don't access directly _Py_Identifier members (GH-20043) * Replace id->object with _PyUnicode_FromId(&id) * Use _Py_static_string_init(str) macro to initialize statically name_op in typeobject.c. * bpo-40571: Make lru_cache(maxsize=None) more discoverable (GH-20019) * bpo-40602: Rename hashtable.h to pycore_hashtable.h (GH-20044) * Move Modules/hashtable.h to Include/internal/pycore_hashtable.h * Move Modules/hashtable.c to Python/hashtable.c * Python is now linked to hashtable.c. _tracemalloc is no longer linked to hashtable.c. Previously, marshal.c got hashtable.c via _tracemalloc.c which is built as a builtin module. * bpo-40602: _Py_hashtable_new() uses PyMem_Malloc() (GH-20046) _Py_hashtable_new() now uses PyMem_Malloc/PyMem_Free allocator by default, rather than PyMem_RawMalloc/PyMem_RawFree. PyMem_Malloc is faster than PyMem_RawMalloc for memory blocks smaller than or equal to 512 bytes. * bpo-40480: restore ability to join fnmatch.translate() results (GH-20049) In translate(), generate unique group names across calls. The restores the undocumented ability to get a valid regexp by joining multiple translate() results via `|`. * bpo-39481: remove generic classes from ipaddress/mmap (GH-20045) These were added by mistake (see https://bugs.python.org/issue39481#msg366288). * bpo-40593: Improve syntax errors for invalid characters in source code. (GH-20033) * bpo-40602: Optimize _Py_hashtable for pointer keys (GH-20051) Optimize _Py_hashtable_get() and _Py_hashtable_get_entry() for pointer keys: * key_size == sizeof(void*) * hash_func == _Py_hashtable_hash_ptr * compare_func == _Py_hashtable_compare_direct Changes: * Add get_func and get_entry_func members to _Py_hashtable_t * Convert _Py_hashtable_get() and _Py_hashtable_get_entry() functions to static nline functions. * Add specialized get and get entry for pointer keys. * bpo-40596: Fix str.isidentifier() for non-canonicalized strings containing non-BMP characters on Windows. (GH-20053) * bpo-38787: Add PyCFunction_CheckExact() macro for exact type checks (GH-20024) … now that we allow subtypes of PyCFunction. Also add PyCMethod_CheckExact() and PyCMethod_Check() for checks against the PyCMethod subtype. * bpo-40602: Add _Py_HashPointerRaw() function (GH-20056) Add a new _Py_HashPointerRaw() function which avoids replacing -1 with -2 to micro-optimize hash table using pointer keys: using _Py_hashtable_hash_ptr() hash function. * bpo-40501: Replace ctypes code in uuid with native module (GH-19948) * Fix Wikipedia link (GH-20031) * bpo-40609: Rewrite how _tracemalloc handles domains (GH-20059) Rewrite how the _tracemalloc module stores traces of other domains. Rather than storing the domain inside the key, it now uses a new hash table with the domain as the key, and the data is a per-domain traces hash table. * Add tracemalloc_domain hash table. * Remove _Py_tracemalloc_config.use_domain. * Remove pointer_t and related functions. * bpo-40609: Remove _Py_hashtable_t.key_size (GH-20060) Rewrite _Py_hashtable_t type to always store the key as a "const void *" pointer. Add an explicit "key" member to _Py_hashtable_entry_t. Remove _Py_hashtable_t.key_size member. hash and compare functions drop their hash table parameter, and their 'key' parameter type becomes "const void *". * bpo-40609: Add destroy functions to _Py_hashtable (GH-20062) Add key_destroy_func and value_destroy_func parameters to _Py_hashtable_new_full(). marshal.c and _tracemalloc.c use these destroy functions. * bpo-40609: _tracemalloc allocates traces (GH-20064) Rewrite _tracemalloc to store "trace_t*" rather than directly "trace_t" in traces hash tables. Traces are now allocated on the heap memory, outside the hash table. Add tracemalloc_copy_traces() and tracemalloc_copy_domains() helper functions. Remove _Py_hashtable_copy() function since there is no API to copy a key or a value. Remove also _Py_hashtable_delete() function which was commented. * bpo-40609: _Py_hashtable_t values become void* (GH-20065) _Py_hashtable_t values become regular "void *" pointers. * Add _Py_hashtable_entry_t.data member * Remove _Py_hashtable_t.data_size member * Remove _Py_hashtable_t.get_func member. It is no longer needed to specialize _Py_hashtable_get() for a specific value size, since all entries now have the same size (void*). * Remove the following macros: * _Py_HASHTABLE_GET() * _Py_HASHTABLE_SET() * _Py_HASHTABLE_SET_NODATA() * _Py_HASHTABLE_POP() * Rename _Py_hashtable_pop() to _Py_hashtable_steal() * _Py_hashtable_foreach() callback now gets key and value rather than entry. * Remove _Py_hashtable_value_destroy_func type. value_destroy_func callback now only has a single parameter: data (void*). * bpo-40602: Optimize _Py_hashtable_get_ptr() (GH-20066) _Py_hashtable_get_entry_ptr() avoids comparing the entry hash: compare directly keys. Move _Py_hashtable_get_entry_ptr() just after _Py_hashtable_get_entry_generic(). * bpo-40331: Increase test coverage for the statistics module (GH-19608) * bpo-40613: Remove compiler warning from _xxsubinterpretersmodule (GH-20069) * bpo-34790: add version of removal of explicit passing of coros to `asyncio.wait`'s documentation (#20008) * bpo-40334: Always show the caret on SyntaxErrors (GH-20050) This commit fixes SyntaxError locations when the caret is not displayed, by doing the following: - `col_number` always gets set to the location of the offending node/expr. When no caret is to be displayed, this gets achieved by setting the object holding the error line to None. - Introduce a new function `_PyPegen_raise_error_known_location`, which can be called, when an arbitrary `lineno`/`col_offset` needs to be passed. This function then gets used in the grammar (through some new macros and inline functions) so that SyntaxError locations of the new parser match that of the old. * bpo-38787: Fix Argument Clinic defining_class_converter (GH-20074) Don't hardcode defining_class parameter name to "cls": * Define CConverter.set_template_dict(): do nothing by default * CLanguage.render_function() now calls set_template_dict() on all converters. * issue-25872: Fix KeyError using linecache from multiple threads (GH-18007) The crash that this fixes occurs when using traceback and other modules from multiple threads; del cache[filename] can raise a KeyError. * bpo-39465: Remove _PyUnicode_ClearStaticStrings() from C API (GH-20078) Remove the _PyUnicode_ClearStaticStrings() function from the C API. Make the function fully private (declare it with "static"). * bpo-29587: Make gen.throw() chain exceptions with yield from (GH-19858) The previous commits on bpo-29587 got exception chaining working with gen.throw() in the `yield` case. This patch also gets the `yield from` case working. As a consequence, implicit exception chaining now also works in the asyncio scenario of awaiting on a task when an exception is already active. Tests are included for both the asyncio case and the pure generator-only case. * bpo-40521: Add PyInterpreterState.unicode (GH-20081) Move PyInterpreterState.fs_codec into a new PyInterpreterState.unicode structure. Give a name to the fs_codec structure and use this structure in unicodeobject.c. * bpo-40597: email: Use CTE if lines are longer than max_line_length consistently (gh-20038) raw_data_manager (default for EmailPolicy, EmailMessage) does correct wrapping of 'text' parts as long as the message contains characters outside of 7bit US-ASCII set: base64 or qp Content-Transfer-Encoding is applied if the lines would be too long without it. It did not, however, do this for ascii-only text, which could result in lines that were longer than policy.max_line_length or even the rfc 998 maximum. This changeset fixes the heuristic so that if lines are longer than policy.max_line_length, it will always apply a content-transfer-encoding so that the lines are wrapped correctly. * bpo-40275: Import locale module lazily in gettext (GH-19905) * bpo-40495: compileall option to hardlink duplicate pyc files (GH-19901) compileall is now able to use hardlinks to prevent duplicates in a case when .pyc files for different optimization levels have the same content. Co-authored-by: Miro Hrončok <miro@hroncok.cz> Co-authored-by: Victor Stinner <vstinner@python.org> * bpo-40549: posixmodule.c uses defining_class (GH-20075) Pass PEP 573 defining_class to os.DirEntry methods. The module state is now retrieve from defining_class rather than Py_TYPE(self), to support subclasses (even if DirEntry doesn't support subclasses yet). * Pass the module rather than defining_class to DirEntry_fetch_stat(). * Only get the module state once in _posix_clear(), _posix_traverse() and _posixmodule_exec(). * Revert "bpo-32604: [_xxsubinterpreters] Propagate exceptions. (GH-19768)" (GH-20089) * Revert "bpo-40613: Remove compiler warning from _xxsubinterpretersmodule (GH-20069)" This reverts commit fa0a66e. * Revert "bpo-32604: [_xxsubinterpreters] Propagate exceptions. (GH-19768)" This reverts commit a1d9e0a. * bpo-40602: Write unit tests for _Py_hashtable_t (GH-20091) Cleanup also hashtable.c. Rename _Py_hashtable_t members: * Rename entries to nentries * Rename num_buckets to nbuckets * bpo-40619: Correctly handle error lines in programs without file mode (GH-20090) * bpo-40618: Disallow invalid targets in augassign and except clauses (GH-20083) This commit fixes the new parser to disallow invalid targets in the following scenarios: - Augmented assignments must only accept a single target (Name, Attribute or Subscript), but no tuples or lists. - `except` clauses should only accept a single `Name` as a target. Co-authored-by: Pablo Galindo <Pablogsal@gmail.com> * bpo-40602: _Py_hashtable_set() reports rehash failure (GH-20077) If _Py_hashtable_set() fails to grow the hash table (rehash), it now fails rather than ignoring the error. * bpo-40548: GitHub Action workflow: skip jobs on doc only PRs (GH-19983) Signed-off-by: Filipe Laíns <lains@archlinux.org> * bpo-40460: Fix typo in idlelib/zzdummy.py (GH-20093) Replace ztest with ztext. * bpo-40462: Fix typo in test_json (GH-20094) * bpo-38872: Document exec symbol for codeop.compile_command (GH-20047) * Document exec symbol for codeop.compile_command * Remove extra statements Co-authored-by: nanjekyejoannah <joannah.nanjekye@ibm.com> * bpo-40334: Correctly identify invalid target in assignment errors (GH-20076) Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com> * bpo-40548: github actions: pass the changes check on no source changes (GH-20097) Signed-off-by: Filipe Laíns <lains@archlinux.org> * Update code comment re: location of struct _is. (GH-20067) * bpo-40612: Fix SyntaxError edge cases in traceback formatting (GH-20072) This fixes both the traceback.py module and the C code for formatting syntax errors (in Python/pythonrun.c). They now both consistently do the following: - Suppress caret if it points left of text - Allow caret pointing just past end of line - If caret points past end of line, clip to *just* past end of line The syntax error formatting code in traceback.py was mostly rewritten; small, subtle changes were applied to the C code in pythonrun.c. There's still a difference when the text contains embedded newlines. Neither handles these very well, and I don't think the case occurs in practice. Automerge-Triggered-By: @gvanrossum * Fix typo in code comment in main_loop label. (GH-20068) * Trivial typo fix in _tkinter.c (GH-19622) Change spelling of a #define in _tkinter.c from HAVE_LIBTOMMAMTH to HAVE_LIBTOMMATH, since this is used to keep track of tclTomMath.h, not tclTomMamth.h. No other file seems to refer to this variable. * bpo-40055: test_distutils leaves warnings filters unchanged (GH-20095) distutils.tests now saves/restores warnings filters to leave them unchanged. Importing tests imports docutils which imports pkg_resources which adds a warnings filter. * bpo-40479: Fix hashlib issue with OpenSSL 3.0.0 (GH-20107) OpenSSL 3.0.0-alpha2 was released today. The FIPS_mode() function has been deprecated and removed. It no longer makes sense with the new provider and context system in OpenSSL 3.0.0. EVP_default_properties_is_fips_enabled() is good enough for our needs in unit tests. It's an internal API, too. Signed-off-by: Christian Heimes <christian@python.org> * bpo-40479: Test with latest OpenSSL versions (GH-20108) * 1.0.2u (EOL) * 1.1.0l (EOL) * 1.1.1g * 3.0.0-alpha2 (disabled for now) Build the FIPS provider and create a FIPS configuration file for OpenSSL 3.0.0. Signed-off-by: Christian Heimes <christian@python.org> Automerge-Triggered-By: @tiran * Update NEWS. Co-authored-by: Victor Stinner <vstinner@python.org> Co-authored-by: Javier Buzzi <buzzi.javier@gmail.com> Co-authored-by: Hai Shi <shihai1992@gmail.com> Co-authored-by: Steve Dower <steve.dower@python.org> Co-authored-by: Curtis Bucher <cpbucher5@gmail.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com> Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com> Co-authored-by: Tim Peters <tim.peters@gmail.com> Co-authored-by: Batuhan Taskaya <batuhanosmantaskaya@gmail.com> Co-authored-by: Raymond Hettinger <rhettinger@users.noreply.github.com> Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com> Co-authored-by: Naglis <naglis@users.noreply.github.com> Co-authored-by: Dong-hee Na <donghee.na92@gmail.com> Co-authored-by: Petr Viktorin <encukou@gmail.com> Co-authored-by: Marcel Plch <mplch@redhat.com> Co-authored-by: Julien Danjou <julien@danjou.info> Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com> Co-authored-by: Zackery Spytz <zspytz@gmail.com> Co-authored-by: Chris Jerdonek <chris.jerdonek@gmail.com> Co-authored-by: Ned Batchelder <ned@nedbatchelder.com> Co-authored-by: Joannah Nanjekye <33177550+nanjekyejoannah@users.noreply.github.com> Co-authored-by: nanjekyejoannah <joannah.nanjekye@ibm.com> Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Jason R. Coombs <jaraco@jaraco.com> Co-authored-by: Andre Delfino <adelfino@gmail.com> Co-authored-by: Sergey Fedoseev <fedoseev.sergey@gmail.com> Co-authored-by: Mark Dickinson <dickinsm@gmail.com> Co-authored-by: scoder <stefan_ml@behnel.de> Co-authored-by: Inada Naoki <songofacandy@gmail.com> Co-authored-by: Brad Solomon <brad.solomon.1124@gmail.com> Co-authored-by: Brad Solomon <brsolomon@deloitte.com> Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> Co-authored-by: Shantanu <hauntsaninja@users.noreply.github.com> Co-authored-by: Allen Guo <guoguo12@gmail.com> Co-authored-by: Tzanetos Balitsaris <tbalitsaris@gmail.com> Co-authored-by: jack1142 <6032823+jack1142@users.noreply.github.com> Co-authored-by: Michael Graczyk <mgraczyk@users.noreply.github.com> Co-authored-by: Arkadiusz Hiler <arek.l1@gmail.com> Co-authored-by: Lumír 'Frenzy' Balhar <lbalhar@redhat.com> Co-authored-by: Miro Hrončok <miro@hroncok.cz> Co-authored-by: Filipe Laíns <filipe.lains@gmail.com> Co-authored-by: Filipe Laíns <lains@archlinux.org> Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Andrew York <andrew.g.york+github@gmail.com> Co-authored-by: Christian Heimes <christian@python.org>

@gvanrossum

* Update docs. * bpo-40513: Per-interpreter signals pending (GH-19924) Move signals_pending from _PyRuntime.ceval to PyInterpreterState.ceval. * bpo-40513: Per-interpreter gil_drop_request (GH-19927) Move gil_drop_request member from _PyRuntimeState.ceval to PyInterpreterState.ceval. * bpo-40514: Add --with-experimental-isolated-subinterpreters (GH-19926) Add --with-experimental-isolated-subinterpreters build option to configure: better isolate subinterpreters, experimental build mode. When used, force the usage of the libc malloc() memory allocator, since pymalloc relies on the unique global interpreter lock (GIL). * bpo-32117: Updated Simpsons names in docs (GH-19737) `sally` is not a Simpsons character Automerge-Triggered-By: @gvanrossum * bpo-40513: Per-interpreter recursion_limit (GH-19929) Move recursion_limit member from _PyRuntimeState.ceval to PyInterpreterState.ceval. * Py_SetRecursionLimit() now only sets _Py_CheckRecursionLimit of ceval.c if the current Python thread is part of the main interpreter. * Inline _Py_MakeEndRecCheck() into _Py_LeaveRecursiveCall(). * Convert _Py_RecursionLimitLowerWaterMark() macro into a static inline function. * bpo-29587: _PyErr_ChainExceptions() checks exception (GH-19902) _PyErr_ChainExceptions() now ensures that the first parameter is an exception type, as done by _PyErr_SetObject(). * The following function now check PyExceptionInstance_Check() in an assertion using a new _PyBaseExceptionObject_cast() helper function: * PyException_GetTraceback(), PyException_SetTraceback() * PyException_GetCause(), PyException_SetCause() * PyException_GetContext(), PyException_SetContext() * PyExceptionClass_Name() now checks PyExceptionClass_Check() with an assertion. * Remove XXX comment and add gi_exc_state variable to _gen_throw(). * Remove comment from test_generators * bpo-40520: Remove redundant comment in pydebug.h (GH-19931) Automerge-Triggered-By: @corona10 * Revert "bpo-40513: Per-interpreter signals pending (GH-19924)" (GH-19932) This reverts commit 4e01946. * bpo-40521: Disable Unicode caches in isolated subinterpreters (GH-19933) When Python is built in the experimental isolated subinterpreters mode, disable Unicode singletons and Unicode interned strings since they are shared by all interpreters. Temporary workaround until these caches are made per-interpreter. * bpo-40458: Increase reserved stack space to prevent overflow crash on Windows (GH-19845) * bpo-40521: Disable free lists in subinterpreters (GH-19937) When Python is built with experimental isolated interpreters, disable tuple, dict and free free lists. Temporary workaround until these caches are made per-interpreter. Add frame_alloc() and frame_get_builtins() subfunctions to simplify _PyFrame_New_NoTrack(). * bpo-40522: _PyThreadState_Swap() sets autoTSSkey (GH-19939) In the experimental isolated subinterpreters build mode, _PyThreadState_GET() gets the autoTSSkey variable and _PyThreadState_Swap() sets the autoTSSkey variable. * Add _PyThreadState_GetTSS() * _PyRuntimeState_GetThreadState() and _PyThreadState_GET() return _PyThreadState_GetTSS() * PyEval_SaveThread() sets the autoTSSkey variable to current Python thread state rather than NULL. * eval_frame_handle_pending() doesn't check that _PyThreadState_Swap() result is NULL. * _PyThreadState_Swap() gets the current Python thread state with _PyThreadState_GetTSS() rather than _PyRuntimeGILState_GetThreadState(). * PyGILState_Ensure() no longer checks _PyEval_ThreadsInitialized() since it cannot access the current interpreter. * bpo-40513: new_interpreter() init GIL earlier (GH-19942) Fix also code to handle init_interp_main() failure. * bpo-40513: Per-interpreter GIL (GH-19943) In the experimental isolated subinterpreters build mode, the GIL is now per-interpreter. Move gil from _PyRuntimeState.ceval to PyInterpreterState.ceval. new_interpreter() always get the config from the main interpreter. * bpo-40513: _xxsubinterpreters.run_string() releases the GIL (GH-19944) In the experimental isolated subinterpreters build mode, _xxsubinterpreters.run_string() now releases the GIL. * bpo-40355: Improve error messages in ast.literal_eval with malformed Dict nodes (GH-19868) Co-authored-by: Pablo Galindo <Pablogsal@gmail.com> * bpo-40504: Allow weakrefs to lru_cache objects (GH-19938) * bpo-40523: Add pass-throughs for hash() and reversed() to weakref.proxy objects (GH-19946) * bpo-40480 "fnmatch" exponential execution time (GH-19908) bpo-40480: create different regexps in the presence of multiple `*` patterns to prevent fnmatch() from taking exponential time. * bpo-40517: Implement syntax highlighting support for ASDL (#19928) * Revert "bpo-40517: Implement syntax highlighting support for ASDL (#19928)" (#19950) This reverts commit d60040b. * bpo-40527: Fix command line argument parsing (GH-19955) * bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952) * bpo-40521: Disable method cache in subinterpreters (GH-19960) When Python is built with experimental isolated interpreters, disable the type method cache. Temporary workaround until the cache is made per-interpreter. * bpo-40533: Disable GC in subinterpreters (GH-19961) When Python is built with experimental isolated interpreters, a garbage collection now does nothing in an isolated interpreter. Temporary workaround until subinterpreters stop sharing Python objects. * bpo-40521: Disable list free list in subinterpreters (GH-19959) When Python is built with experimental isolated interpreters, disable the list free list. Temporary workaround until this cache is made per-interpreter. * bpo-40334: Add type to the assignment rule in the grammar file (GH-19963) * Fix typo in sqlite3 documentation (GH-19965) *first* is repeated twice. * bpo-40334: Allow trailing comma in parenthesised context managers (GH-19964) * bpo-40334: Generate comments in the parser code to improve debugging (GH-19966) * bpo-40397: Refactor typing._GenericAlias (GH-19719) Make the design more object-oriented. Split _GenericAlias on two almost independent classes: for special generic aliases like List and for parametrized generic aliases like List[int]. Add specialized subclasses for Callable, Callable[...], Tuple and Union[...]. * bpo-1635741: Port errno module to multiphase initialization (GH-19923) * bpo-40334: Fix error location upon parsing an invalid string literal (GH-19962) When parsing a string with an invalid escape, the old parser used to point to the beginning of the invalid string. This commit changes the new parser to match that behaviour, since it's currently pointing to the end of the string (or to be more precise, to the beginning of the next token). * bpo-40334: Error message for invalid default args in function call (GH-19973) When parsing something like `f(g()=2)`, where the name of a default arg is not a NAME, but an arbitrary expression, a specialised error message is emitted. * bpo-38787: C API for module state access from extension methods (PEP 573) (GH-19936) Module C state is now accessible from C-defined heap type methods (PEP 573). Patch by Marcel Plch and Petr Viktorin. Co-authored-by: Marcel Plch <mplch@redhat.com> Co-authored-by: Victor Stinner <vstinner@python.org> * bpo-40545: Export _PyErr_GetTopmostException() function (GH-19978) Declare _PyErr_GetTopmostException() with PyAPI_FUNC() to properly export the function in the C API. The function remains private ("_Py") prefix. Co-Authored-By: Julien Danjou <julien@danjou.info> * bpo-32604: [_xxsubinterpreters] Propagate exceptions. (GH-19768) (Note: PEP 554 is not accepted and the implementation in the code base is a private one for use in the test suite.) If code running in a subinterpreter raises an uncaught exception then the "run" call in the calling interpreter fails. A RunFailedError is raised there that summarizes the original exception as a string. The actual exception type, __cause__, __context__, state, etc. are all discarded. This turned out to be functionally insufficient in practice. There is a more helpful solution (and PEP 554 has been updated appropriately). This change adds the exception propagation behavior described in PEP 554 to the _xxsubinterpreters module. With this change a copy of the original exception is set to __cause__ on the RunFailedError. For now we are using "pickle", which preserves the exception's state. We also preserve the original __cause__, __context__, and __traceback__ (since "pickle" does not preserve those). https://bugs.python.org/issue32604 * bpo-38787: Update structures.rst docs (PEP 573) (GH-19980) * bpo-40548: Always run GitHub action, even on doc PRs (GH-19981) Always run GitHub action jobs, even on documentation-only pull requests. So it will be possible to make a GitHub action job, like the Windows (64-bit) job, mandatory. * bpo-40517: Implement syntax highlighting support for ASDL (GH-19967) * bpo-40555: Check for p->error_indicator in loop rules after the main loop is done (GH-19986) * bpo-40273: Reversible mappingproxy (FH-19513) * bpo-40559: Add Py_DECREF to _asynciomodule.c:task_step_impl() (GH-19990) This fixes a possible memory leak in the C implementation of asyncio.Task. * Make the first dataclass example more useful (GH-19994) * bpo-40541: Add optional *counts* parameter to random.sample() (GH-19970) * bpo-40502: Initialize n->n_col_offset (GH-19988) * initialize n->n_col_offset * 📜🤖 Added by blurb_it. * Move initialization Co-authored-by: nanjekyejoannah <joannah.nanjekye@ibm.com> Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> * bpo-39791: Add files() to importlib.resources (GH-19722) * bpo-39791: Update importlib.resources to support files() API (importlib_resources 1.5). * 📜🤖 Added by blurb_it. * Add some documentation about the new objects added. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> * bpo-40566: Apply PEP 573 to abc module (GH-20005) * bpo-40570: Improve compatibility of uname_result with late-bound .platform (#20015) * bpo-40570: Improve compatibility of uname_result with late-bound .platform. * Add test capturing ability to cast uname to a tuple. * bpo-40334: Avoid collisions between parser variables and grammar variables (GH-19987) This is for the C generator: - Disallow rule and variable names starting with `_` - Rename most local variable names generated by the parser to start with `_` Exceptions: - Renaming `p` to `_p` will be a separate PR - There are still some names that might clash, e.g. - anything starting with `Py` - C reserved words (`if` etc.) - Macros like `EXTRA` and `CHECK` * Add link to Enum class (GH-19884) * bpo-40397: Remove __args__ and __parameters__ from _SpecialGenericAlias (GH-19984) * bpo-40549: Convert posixmodule.c to multiphase init (GH-19982) Convert posixmodule.c ("posix" or "nt" module) to the multiphase initialization (PEP 489). * Create the module using PyModuleDef_Init(). * Create ScandirIteratorType and DirEntryType with the new PyType_FromModuleAndSpec() (PEP 573) * Get the module state from ScandirIteratorType and DirEntryType with the new PyType_GetModule() (PEP 573) * Pass module to functions which access the module state. * convert_sched_param() gets a new module parameter. It is now called directly since Argument Clinic doesn't support passing the module to an argument converter callback. * Remove _posixstate_global macro. * bpo-37986: Improve perfomance of PyLong_FromDouble() (GH-15611) * bpo-37986: Improve perfomance of PyLong_FromDouble() * Use strict bound check for safety and symmetry * Remove possibly outdated performance claims Co-authored-by: Mark Dickinson <dickinsm@gmail.com> * bpo-40397: Fix subscription of nested generic alias without parameters. (GH-20021) * bpo-40257: Tweak docstrings for special generic aliases. (GH-20022) * Add the terminating period. * Omit module name for builtin types. * Improve code clarity for the set lookup logic (GH-20028) * bpo-40585: Normalize errors messages in codeop when comparing them (GH-20030) With the new parser, the error message contains always the trailing newlines, causing the comparison of the repr of the error messages in codeop to fail. This commit makes the new parser mirror the old parser's behaviour regarding trailing newlines. * bpo-40575: Avoid unnecessary overhead in _PyDict_GetItemIdWithError() (GH-20018) Avoid unnecessary overhead in _PyDict_GetItemIdWithError() by calling _PyDict_GetItem_KnownHash() instead of the more generic PyDict_GetItemWithError(), since we already know the hash of interned strings. * bpo-36346: array: Don't use deprecated APIs (GH-19653) * Py_UNICODE -> wchar_t * Py_UNICODE -> unicode in Argument Clinic * PyUnicode_AsUnicode -> PyUnicode_AsWideCharString * Don't use "u#" format. Co-authored-by: Victor Stinner <vstinner@python.org> * bpo-40561: Add docstrings for webbrowser open functions (GH-19999) Co-authored-by: Brad Solomon <brsolomon@deloitte.com> Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> * bpo-40584: Update PyType_FromModuleAndSpec() to process tp_vectorcall_offset (GH-20026) * bpo-40334: produce specialized errors for invalid del targets (GH-19911) * bpo-39465: Don't access directly _Py_Identifier members (GH-20043) * Replace id->object with _PyUnicode_FromId(&id) * Use _Py_static_string_init(str) macro to initialize statically name_op in typeobject.c. * bpo-40571: Make lru_cache(maxsize=None) more discoverable (GH-20019) * bpo-40602: Rename hashtable.h to pycore_hashtable.h (GH-20044) * Move Modules/hashtable.h to Include/internal/pycore_hashtable.h * Move Modules/hashtable.c to Python/hashtable.c * Python is now linked to hashtable.c. _tracemalloc is no longer linked to hashtable.c. Previously, marshal.c got hashtable.c via _tracemalloc.c which is built as a builtin module. * bpo-40602: _Py_hashtable_new() uses PyMem_Malloc() (GH-20046) _Py_hashtable_new() now uses PyMem_Malloc/PyMem_Free allocator by default, rather than PyMem_RawMalloc/PyMem_RawFree. PyMem_Malloc is faster than PyMem_RawMalloc for memory blocks smaller than or equal to 512 bytes. * bpo-40480: restore ability to join fnmatch.translate() results (GH-20049) In translate(), generate unique group names across calls. The restores the undocumented ability to get a valid regexp by joining multiple translate() results via `|`. * bpo-39481: remove generic classes from ipaddress/mmap (GH-20045) These were added by mistake (see https://bugs.python.org/issue39481#msg366288). * bpo-40593: Improve syntax errors for invalid characters in source code. (GH-20033) * bpo-40602: Optimize _Py_hashtable for pointer keys (GH-20051) Optimize _Py_hashtable_get() and _Py_hashtable_get_entry() for pointer keys: * key_size == sizeof(void*) * hash_func == _Py_hashtable_hash_ptr * compare_func == _Py_hashtable_compare_direct Changes: * Add get_func and get_entry_func members to _Py_hashtable_t * Convert _Py_hashtable_get() and _Py_hashtable_get_entry() functions to static nline functions. * Add specialized get and get entry for pointer keys. * bpo-40596: Fix str.isidentifier() for non-canonicalized strings containing non-BMP characters on Windows. (GH-20053) * bpo-38787: Add PyCFunction_CheckExact() macro for exact type checks (GH-20024) … now that we allow subtypes of PyCFunction. Also add PyCMethod_CheckExact() and PyCMethod_Check() for checks against the PyCMethod subtype. * bpo-40602: Add _Py_HashPointerRaw() function (GH-20056) Add a new _Py_HashPointerRaw() function which avoids replacing -1 with -2 to micro-optimize hash table using pointer keys: using _Py_hashtable_hash_ptr() hash function. * bpo-40501: Replace ctypes code in uuid with native module (GH-19948) * Fix Wikipedia link (GH-20031) * bpo-40609: Rewrite how _tracemalloc handles domains (GH-20059) Rewrite how the _tracemalloc module stores traces of other domains. Rather than storing the domain inside the key, it now uses a new hash table with the domain as the key, and the data is a per-domain traces hash table. * Add tracemalloc_domain hash table. * Remove _Py_tracemalloc_config.use_domain. * Remove pointer_t and related functions. * bpo-40609: Remove _Py_hashtable_t.key_size (GH-20060) Rewrite _Py_hashtable_t type to always store the key as a "const void *" pointer. Add an explicit "key" member to _Py_hashtable_entry_t. Remove _Py_hashtable_t.key_size member. hash and compare functions drop their hash table parameter, and their 'key' parameter type becomes "const void *". * bpo-40609: Add destroy functions to _Py_hashtable (GH-20062) Add key_destroy_func and value_destroy_func parameters to _Py_hashtable_new_full(). marshal.c and _tracemalloc.c use these destroy functions. * bpo-40609: _tracemalloc allocates traces (GH-20064) Rewrite _tracemalloc to store "trace_t*" rather than directly "trace_t" in traces hash tables. Traces are now allocated on the heap memory, outside the hash table. Add tracemalloc_copy_traces() and tracemalloc_copy_domains() helper functions. Remove _Py_hashtable_copy() function since there is no API to copy a key or a value. Remove also _Py_hashtable_delete() function which was commented. * bpo-40609: _Py_hashtable_t values become void* (GH-20065) _Py_hashtable_t values become regular "void *" pointers. * Add _Py_hashtable_entry_t.data member * Remove _Py_hashtable_t.data_size member * Remove _Py_hashtable_t.get_func member. It is no longer needed to specialize _Py_hashtable_get() for a specific value size, since all entries now have the same size (void*). * Remove the following macros: * _Py_HASHTABLE_GET() * _Py_HASHTABLE_SET() * _Py_HASHTABLE_SET_NODATA() * _Py_HASHTABLE_POP() * Rename _Py_hashtable_pop() to _Py_hashtable_steal() * _Py_hashtable_foreach() callback now gets key and value rather than entry. * Remove _Py_hashtable_value_destroy_func type. value_destroy_func callback now only has a single parameter: data (void*). * bpo-40602: Optimize _Py_hashtable_get_ptr() (GH-20066) _Py_hashtable_get_entry_ptr() avoids comparing the entry hash: compare directly keys. Move _Py_hashtable_get_entry_ptr() just after _Py_hashtable_get_entry_generic(). * bpo-40331: Increase test coverage for the statistics module (GH-19608) * bpo-40613: Remove compiler warning from _xxsubinterpretersmodule (GH-20069) * bpo-34790: add version of removal of explicit passing of coros to `asyncio.wait`'s documentation (#20008) * bpo-40334: Always show the caret on SyntaxErrors (GH-20050) This commit fixes SyntaxError locations when the caret is not displayed, by doing the following: - `col_number` always gets set to the location of the offending node/expr. When no caret is to be displayed, this gets achieved by setting the object holding the error line to None. - Introduce a new function `_PyPegen_raise_error_known_location`, which can be called, when an arbitrary `lineno`/`col_offset` needs to be passed. This function then gets used in the grammar (through some new macros and inline functions) so that SyntaxError locations of the new parser match that of the old. * bpo-38787: Fix Argument Clinic defining_class_converter (GH-20074) Don't hardcode defining_class parameter name to "cls": * Define CConverter.set_template_dict(): do nothing by default * CLanguage.render_function() now calls set_template_dict() on all converters. * issue-25872: Fix KeyError using linecache from multiple threads (GH-18007) The crash that this fixes occurs when using traceback and other modules from multiple threads; del cache[filename] can raise a KeyError. * bpo-39465: Remove _PyUnicode_ClearStaticStrings() from C API (GH-20078) Remove the _PyUnicode_ClearStaticStrings() function from the C API. Make the function fully private (declare it with "static"). * bpo-29587: Make gen.throw() chain exceptions with yield from (GH-19858) The previous commits on bpo-29587 got exception chaining working with gen.throw() in the `yield` case. This patch also gets the `yield from` case working. As a consequence, implicit exception chaining now also works in the asyncio scenario of awaiting on a task when an exception is already active. Tests are included for both the asyncio case and the pure generator-only case. * bpo-40521: Add PyInterpreterState.unicode (GH-20081) Move PyInterpreterState.fs_codec into a new PyInterpreterState.unicode structure. Give a name to the fs_codec structure and use this structure in unicodeobject.c. * bpo-40597: email: Use CTE if lines are longer than max_line_length consistently (gh-20038) raw_data_manager (default for EmailPolicy, EmailMessage) does correct wrapping of 'text' parts as long as the message contains characters outside of 7bit US-ASCII set: base64 or qp Content-Transfer-Encoding is applied if the lines would be too long without it. It did not, however, do this for ascii-only text, which could result in lines that were longer than policy.max_line_length or even the rfc 998 maximum. This changeset fixes the heuristic so that if lines are longer than policy.max_line_length, it will always apply a content-transfer-encoding so that the lines are wrapped correctly. * bpo-40275: Import locale module lazily in gettext (GH-19905) * bpo-40495: compileall option to hardlink duplicate pyc files (GH-19901) compileall is now able to use hardlinks to prevent duplicates in a case when .pyc files for different optimization levels have the same content. Co-authored-by: Miro Hrončok <miro@hroncok.cz> Co-authored-by: Victor Stinner <vstinner@python.org> * bpo-40549: posixmodule.c uses defining_class (GH-20075) Pass PEP 573 defining_class to os.DirEntry methods. The module state is now retrieve from defining_class rather than Py_TYPE(self), to support subclasses (even if DirEntry doesn't support subclasses yet). * Pass the module rather than defining_class to DirEntry_fetch_stat(). * Only get the module state once in _posix_clear(), _posix_traverse() and _posixmodule_exec(). * Revert "bpo-32604: [_xxsubinterpreters] Propagate exceptions. (GH-19768)" (GH-20089) * Revert "bpo-40613: Remove compiler warning from _xxsubinterpretersmodule (GH-20069)" This reverts commit fa0a66e. * Revert "bpo-32604: [_xxsubinterpreters] Propagate exceptions. (GH-19768)" This reverts commit a1d9e0a. * bpo-40602: Write unit tests for _Py_hashtable_t (GH-20091) Cleanup also hashtable.c. Rename _Py_hashtable_t members: * Rename entries to nentries * Rename num_buckets to nbuckets * bpo-40619: Correctly handle error lines in programs without file mode (GH-20090) * bpo-40618: Disallow invalid targets in augassign and except clauses (GH-20083) This commit fixes the new parser to disallow invalid targets in the following scenarios: - Augmented assignments must only accept a single target (Name, Attribute or Subscript), but no tuples or lists. - `except` clauses should only accept a single `Name` as a target. Co-authored-by: Pablo Galindo <Pablogsal@gmail.com> * bpo-40602: _Py_hashtable_set() reports rehash failure (GH-20077) If _Py_hashtable_set() fails to grow the hash table (rehash), it now fails rather than ignoring the error. * bpo-40548: GitHub Action workflow: skip jobs on doc only PRs (GH-19983) Signed-off-by: Filipe Laíns <lains@archlinux.org> * bpo-40460: Fix typo in idlelib/zzdummy.py (GH-20093) Replace ztest with ztext. * bpo-40462: Fix typo in test_json (GH-20094) * bpo-38872: Document exec symbol for codeop.compile_command (GH-20047) * Document exec symbol for codeop.compile_command * Remove extra statements Co-authored-by: nanjekyejoannah <joannah.nanjekye@ibm.com> * bpo-40334: Correctly identify invalid target in assignment errors (GH-20076) Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com> * bpo-40548: github actions: pass the changes check on no source changes (GH-20097) Signed-off-by: Filipe Laíns <lains@archlinux.org> * Update code comment re: location of struct _is. (GH-20067) * bpo-40612: Fix SyntaxError edge cases in traceback formatting (GH-20072) This fixes both the traceback.py module and the C code for formatting syntax errors (in Python/pythonrun.c). They now both consistently do the following: - Suppress caret if it points left of text - Allow caret pointing just past end of line - If caret points past end of line, clip to *just* past end of line The syntax error formatting code in traceback.py was mostly rewritten; small, subtle changes were applied to the C code in pythonrun.c. There's still a difference when the text contains embedded newlines. Neither handles these very well, and I don't think the case occurs in practice. Automerge-Triggered-By: @gvanrossum * Fix typo in code comment in main_loop label. (GH-20068) * Trivial typo fix in _tkinter.c (GH-19622) Change spelling of a #define in _tkinter.c from HAVE_LIBTOMMAMTH to HAVE_LIBTOMMATH, since this is used to keep track of tclTomMath.h, not tclTomMamth.h. No other file seems to refer to this variable. * bpo-40055: test_distutils leaves warnings filters unchanged (GH-20095) distutils.tests now saves/restores warnings filters to leave them unchanged. Importing tests imports docutils which imports pkg_resources which adds a warnings filter. * bpo-40479: Fix hashlib issue with OpenSSL 3.0.0 (GH-20107) OpenSSL 3.0.0-alpha2 was released today. The FIPS_mode() function has been deprecated and removed. It no longer makes sense with the new provider and context system in OpenSSL 3.0.0. EVP_default_properties_is_fips_enabled() is good enough for our needs in unit tests. It's an internal API, too. Signed-off-by: Christian Heimes <christian@python.org> * bpo-40479: Test with latest OpenSSL versions (GH-20108) * 1.0.2u (EOL) * 1.1.0l (EOL) * 1.1.1g * 3.0.0-alpha2 (disabled for now) Build the FIPS provider and create a FIPS configuration file for OpenSSL 3.0.0. Signed-off-by: Christian Heimes <christian@python.org> Automerge-Triggered-By: @tiran * Update NEWS. Co-authored-by: Victor Stinner <vstinner@python.org> Co-authored-by: Javier Buzzi <buzzi.javier@gmail.com> Co-authored-by: Hai Shi <shihai1992@gmail.com> Co-authored-by: Steve Dower <steve.dower@python.org> Co-authored-by: Curtis Bucher <cpbucher5@gmail.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com> Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com> Co-authored-by: Tim Peters <tim.peters@gmail.com> Co-authored-by: Batuhan Taskaya <batuhanosmantaskaya@gmail.com> Co-authored-by: Raymond Hettinger <rhettinger@users.noreply.github.com> Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com> Co-authored-by: Naglis <naglis@users.noreply.github.com> Co-authored-by: Dong-hee Na <donghee.na92@gmail.com> Co-authored-by: Petr Viktorin <encukou@gmail.com> Co-authored-by: Marcel Plch <mplch@redhat.com> Co-authored-by: Julien Danjou <julien@danjou.info> Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com> Co-authored-by: Zackery Spytz <zspytz@gmail.com> Co-authored-by: Chris Jerdonek <chris.jerdonek@gmail.com> Co-authored-by: Ned Batchelder <ned@nedbatchelder.com> Co-authored-by: Joannah Nanjekye <33177550+nanjekyejoannah@users.noreply.github.com> Co-authored-by: nanjekyejoannah <joannah.nanjekye@ibm.com> Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Jason R. Coombs <jaraco@jaraco.com> Co-authored-by: Andre Delfino <adelfino@gmail.com> Co-authored-by: Sergey Fedoseev <fedoseev.sergey@gmail.com> Co-authored-by: Mark Dickinson <dickinsm@gmail.com> Co-authored-by: scoder <stefan_ml@behnel.de> Co-authored-by: Inada Naoki <songofacandy@gmail.com> Co-authored-by: Brad Solomon <brad.solomon.1124@gmail.com> Co-authored-by: Brad Solomon <brsolomon@deloitte.com> Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu> Co-authored-by: Shantanu <hauntsaninja@users.noreply.github.com> Co-authored-by: Allen Guo <guoguo12@gmail.com> Co-authored-by: Tzanetos Balitsaris <tbalitsaris@gmail.com> Co-authored-by: jack1142 <6032823+jack1142@users.noreply.github.com> Co-authored-by: Michael Graczyk <mgraczyk@users.noreply.github.com> Co-authored-by: Arkadiusz Hiler <arek.l1@gmail.com> Co-authored-by: Lumír 'Frenzy' Balhar <lbalhar@redhat.com> Co-authored-by: Miro Hrončok <miro@hroncok.cz> Co-authored-by: Filipe Laíns <filipe.lains@gmail.com> Co-authored-by: Filipe Laíns <lains@archlinux.org> Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Andrew York <andrew.g.york+github@gmail.com> Co-authored-by: Christian Heimes <christian@python.org>

Fix literal_eval and add tests

36eb5b8

the-knights-who-say-ni added the CLA signed label May 2, 2020

bedevere-bot added the awaiting review label May 2, 2020

remilapeyre suggested changes May 2, 2020

View reviewed changes

bedevere-bot added awaiting core review and removed awaiting review labels May 2, 2020

brandtbucher added type-bug An unexpected behavior, bug, or error needs backport to 3.7 labels May 2, 2020

brandtbucher requested changes May 2, 2020

View reviewed changes

isidentical reviewed May 3, 2020

View reviewed changes

Update ast.py

2c72460

Abstracted calling ValueError in ast.py

brandtbucher approved these changes May 4, 2020

View reviewed changes

brandtbucher requested a review from pablogsal May 4, 2020 03:31

pablogsal requested changes May 5, 2020

View reviewed changes

bedevere-bot added awaiting changes and removed awaiting core review labels May 5, 2020

curtisbucher and others added 3 commits May 5, 2020 11:53

Update Misc/NEWS.d/next/Library/2020-05-02-14-24-48.bpo-40355.xTujaB.rst

3e68c2e

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>

Update ast.py and test_ast.py

2427ed2

Address requested changes.

Merge branch 'astliteraleval' of https://github.com/curtisbucher/cpython

bc9274f

into astliteraleval

pablogsal approved these changes May 5, 2020

View reviewed changes

bedevere-bot added awaiting merge and removed awaiting changes labels May 5, 2020

isidentical approved these changes May 5, 2020

View reviewed changes

pablogsal merged commit c21c512 into python:master May 5, 2020

bedevere-bot removed awaiting merge needs backport to 3.8 labels May 5, 2020

miss-islington assigned pablogsal May 5, 2020

pablogsal removed the needs backport to 3.7 label May 5, 2020

curtisbucher deleted the astliteraleval branch May 5, 2020 19:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bpo-40355: ast.literal_eval rejects malformed Dict nodes #19868

bpo-40355: ast.literal_eval rejects malformed Dict nodes #19868

curtisbucher commented May 2, 2020 •

edited by bedevere-bot

Loading

remilapeyre left a comment

brandtbucher commented May 2, 2020 •

edited

Loading

brandtbucher May 2, 2020 •

edited

Loading

isidentical commented May 3, 2020

remilapeyre commented May 3, 2020

isidentical commented May 3, 2020 •

edited

Loading

isidentical commented May 3, 2020

remilapeyre commented May 3, 2020

isidentical left a comment

brandtbucher left a comment

brandtbucher commented May 5, 2020

pablogsal May 5, 2020

pablogsal May 5, 2020

pablogsal May 5, 2020

bedevere-bot commented May 5, 2020

pablogsal commented May 5, 2020

pablogsal left a comment

pablogsal commented May 5, 2020

isidentical left a comment

miss-islington commented May 5, 2020

bedevere-bot commented May 5, 2020

miss-islington commented May 5, 2020

pablogsal commented May 5, 2020

pablogsal commented May 5, 2020

pablogsal commented May 5, 2020

pablogsal commented May 5, 2020

isidentical commented May 5, 2020

bpo-40355: ast.literal_eval rejects malformed Dict nodes #19868

bpo-40355: ast.literal_eval rejects malformed Dict nodes #19868

Conversation

curtisbucher commented May 2, 2020 • edited by bedevere-bot Loading

remilapeyre left a comment

Choose a reason for hiding this comment

brandtbucher commented May 2, 2020 • edited Loading

brandtbucher May 2, 2020 • edited Loading

Choose a reason for hiding this comment

isidentical commented May 3, 2020

remilapeyre commented May 3, 2020

isidentical commented May 3, 2020 • edited Loading

isidentical commented May 3, 2020

remilapeyre commented May 3, 2020

isidentical left a comment

Choose a reason for hiding this comment

brandtbucher left a comment

Choose a reason for hiding this comment

brandtbucher commented May 5, 2020

pablogsal May 5, 2020

Choose a reason for hiding this comment

pablogsal May 5, 2020

Choose a reason for hiding this comment

pablogsal May 5, 2020

Choose a reason for hiding this comment

bedevere-bot commented May 5, 2020

pablogsal commented May 5, 2020

pablogsal left a comment

Choose a reason for hiding this comment

pablogsal commented May 5, 2020

isidentical left a comment

Choose a reason for hiding this comment

miss-islington commented May 5, 2020

bedevere-bot commented May 5, 2020

miss-islington commented May 5, 2020

pablogsal commented May 5, 2020

pablogsal commented May 5, 2020

pablogsal commented May 5, 2020

pablogsal commented May 5, 2020

isidentical commented May 5, 2020

curtisbucher commented May 2, 2020 •

edited by bedevere-bot

Loading

brandtbucher commented May 2, 2020 •

edited

Loading

brandtbucher May 2, 2020 •

edited

Loading

isidentical commented May 3, 2020 •

edited

Loading