Merge remote-tracking branch 'upstream/main' into jit/gc

Author: ashm-dev

Doc/deprecations/pending-removal-in-3.20.rst

@@ -9,6 +9,7 @@ Pending removal in Python 3.20
   - :mod:`csv`
   - :mod:`!ctypes.macholib`
   - :mod:`decimal` (use :data:`decimal.SPEC_VERSION` instead)
+  - :mod:`http.server`
   - :mod:`imaplib`
   - :mod:`ipaddress`
   - :mod:`json`

Doc/library/functions.rst

@@ -606,16 +606,16 @@ are always available.  They are listed here in alphabetical order.
       This function executes arbitrary code. Calling it with
       user-supplied input may lead to security vulnerabilities.
 
-   The *expression* argument is parsed and evaluated as a Python expression
+   The *source* argument is parsed and evaluated as a Python expression
    (technically speaking, a condition list) using the *globals* and *locals*
    mappings as global and local namespace.  If the *globals* dictionary is
    present and does not contain a value for the key ``__builtins__``, a
    reference to the dictionary of the built-in module :mod:`builtins` is
-   inserted under that key before *expression* is parsed.  That way you can
+   inserted under that key before *source* is parsed.  That way you can
    control what builtins are available to the executed code by inserting your
    own ``__builtins__`` dictionary into *globals* before passing it to
    :func:`eval`.  If the *locals* mapping is omitted it defaults to the
-   *globals* dictionary.  If both mappings are omitted, the expression is
+   *globals* dictionary.  If both mappings are omitted, the source is
    executed with the *globals* and *locals* in the environment where
    :func:`eval` is called.  Note, *eval()* will only have access to the
    :term:`nested scopes <nested scope>` (non-locals) in the enclosing

Doc/whatsnew/3.15.rst

@@ -1026,6 +1026,7 @@ New deprecations
     - :mod:`csv`
     - :mod:`!ctypes.macholib`
     - :mod:`decimal` (use :data:`decimal.SPEC_VERSION` instead)
+    - :mod:`http.server`
     - :mod:`imaplib`
     - :mod:`ipaddress`
     - :mod:`json`

Include/internal/pycore_opcode_metadata.h

