Merge branch 'main' into type_hasattr

Doc/c-api/typeobj.rst

@@ -147,6 +147,8 @@ Quick Reference
  +------------------------------------------------+-----------------------------------+-------------------+---+---+---+---+
  | :c:member:`~PyTypeObject.tp_vectorcall` | :c:type:`vectorcallfunc` | | | | | |
  +------------------------------------------------+-----------------------------------+-------------------+---+---+---+---+
+ | :c:member:`~PyTypeObject.tp_watched` | char | | | | | |
+ +------------------------------------------------+-----------------------------------+-------------------+---+---+---+---+
 
 .. [#slots]
 
@@ -2090,6 +2092,13 @@ and :c:type:`PyType_Type` effectively act as defaults.)
  .. versionadded:: 3.9 (the field exists since 3.8 but it's only used since 3.9)
 
 
+.. c:member:: char PyTypeObject.tp_watched
+
+ Internal. Do not use.
+
+ .. versionadded:: 3.12
+
+
 .. _static-types:
 
 Static Types

Doc/includes/typestruct.h

@@ -80,4 +80,7 @@ typedef struct _typeobject {
 
  destructor tp_finalize;
  vectorcallfunc tp_vectorcall;
+
+ /* bitset of which type-watchers care about this type */
+ char tp_watched;
 } PyTypeObject;

Doc/library/asyncio-stream.rst

@@ -52,6 +52,7 @@ and work with streams:
  limit=None, ssl=None, family=0, proto=0, \
  flags=0, sock=None, local_addr=None, \
  server_hostname=None, ssl_handshake_timeout=None, \
+ ssl_shutdown_timeout=None, \
  happy_eyeballs_delay=None, interleave=None)
 
  Establish a network connection and return a pair of
@@ -82,14 +83,17 @@ and work with streams:
  .. versionchanged:: 3.10
  Removed the *loop* parameter.
 
+ .. versionchanged:: 3.11
+ Added the *ssl_shutdown_timeout* parameter.
+
 
 .. coroutinefunction:: start_server(client_connected_cb, host=None, \
  port=None, *, limit=None, \
  family=socket.AF_UNSPEC, \
  flags=socket.AI_PASSIVE, sock=None, \
  backlog=100, ssl=None, reuse_address=None, \
  reuse_port=None, ssl_handshake_timeout=None, \
- start_serving=True)
+ ssl_shutdown_timeout=None, start_serving=True)
 
  Start a socket server.
 
@@ -121,12 +125,15 @@ and work with streams:
  .. versionchanged:: 3.10
  Removed the *loop* parameter.
 
+ .. versionchanged:: 3.11
+ Added the *ssl_shutdown_timeout* parameter.
+
 
 .. rubric:: Unix Sockets
 
 .. coroutinefunction:: open_unix_connection(path=None, *, limit=None, \
  ssl=None, sock=None, server_hostname=None, \
- ssl_handshake_timeout=None)
+ ssl_handshake_timeout=None, ssl_shutdown_timeout=None)
 
  Establish a Unix socket connection and return a pair of
  ``(reader, writer)``.
@@ -150,10 +157,14 @@ and work with streams:
  .. versionchanged:: 3.10
  Removed the *loop* parameter.
 
+ .. versionchanged:: 3.11
+ Added the *ssl_shutdown_timeout* parameter.
+
 
 .. coroutinefunction:: start_unix_server(client_connected_cb, path=None, \
  *, limit=None, sock=None, backlog=100, ssl=None, \
- ssl_handshake_timeout=None, start_serving=True)
+ ssl_handshake_timeout=None, \
+ ssl_shutdown_timeout=None, start_serving=True)
 
  Start a Unix socket server.
 
@@ -176,6 +187,9 @@ and work with streams:
  .. versionchanged:: 3.10
  Removed the *loop* parameter.
 
+ .. versionchanged:: 3.11
+ Added the *ssl_shutdown_timeout* parameter.
+
 
 StreamReader
 ============

Doc/library/itertools.rst

@@ -829,10 +829,6 @@ which incur interpreter overhead.
  "Count how many times the predicate is true"
  return sum(map(pred, iterable))
 
