[pull] main from python:main

Doc/library/colorsys.rst

@@ -19,7 +19,7 @@ spaces, the coordinates are all between 0 and 1.
 .. seealso::
 
    More information about color spaces can be found at
-   https://poynton.ca/ColorFAQ.html and
+   https://www.poynton.ca/pdf/ColourFAQ.pdf and
    https://www.cambridgeincolour.com/tutorials/color-spaces.htm.
 
 The :mod:`!colorsys` module defines the following functions:

Doc/library/importlib.metadata.rst

@@ -90,6 +90,7 @@ collection of :ref:`EntryPoint <entry-points>` objects.
 
 You can get the :ref:`metadata for a distribution <metadata>`::
 
+    >>> from importlib.metadata import metadata  # doctest: +SKIP
     >>> list(metadata('wheel'))  # doctest: +SKIP
     ['Metadata-Version', 'Name', 'Version', 'Summary', 'Home-page', 'Author', 'Author-email', 'Maintainer', 'Maintainer-email', 'License', 'Project-URL', 'Project-URL', 'Project-URL', 'Keywords', 'Platform', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Classifier', 'Requires-Python', 'Provides-Extra', 'Requires-Dist', 'Requires-Dist']
 

Doc/using/windows.rst

@@ -943,6 +943,37 @@ checking for that feed.
    }
 
 
+Proxy Settings
+--------------
+
+.. versionadded:: 26.4
+
+By default, the Python install manager will use your system-wide proxy settings,
+including automatic authentication. For most users, this behaves the same as
+your browser and other applications.
+
+To override the settings, use the ``NO_PROXY``, ``HTTP_PROXY`` and
+``HTTPS_PROXY`` environment variables. These should be set in the terminal
+session before using the Python install manager. Other applications may also
+use the variables, so use caution before setting them globally for your entire
+machine.
+
+Setting ``NO_PROXY`` to any non-empty value will disable the use of any proxy.
+Use this to bypass your system's default proxy setting and attempt to access the
+index server directly.
+
+Setting ``HTTPS_PROXY`` to a string like ``example.com:8080`` will connect to
+that proxy server for all HTTPS connections. For the default index, all
+connections will be using HTTPS, and so this is the usual setting to override.
+
+The ``HTTP_PROXY`` variable may be needed if you are using a private index
+server that does not use encrypted connections, but does require the default
+proxy server to be overridden. It follows the same format as ``HTTPS_PROXY``.
+
+Credentials may be embedded in either setting, however, when ``HTTPS_PROXY`` has
+credentials embedded they will be used in preference to other credentials. Only
+one set of credentials will be used for both types of proxy.
+
 .. _pymanager-troubleshoot:
 
 Troubleshooting

Include/cpython/object.h