@@ -57,6 +57,8 @@ extern "C" {
     _Py_atomic_store_uintptr_release(&value, new_value)
 #define FT_ATOMIC_STORE_SSIZE_RELAXED(value, new_value) \
     _Py_atomic_store_ssize_relaxed(&value, new_value)
+#define FT_ATOMIC_STORE_SSIZE_RELEASE(value, new_value) \
+    _Py_atomic_store_ssize_release(&value, new_value)
 #define FT_ATOMIC_STORE_UINT8_RELAXED(value, new_value) \
     _Py_atomic_store_uint8_relaxed(&value, new_value)
 #define FT_ATOMIC_STORE_UINT16_RELAXED(value, new_value) \
@@ -140,6 +142,7 @@ extern "C" {
 #define FT_ATOMIC_STORE_PTR_RELEASE(value, new_value) value = new_value
 #define FT_ATOMIC_STORE_UINTPTR_RELEASE(value, new_value) value = new_value
 #define FT_ATOMIC_STORE_SSIZE_RELAXED(value, new_value) value = new_value
+#define FT_ATOMIC_STORE_SSIZE_RELEASE(value, new_value) value = new_value
 #define FT_ATOMIC_STORE_UINT8_RELAXED(value, new_value) value = new_value
 #define FT_ATOMIC_STORE_UINT16_RELAXED(value, new_value) value = new_value
 #define FT_ATOMIC_STORE_UINT32_RELAXED(value, new_value) value = new_value

Include/internal/pycore_pyatomic_ft_wrappers.h

@@ -61,8 +61,6 @@
 # (Actually, the latter is only true if you know the server configuration
 # at the time the request was made!)
 
-__version__ = "0.6"
-
 __all__ = [
     "HTTPServer", "ThreadingHTTPServer",
     "HTTPSServer", "ThreadingHTTPSServer",
@@ -280,7 +278,7 @@ class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
     # The server software version.  You may want to override this.
     # The format is multiple whitespace-separated strings,
     # where each string is of the form name[/version].
-    server_version = "BaseHTTP/" + __version__
+    server_version = "BaseHTTP"
 
     error_message_format = DEFAULT_ERROR_MESSAGE
     error_content_type = DEFAULT_ERROR_CONTENT_TYPE
@@ -690,7 +688,7 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
 
     """
 
-    server_version = "SimpleHTTP/" + __version__
+    server_version = "SimpleHTTP"
     index_pages = ("index.html", "index.htm")
     extensions_map = _encodings_map_default = {
         '.gz': 'application/gzip',
@@ -1080,5 +1078,14 @@ class HTTPSDualStackServer(DualStackServerMixin, ThreadingHTTPSServer):
     )
 
 
+def __getattr__(name):
+    if name == "__version__":
+        from warnings import _deprecated
+
+        _deprecated("__version__", remove=(3, 20))
+        return "0.6"  # Do not change
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+
 if __name__ == '__main__':
     _main()

Include/internal/pycore_uop_ids.h

@@ -41,24 +41,20 @@ class CustomFormatter(
 
 _HELP_DESCRIPTION = """Sample a process's stack frames and generate profiling data.
 
-Commands:
-  run        Run and profile a script or module
-  attach     Attach to and profile a running process
-
 Examples:
   # Run and profile a script
-  python -m profiling.sampling run script.py arg1 arg2
+  `python -m profiling.sampling run script.py arg1 arg2`
 
   # Attach to a running process
-  python -m profiling.sampling attach 1234
+  `python -m profiling.sampling attach 1234`
 
   # Live interactive mode for a script
-  python -m profiling.sampling run --live script.py
+  `python -m profiling.sampling run --live script.py`
 
   # Live interactive mode for a running process
-  python -m profiling.sampling attach --live 1234
+  `python -m profiling.sampling attach --live 1234`
 
-Use 'python -m profiling.sampling <command> --help' for command-specific help."""
+Use `python -m profiling.sampling <command> --help` for command-specific help."""
 
 
 # Constants for socket synchronization
@@ -506,19 +502,19 @@ def main():
 
 Examples:
   # Run and profile a module
-  python -m profiling.sampling run -m mymodule arg1 arg2
+  `python -m profiling.sampling run -m mymodule arg1 arg2`
 
   # Generate flamegraph from a script
-  python -m profiling.sampling run --flamegraph -o output.html script.py
+  `python -m profiling.sampling run --flamegraph -o output.html script.py`
 
   # Profile with custom interval and duration
-  python -m profiling.sampling run -i 50 -d 30 script.py
+  `python -m profiling.sampling run -i 50 -d 30 script.py`
 
   # Save collapsed stacks to file
-  python -m profiling.sampling run --collapsed -o stacks.txt script.py
+  `python -m profiling.sampling run --collapsed -o stacks.txt script.py`
 
   # Live interactive mode for a script
-  python -m profiling.sampling run --live script.py""",
+  `python -m profiling.sampling run --live script.py`""",
     )
     run_parser.add_argument(
         "-m",
@@ -554,10 +550,10 @@ def main():
 
 Examples:
   # Profile all threads, sort by total time
-  python -m profiling.sampling attach -a --sort tottime 1234
+  `python -m profiling.sampling attach -a --sort tottime 1234`
 
   # Live interactive mode for a running process
-  python -m profiling.sampling attach --live 1234""",
+  `python -m profiling.sampling attach --live 1234`""",
     )
     attach_parser.add_argument(
         "pid",

Include/internal/pycore_uop_metadata.h

@@ -1938,8 +1938,7 @@ def testfunc(n):
         self.assertIsNotNone(ex)
         uops = get_opnames(ex)
         self.assertIn("_CALL_TUPLE_1", uops)
-        # Re-enable later gh-134584
-        # self.assertIn("_POP_TOP_NOP", uops)
+        self.assertIn("_POP_TOP_NOP", uops)
 
     def test_call_str_1(self):
         def testfunc(n):