- def pad_none(iterable):
- "Returns the sequence elements and then returns None indefinitely."
- return chain(iterable, repeat(None))
-
  def ncycles(iterable, n):
  "Returns the sequence elements n times"
  return chain.from_iterable(repeat(tuple(iterable), n))
@@ -1193,9 +1189,6 @@ which incur interpreter overhead.
  >>> take(5, map(int, repeatfunc(random.random)))
  [0, 0, 0, 0, 0]
 
- >>> list(islice(pad_none('abc'), 0, 6))
- ['a', 'b', 'c', None, None, None]
-
  >>> list(ncycles('abc', 3))
  ['a', 'b', 'c', 'a', 'b', 'c', 'a', 'b', 'c']
 

Doc/library/random.rst

@@ -320,14 +320,17 @@ be found in any statistics text.
  ``beta > 0``. Returned values range between 0 and 1.
 
 
-.. function:: expovariate(lambd)
+.. function:: expovariate(lambd = 1.0)
 
  Exponential distribution. *lambd* is 1.0 divided by the desired
  mean. It should be nonzero. (The parameter would be called
  "lambda", but that is a reserved word in Python.) Returned values
  range from 0 to positive infinity if *lambd* is positive, and from
  negative infinity to 0 if *lambd* is negative.
 
+ .. versionchanged:: 3.12
+ Added the default value for ``lambd``.
+
 
 .. function:: gammavariate(alpha, beta)
 

Doc/library/venv.rst

@@ -497,76 +497,68 @@ subclass which installs setuptools and pip into a created virtual environment::
  url = 'https://bootstrap.pypa.io/get-pip.py'
  self.install_script(context, 'pip', url)
 
+
  def main(args=None):
- compatible = True
- if sys.version_info < (3, 3):
- compatible = False
- elif not hasattr(sys, 'base_prefix'):
- compatible = False
- if not compatible:
- raise ValueError('This script is only for use with '
- 'Python 3.3 or later')
+ import argparse
+
+ parser = argparse.ArgumentParser(prog=__name__,
+ description='Creates virtual Python '
+ 'environments in one or '
+ 'more target '
+ 'directories.')
+ parser.add_argument('dirs', metavar='ENV_DIR', nargs='+',
+ help='A directory in which to create the '
+ 'virtual environment.')
+ parser.add_argument('--no-setuptools', default=False,
+ action='store_true', dest='nodist',
+ help="Don't install setuptools or pip in the "
+ "virtual environment.")
+ parser.add_argument('--no-pip', default=False,
+ action='store_true', dest='nopip',
+ help="Don't install pip in the virtual "
+ "environment.")
+ parser.add_argument('--system-site-packages', default=False,
+ action='store_true', dest='system_site',
+ help='Give the virtual environment access to the '
+ 'system site-packages dir.')
+ if os.name == 'nt':
+ use_symlinks = False
  else:
