Skip to content

Commit 5e45e45

Browse files
serhiy-storchakavstinnerkingbuzzmanshihai1991zooba
authored
Revert 19108 remove c element tree (#20115)
* 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 <[email protected]> * 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 <[email protected]> Co-authored-by: Victor Stinner <[email protected]> * 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 <[email protected]> * 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 <[email protected]> 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 <[email protected]> * 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 <[email protected]> * bpo-40561: Add docstrings for webbrowser open functions (GH-19999) Co-authored-by: Brad Solomon <[email protected]> Co-authored-by: Terry Jan Reedy <[email protected]> * 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 <[email protected]> Co-authored-by: Victor Stinner <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * bpo-40334: Correctly identify invalid target in assignment errors (GH-20076) Co-authored-by: Lysandros Nikolaou <[email protected]> * bpo-40548: github actions: pass the changes check on no source changes (GH-20097) Signed-off-by: Filipe Laíns <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Automerge-Triggered-By: @tiran * Update NEWS. Co-authored-by: Victor Stinner <[email protected]> Co-authored-by: Javier Buzzi <[email protected]> Co-authored-by: Hai Shi <[email protected]> Co-authored-by: Steve Dower <[email protected]> Co-authored-by: Curtis Bucher <[email protected]> Co-authored-by: Pablo Galindo <[email protected]> Co-authored-by: Dennis Sweeney <[email protected]> Co-authored-by: Tim Peters <[email protected]> Co-authored-by: Batuhan Taskaya <[email protected]> Co-authored-by: Raymond Hettinger <[email protected]> Co-authored-by: Lysandros Nikolaou <[email protected]> Co-authored-by: Naglis <[email protected]> Co-authored-by: Dong-hee Na <[email protected]> Co-authored-by: Petr Viktorin <[email protected]> Co-authored-by: Marcel Plch <[email protected]> Co-authored-by: Julien Danjou <[email protected]> Co-authored-by: Eric Snow <[email protected]> Co-authored-by: Zackery Spytz <[email protected]> Co-authored-by: Chris Jerdonek <[email protected]> Co-authored-by: Ned Batchelder <[email protected]> Co-authored-by: Joannah Nanjekye <[email protected]> Co-authored-by: nanjekyejoannah <[email protected]> Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Jason R. Coombs <[email protected]> Co-authored-by: Andre Delfino <[email protected]> Co-authored-by: Sergey Fedoseev <[email protected]> Co-authored-by: Mark Dickinson <[email protected]> Co-authored-by: scoder <[email protected]> Co-authored-by: Inada Naoki <[email protected]> Co-authored-by: Brad Solomon <[email protected]> Co-authored-by: Brad Solomon <[email protected]> Co-authored-by: Terry Jan Reedy <[email protected]> Co-authored-by: Shantanu <[email protected]> Co-authored-by: Allen Guo <[email protected]> Co-authored-by: Tzanetos Balitsaris <[email protected]> Co-authored-by: jack1142 <[email protected]> Co-authored-by: Michael Graczyk <[email protected]> Co-authored-by: Arkadiusz Hiler <[email protected]> Co-authored-by: Lumír 'Frenzy' Balhar <[email protected]> Co-authored-by: Miro Hrončok <[email protected]> Co-authored-by: Filipe Laíns <[email protected]> Co-authored-by: Filipe Laíns <[email protected]> Co-authored-by: Guido van Rossum <[email protected]> Co-authored-by: Andrew York <[email protected]> Co-authored-by: Christian Heimes <[email protected]>
1 parent d8a8ad5 commit 5e45e45

File tree

211 files changed

+12894
-9826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+12894
-9826
lines changed

.github/workflows/build.yml

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,42 @@
11
name: Tests
22

3+
# bpo-40548: "paths-ignore" is not used to skip documentation-only PRs, because
4+
# it prevents to mark a job as mandatory. A PR cannot be merged if a job is
5+
# mandatory but not scheduled because of "paths-ignore".
36
on:
47
push:
58
branches:
69
- master
710
- 3.8
811
- 3.7
9-
paths-ignore:
10-
- 'Doc/**'
11-
- 'Misc/**'
12-
- '**/*.md'
13-
- '**/*.rst'
1412
pull_request:
1513
branches:
1614
- master
1715
- 3.8
1816
- 3.7
19-
paths-ignore:
20-
- 'Doc/**'
21-
- 'Misc/**'
22-
- '**/*.md'
23-
- '**/*.rst'
2417

2518
jobs:
19+
check_source:
20+
name: 'Check for source changes'
21+
runs-on: ubuntu-latest
22+
outputs:
23+
run_tests: ${{ steps.check.outputs.run_tests }}
24+
steps:
25+
- uses: actions/checkout@v2
26+
- name: Check for source changes
27+
id: check
28+
run: |
29+
if [ -z "GITHUB_BASE_REF" ]; then
30+
echo '::set-output name=run_tests::true'
31+
else
32+
git fetch origin $GITHUB_BASE_REF --depth=1
33+
git diff --name-only origin/$GITHUB_BASE_REF... | grep -qvE '(\.rst$|^Doc|^Misc)' && echo '::set-output name=run_tests::true' || true
34+
fi
2635
build_win32:
2736
name: 'Windows (x86)'
2837
runs-on: windows-latest
38+
needs: check_source
39+
if: needs.check_source.outputs.run_tests == 'true'
2940
steps:
3041
- uses: actions/checkout@v1
3142
- name: Build CPython
@@ -38,6 +49,8 @@ jobs:
3849
build_win_amd64:
3950
name: 'Windows (x64)'
4051
runs-on: windows-latest
52+
needs: check_source
53+
if: needs.check_source.outputs.run_tests == 'true'
4154
steps:
4255
- uses: actions/checkout@v1
4356
- name: Build CPython
@@ -50,6 +63,8 @@ jobs:
5063
build_macos:
5164
name: 'macOS'
5265
runs-on: macos-latest
66+
needs: check_source
67+
if: needs.check_source.outputs.run_tests == 'true'
5368
steps:
5469
- uses: actions/checkout@v1
5570
- name: Configure CPython
@@ -64,6 +79,8 @@ jobs:
6479
build_ubuntu:
6580
name: 'Ubuntu'
6681
runs-on: ubuntu-latest
82+
needs: check_source
83+
if: needs.check_source.outputs.run_tests == 'true'
6784
env:
6885
OPENSSL_VER: 1.1.1f
6986
steps:

Doc/c-api/structures.rst

Lines changed: 52 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,23 +147,56 @@ Implementing functions and methods
147147
value of the function as exposed in Python. The function must return a new
148148
reference.
149149
150+
The function signature is::
151+
152+
PyObject *PyCFunction(PyObject *self,
153+
PyObject *args);
150154
151155
.. c:type:: PyCFunctionWithKeywords
152156
153157
Type of the functions used to implement Python callables in C
154158
with signature :const:`METH_VARARGS | METH_KEYWORDS`.
159+
The function signature is::
160+
161+
PyObject *PyCFunctionWithKeywords(PyObject *self,
162+
PyObject *args,
163+
PyObject *kwargs);
155164
156165
157166
.. c:type:: _PyCFunctionFast
158167
159168
Type of the functions used to implement Python callables in C
160169
with signature :const:`METH_FASTCALL`.
170+
The function signature is::
161171
172+
PyObject *_PyCFunctionFast(PyObject *self,
173+
PyObject *const *args,
174+
Py_ssize_t nargs);
162175
163176
.. c:type:: _PyCFunctionFastWithKeywords
164177
165178
Type of the functions used to implement Python callables in C
166179
with signature :const:`METH_FASTCALL | METH_KEYWORDS`.
180+
The function signature is::
181+
182+
PyObject *_PyCFunctionFastWithKeywords(PyObject *self,
183+
PyObject *const *args,
184+
Py_ssize_t nargs,
185+
PyObject *kwnames);
186+
187+
.. c:type:: PyCMethod
188+
189+
Type of the functions used to implement Python callables in C
190+
with signature :const:`METH_METHOD | METH_FASTCALL | METH_KEYWORDS`.
191+
The function signature is::
192+
193+
PyObject *PyCMethod(PyObject *self,
194+
PyTypeObject *defining_class,
195+
PyObject *const *args,
196+
Py_ssize_t nargs,
197+
PyObject *kwnames)
198+
199+
.. versionadded:: 3.9
167200
168201
169202
.. c:type:: PyMethodDef
@@ -197,9 +230,7 @@ The :attr:`ml_flags` field is a bitfield which can include the following flags.
197230
The individual flags indicate either a calling convention or a binding
198231
convention.
199232
200-
There are four basic calling conventions for positional arguments
201-
and two of them can be combined with :const:`METH_KEYWORDS` to support
202-
also keyword arguments. So there are a total of 6 calling conventions:
233+
There are these calling conventions:
203234
204235
.. data:: METH_VARARGS
205236
@@ -250,6 +281,19 @@ also keyword arguments. So there are a total of 6 calling conventions:
250281
.. versionadded:: 3.7
251282
252283
284+
.. data:: METH_METHOD | METH_FASTCALL | METH_KEYWORDS
285+
286+
Extension of :const:`METH_FASTCALL | METH_KEYWORDS` supporting the *defining
287+
class*, that is, the class that contains the method in question.
288+
The defining class might be a superclass of ``Py_TYPE(self)``.
289+
290+
The method needs to be of type :c:type:`PyCMethod`, the same as for
291+
``METH_FASTCALL | METH_KEYWORDS`` with ``defining_class`` argument added after
292+
``self``.
293+
294+
.. versionadded:: 3.9
295+
296+
253297
.. data:: METH_NOARGS
254298
255299
Methods without parameters don't need to check whether arguments are given if
@@ -380,9 +424,11 @@ Accessing attributes of extension types
380424
381425
Heap allocated types (created using :c:func:`PyType_FromSpec` or similar),
382426
``PyMemberDef`` may contain definitions for the special members
383-
``__dictoffset__`` and ``__weaklistoffset__``, corresponding to
384-
:c:member:`~PyTypeObject.tp_dictoffset` and
385-
:c:member:`~PyTypeObject.tp_weaklistoffset` in type objects.
427+
``__dictoffset__``, ``__weaklistoffset__`` and ``__vectorcalloffset__``,
428+
corresponding to
429+
:c:member:`~PyTypeObject.tp_dictoffset`,
430+
:c:member:`~PyTypeObject.tp_weaklistoffset` and
431+
:c:member:`~PyTypeObject.tp_vectorcall_offset` in type objects.
386432
These must be defined with ``T_PYSSIZET`` and ``READONLY``, for example::
387433
388434
static PyMemberDef spam_type_members[] = {

Doc/c-api/type.rst

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,38 @@ Type Objects
109109
110110
.. versionadded:: 3.4
111111
112+
.. c:function:: PyObject* PyType_GetModule(PyTypeObject *type)
113+
114+
Return the module object associated with the given type when the type was
115+
created using :c:func:`PyType_FromModuleAndSpec`.
116+
117+
If no module is associated with the given type, sets :py:class:`TypeError`
118+
and returns ``NULL``.
119+
120+
.. versionadded:: 3.9
121+
122+
.. c:function:: void* PyType_GetModuleState(PyTypeObject *type)
123+
124+
Return the state of the module object associated with the given type.
125+
This is a shortcut for calling :c:func:`PyModule_GetState()` on the result
126+
of :c:func:`PyType_GetModule`.
127+
128+
If no module is associated with the given type, sets :py:class:`TypeError`
129+
and returns ``NULL``.
130+
131+
If the *type* has an associated module but its state is ``NULL``,
132+
returns ``NULL`` without setting an exception.
133+
134+
.. versionadded:: 3.9
135+
112136
113137
Creating Heap-Allocated Types
114138
.............................
115139
116140
The following functions and structs are used to create
117141
:ref:`heap types <heap-types>`.
118142
119-
.. c:function:: PyObject* PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
143+
.. c:function:: PyObject* PyType_FromModuleAndSpec(PyObject *module, PyType_Spec *spec, PyObject *bases)
120144
121145
Creates and returns a heap type object from the *spec*
122146
(:const:`Py_TPFLAGS_HEAPTYPE`).
@@ -127,8 +151,18 @@ The following functions and structs are used to create
127151
If *bases* is ``NULL``, the *Py_tp_base* slot is used instead.
128152
If that also is ``NULL``, the new type derives from :class:`object`.
129153
154+
The *module* must be a module object or ``NULL``.
155+
If not ``NULL``, the module is associated with the new type and can later be
156+
retreived with :c:func:`PyType_GetModule`.
157+
130158
This function calls :c:func:`PyType_Ready` on the new type.
131159
160+
.. versionadded:: 3.9
161+
162+
.. c:function:: PyObject* PyType_FromSpecWithBases(PyType_Spec *spec, PyObject *bases)
163+
164+
Equivalent to ``PyType_FromModuleAndSpec(NULL, spec, bases)``.
165+
132166
.. versionadded:: 3.3
133167
134168
.. c:function:: PyObject* PyType_FromSpec(PyType_Spec *spec)
@@ -194,6 +228,7 @@ The following functions and structs are used to create
194228
* :c:member:`~PyTypeObject.tp_dictoffset`
195229
(see :ref:`PyMemberDef <pymemberdef-offsets>`)
196230
* :c:member:`~PyTypeObject.tp_vectorcall_offset`
231+
(see :ref:`PyMemberDef <pymemberdef-offsets>`)
197232
* :c:member:`~PyBufferProcs.bf_getbuffer`
198233
* :c:member:`~PyBufferProcs.bf_releasebuffer`
199234

Doc/conf.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
# ---------------------
1515

1616
extensions = ['sphinx.ext.coverage', 'sphinx.ext.doctest',
17-
'pyspecific', 'c_annotations', 'escape4chm']
17+
'pyspecific', 'c_annotations', 'escape4chm',
18+
'asdl_highlight']
1819

1920

2021
doctest_global_setup = '''

Doc/library/array.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ defined:
2222
+-----------+--------------------+-------------------+-----------------------+-------+
2323
| ``'B'`` | unsigned char | int | 1 | |
2424
+-----------+--------------------+-------------------+-----------------------+-------+
25-
| ``'u'`` | Py_UNICODE | Unicode character | 2 | \(1) |
25+
| ``'u'`` | wchar_t | Unicode character | 2 | \(1) |
2626
+-----------+--------------------+-------------------+-----------------------+-------+
2727
| ``'h'`` | signed short | int | 2 | |
2828
+-----------+--------------------+-------------------+-----------------------+-------+
@@ -48,15 +48,16 @@ defined:
4848
Notes:
4949

5050
(1)
51-
The ``'u'`` type code corresponds to Python's obsolete unicode character
52-
(:c:type:`Py_UNICODE` which is :c:type:`wchar_t`). Depending on the
53-
platform, it can be 16 bits or 32 bits.
51+
It can be 16 bits or 32 bits depending on the platform.
5452

55-
``'u'`` will be removed together with the rest of the :c:type:`Py_UNICODE`
56-
API.
53+
.. versionchanged:: 3.9
54+
``array('u')`` now uses ``wchar_t`` as C type instead of deprecated
55+
``Py_UNICODE``. This change doesn't affect to its behavior because
56+
``Py_UNICODE`` is alias of ``wchar_t`` since Python 3.3.
5757

5858
.. deprecated-removed:: 3.3 4.0
5959

60+
6061
The actual representation of values is determined by the machine architecture
6162
(strictly speaking, by the C implementation). The actual size can be accessed
6263
through the :attr:`itemsize` attribute.

Doc/library/ast.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Abstract Grammar
3535
The abstract grammar is currently defined as follows:
3636

3737
.. literalinclude:: ../../Parser/Python.asdl
38-
:language: none
38+
:language: asdl
3939

4040

4141
Node classes

Doc/library/asyncio-task.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ Waiting Primitives
575575
if task in done:
576576
# Everything will work as expected now.
577577

578-
.. deprecated:: 3.8
578+
.. deprecated-removed:: 3.8 3.11
579579

580580
Passing coroutine objects to ``wait()`` directly is
581581
deprecated.

Doc/library/code.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ build applications which provide an interactive interpreter prompt.
5656

5757
*source* is the source string; *filename* is the optional filename from which
5858
source was read, defaulting to ``'<input>'``; and *symbol* is the optional
59-
grammar start symbol, which should be either ``'single'`` (the default) or
60-
``'eval'``.
59+
grammar start symbol, which should be ``'single'`` (the default), ``'eval'``
60+
or ``'exec'``.
6161

6262
Returns a code object (the same as ``compile(source, filename, symbol)``) if the
6363
command is complete and valid; ``None`` if the command is incomplete; raises

Doc/library/codeop.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ To do just the former:
4343
:exc:`OverflowError` or :exc:`ValueError` if there is an invalid literal.
4444

4545
The *symbol* argument determines whether *source* is compiled as a statement
46-
(``'single'``, the default) or as an :term:`expression` (``'eval'``). Any
47-
other value will cause :exc:`ValueError` to be raised.
46+
(``'single'``, the default), as a sequence of statements (``'exec'``) or
47+
as an :term:`expression` (``'eval'``). Any other value will
48+
cause :exc:`ValueError` to be raised.
4849

4950
.. note::
5051

0 commit comments

Comments
 (0)