@@ -352,7 +352,7 @@ PyAPI_FUNC(PyObject *) _PyObject_FunctionStr(PyObject *);
 #ifdef _Py_TYPEOF
 #define Py_SETREF(dst, src) \
     do { \
-        _Py_TYPEOF(dst)* _tmp_dst_ptr = &(dst); \
+        _Py_TYPEOF(&(dst)) _tmp_dst_ptr = &(dst); \
         _Py_TYPEOF(dst) _tmp_old_dst = (*_tmp_dst_ptr); \
         *_tmp_dst_ptr = (src); \
         Py_DECREF(_tmp_old_dst); \
@@ -374,7 +374,7 @@ PyAPI_FUNC(PyObject *) _PyObject_FunctionStr(PyObject *);
 #ifdef _Py_TYPEOF
 #define Py_XSETREF(dst, src) \
     do { \
-        _Py_TYPEOF(dst)* _tmp_dst_ptr = &(dst); \
+        _Py_TYPEOF(&(dst)) _tmp_dst_ptr = &(dst); \
         _Py_TYPEOF(dst) _tmp_old_dst = (*_tmp_dst_ptr); \
         *_tmp_dst_ptr = (src); \
         Py_XDECREF(_tmp_old_dst); \

Include/pyport.h

@@ -538,15 +538,18 @@ extern "C" {
 //
 // Example: _Py_TYPEOF(x) x_copy = (x);
 //
-// On C23, use typeof(). Otherwise __typeof__() if on GCC, clang or
-// MSVC 17.9 and newer. Else if on C++11 or newer, decltype() is used.
+// On C23, use typeof(). On C++11, use decltype(). Otherwise, use __typeof__()
+// if on GCC, clang or MSVC 17.9 and newer.
+//
+// On MSVC, check also _MSVC_LANG since __cplusplus is 199711L unless
+// the /Zc:__cplusplus flag is used.
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 202311L
 #  define _Py_TYPEOF(expr) typeof(expr)
+#elif defined(__cplusplus) && (__cplusplus >= 201103L ||  _MSVC_LANG >= 201103L)
+#  define _Py_TYPEOF(expr) decltype(expr)
 #elif defined(__GNUC__) || defined(__clang__) || \
     (defined(_MSC_VER) && _MSC_VER >= 1939)
 #  define _Py_TYPEOF(expr) __typeof__(expr)
-#elif defined(__cplusplus) && __cplusplus >= 201103L
-#  define _Py_TYPEOF(expr) decltype(expr)
 #endif
 
 

Include/refcount.h

@@ -482,7 +482,7 @@ static inline Py_ALWAYS_INLINE void Py_DECREF(PyObject *op)
 #ifdef _Py_TYPEOF
 #define Py_CLEAR(op) \
     do { \
-        _Py_TYPEOF(op)* _tmp_op_ptr = &(op); \
+        _Py_TYPEOF(&(op)) _tmp_op_ptr = &(op); \
         _Py_TYPEOF(op) _tmp_old_op = (*_tmp_op_ptr); \
         if (_tmp_old_op != _Py_NULL) { \
             *_tmp_op_ptr = _Py_NULL; \

Misc/NEWS.d/next/Build/2026-08-14-20-16-55.gh-issue-153400.9Oxi-N.rst

@@ -0,0 +1 @@
+Support os.getrandom() when building Python with old glibc versions and recent Linux kernel (glibc 2.25 or older and Linux kernel 3.17 or newer). Get the syscall number from kernel headers, rather than glibc headers.

Modules/posixmodule.c

@@ -161,6 +161,9 @@
 #ifdef HAVE_SYS_SYSCALL_H
 #  include <sys/syscall.h>        // syscall(), __NR_xxx syscall numbers
 #endif
+#if !defined(SYS_getrandom) && defined(__NR_getrandom)
+#  define SYS_getrandom __NR_getrandom
+#endif
 
 #ifdef HAVE_POSIX_SPAWN
 #  include <spawn.h>              // posix_spawn()

Python/bootstrap_hash.c

@@ -23,7 +23,10 @@
 #    include <sys/random.h>       // getrandom()
 #  endif
 #  if !defined(HAVE_GETRANDOM) && defined(HAVE_GETRANDOM_SYSCALL)
-#    include <sys/syscall.h>      // SYS_getrandom
+#    include <sys/syscall.h>      // __NR_getrandom, SYS_getrandom
+#    if !defined(SYS_getrandom) && defined(__NR_getrandom)
+#      define SYS_getrandom __NR_getrandom
+#    endif
 #  endif
 #endif
 

configure.ac

@@ -7895,7 +7895,11 @@ AC_LINK_IFELSE(
     #include <stddef.h>
     #include <unistd.h>
     #include <sys/syscall.h>
-    #include <linux/random.h>
+    #include <linux/random.h>  // GRND_NONBLOCK
+
+    #if !defined(SYS_getrandom) && defined(__NR_getrandom)
+    #  define SYS_getrandom __NR_getrandom
+    #endif
 
     int main(void) {
         char buffer[1];