- import argparse
-
- parser = argparse.ArgumentParser(prog=__name__,
- description='Creates virtual Python '
- 'environments in one or '
- 'more target '
- 'directories.')
- parser.add_argument('dirs', metavar='ENV_DIR', nargs='+',
- help='A directory in which to create the '
- 'virtual environment.')
- parser.add_argument('--no-setuptools', default=False,
- action='store_true', dest='nodist',
- help="Don't install setuptools or pip in the "
- "virtual environment.")
- parser.add_argument('--no-pip', default=False,
- action='store_true', dest='nopip',
- help="Don't install pip in the virtual "
- "environment.")
- parser.add_argument('--system-site-packages', default=False,
- action='store_true', dest='system_site',
- help='Give the virtual environment access to the '
- 'system site-packages dir.')
- if os.name == 'nt':
- use_symlinks = False
- else:
- use_symlinks = True
- parser.add_argument('--symlinks', default=use_symlinks,
- action='store_true', dest='symlinks',
- help='Try to use symlinks rather than copies, '
- 'when symlinks are not the default for '
- 'the platform.')
- parser.add_argument('--clear', default=False, action='store_true',
- dest='clear', help='Delete the contents of the '
- 'virtual environment '
- 'directory if it already '
- 'exists, before virtual '
- 'environment creation.')
- parser.add_argument('--upgrade', default=False, action='store_true',
- dest='upgrade', help='Upgrade the virtual '
- 'environment directory to '
- 'use this version of '
- 'Python, assuming Python '
- 'has been upgraded '
- 'in-place.')
- parser.add_argument('--verbose', default=False, action='store_true',
- dest='verbose', help='Display the output '
- 'from the scripts which '
- 'install setuptools and pip.')
- options = parser.parse_args(args)
- if options.upgrade and options.clear:
- raise ValueError('you cannot supply --upgrade and --clear together.')
- builder = ExtendedEnvBuilder(system_site_packages=options.system_site,
- clear=options.clear,
- symlinks=options.symlinks,
- upgrade=options.upgrade,
- nodist=options.nodist,
- nopip=options.nopip,
- verbose=options.verbose)
- for d in options.dirs:
- builder.create(d)
+ use_symlinks = True
+ parser.add_argument('--symlinks', default=use_symlinks,
+ action='store_true', dest='symlinks',
+ help='Try to use symlinks rather than copies, '
+ 'when symlinks are not the default for '
+ 'the platform.')
+ parser.add_argument('--clear', default=False, action='store_true',
+ dest='clear', help='Delete the contents of the '
+ 'virtual environment '
+ 'directory if it already '
+ 'exists, before virtual '
+ 'environment creation.')
+ parser.add_argument('--upgrade', default=False, action='store_true',
+ dest='upgrade', help='Upgrade the virtual '
+ 'environment directory to '
+ 'use this version of '
+ 'Python, assuming Python '
+ 'has been upgraded '
+ 'in-place.')
+ parser.add_argument('--verbose', default=False, action='store_true',
+ dest='verbose', help='Display the output '
+ 'from the scripts which '
+ 'install setuptools and pip.')
+ options = parser.parse_args(args)
+ if options.upgrade and options.clear:
+ raise ValueError('you cannot supply --upgrade and --clear together.')
+ builder = ExtendedEnvBuilder(system_site_packages=options.system_site,
+ clear=options.clear,
+ symlinks=options.symlinks,
+ upgrade=options.upgrade,
+ nodist=options.nodist,
+ nopip=options.nopip,
+ verbose=options.verbose)
+ for d in options.dirs:
+ builder.create(d)
 
  if __name__ == '__main__':
  rc = 1

Include/cpython/code.h

@@ -16,21 +16,24 @@ extern "C" {
  * 2**32 - 1, rather than INT_MAX.
  */
 
-typedef uint16_t _Py_CODEUNIT;
-
-#ifdef WORDS_BIGENDIAN
-# define _Py_OPCODE(word) ((word) >> 8)
-# define _Py_OPARG(word) ((word) & 255)
-# define _Py_MAKECODEUNIT(opcode, oparg) (((opcode)<<8)|(oparg))
-#else
-# define _Py_OPCODE(word) ((word) & 255)
-# define _Py_OPARG(word) ((word) >> 8)
-# define _Py_MAKECODEUNIT(opcode, oparg) ((opcode)|((oparg)<<8))
-#endif
+typedef union {
+ uint16_t cache;
+ struct {
+ uint8_t opcode;
+ uint8_t oparg;
+ };
+} _Py_CODEUNIT;
+
+#define _Py_OPCODE(word) ((word).opcode)
+#define _Py_OPARG(word) ((word).oparg)
+
+static inline void
+_py_set_opcode(_Py_CODEUNIT *word, uint8_t opcode)
+{
+ word->opcode = opcode;
+}
 
-// Use "unsigned char" instead of "uint8_t" here to avoid illegal aliasing:
-#define _Py_SET_OPCODE(word, opcode) \
- do { ((unsigned char *)&(word))[0] = (opcode); } while (0)
+#define _Py_SET_OPCODE(word, opcode) _py_set_opocde(&(word), opcode)
 
 typedef struct {
  PyObject *_co_code;