Skip to content

Commit c689b92

Browse files
eendebakpteendebakpt
authored
Merge branch 'main' into type_hasattr
2 parents 5322a2a + b430399 commit c689b92

31 files changed

+440
-370
lines changed

‎Doc/c-api/typeobj.rst

+9
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ Quick Reference
147147
+------------------------------------------------+-----------------------------------+-------------------+---+---+---+---+
148148
| :c:member:`~PyTypeObject.tp_vectorcall` | :c:type:`vectorcallfunc` | | | | | |
149149
+------------------------------------------------+-----------------------------------+-------------------+---+---+---+---+
150+
| :c:member:`~PyTypeObject.tp_watched` | char | | | | | |
151+
+------------------------------------------------+-----------------------------------+-------------------+---+---+---+---+
150152

151153
.. [#slots]
152154
@@ -2090,6 +2092,13 @@ and :c:type:`PyType_Type` effectively act as defaults.)
20902092
.. versionadded:: 3.9 (the field exists since 3.8 but it's only used since 3.9)
20912093

20922094

2095+
.. c:member:: char PyTypeObject.tp_watched
2096+
2097+
Internal. Do not use.
2098+
2099+
.. versionadded:: 3.12
2100+
2101+
20932102
.. _static-types:
20942103

20952104
Static Types

‎Doc/includes/typestruct.h

+3
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,7 @@ typedef struct _typeobject {
8080

8181
destructor tp_finalize;
8282
vectorcallfunc tp_vectorcall;
83+
84+
/* bitset of which type-watchers care about this type */
85+
char tp_watched;
8386
} PyTypeObject;

‎Doc/library/asyncio-stream.rst

+17-3
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ and work with streams:
5252
limit=None, ssl=None, family=0, proto=0, \
5353
flags=0, sock=None, local_addr=None, \
5454
server_hostname=None, ssl_handshake_timeout=None, \
55+
ssl_shutdown_timeout=None, \
5556
happy_eyeballs_delay=None, interleave=None)
5657

5758
Establish a network connection and return a pair of
@@ -82,14 +83,17 @@ and work with streams:
8283
.. versionchanged:: 3.10
8384
Removed the *loop* parameter.
8485

86+
.. versionchanged:: 3.11
87+
Added the *ssl_shutdown_timeout* parameter.
88+
8589

8690
.. coroutinefunction:: start_server(client_connected_cb, host=None, \
8791
port=None, *, limit=None, \
8892
family=socket.AF_UNSPEC, \
8993
flags=socket.AI_PASSIVE, sock=None, \
9094
backlog=100, ssl=None, reuse_address=None, \
9195
reuse_port=None, ssl_handshake_timeout=None, \
92-
start_serving=True)
96+
ssl_shutdown_timeout=None, start_serving=True)
9397
9498
Start a socket server.
9599

@@ -121,12 +125,15 @@ and work with streams:
121125
.. versionchanged:: 3.10
122126
Removed the *loop* parameter.
123127

128+
.. versionchanged:: 3.11
129+
Added the *ssl_shutdown_timeout* parameter.
130+
124131

125132
.. rubric:: Unix Sockets
126133

127134
.. coroutinefunction:: open_unix_connection(path=None, *, limit=None, \
128135
ssl=None, sock=None, server_hostname=None, \
129-
ssl_handshake_timeout=None)
136+
ssl_handshake_timeout=None, ssl_shutdown_timeout=None)
130137

131138
Establish a Unix socket connection and return a pair of
132139
``(reader, writer)``.
@@ -150,10 +157,14 @@ and work with streams:
150157
.. versionchanged:: 3.10
151158
Removed the *loop* parameter.
152159

160+
.. versionchanged:: 3.11
161+
Added the *ssl_shutdown_timeout* parameter.
162+
153163

154164
.. coroutinefunction:: start_unix_server(client_connected_cb, path=None, \
155165
*, limit=None, sock=None, backlog=100, ssl=None, \
156-
ssl_handshake_timeout=None, start_serving=True)
166+
ssl_handshake_timeout=None, \
167+
ssl_shutdown_timeout=None, start_serving=True)
157168
158169
Start a Unix socket server.
159170

@@ -176,6 +187,9 @@ and work with streams:
176187
.. versionchanged:: 3.10
177188
Removed the *loop* parameter.
178189

190+
.. versionchanged:: 3.11
191+
Added the *ssl_shutdown_timeout* parameter.
192+
179193

180194
StreamReader
181195
============

‎Doc/library/itertools.rst

-7
Original file line numberDiff line numberDiff line change
@@ -829,10 +829,6 @@ which incur interpreter overhead.
829829
"Count how many times the predicate is true"
830830
return sum(map(pred, iterable))
831831

832-
def pad_none(iterable):
833-
"Returns the sequence elements and then returns None indefinitely."
834-
return chain(iterable, repeat(None))
835-
836832
def ncycles(iterable, n):
837833
"Returns the sequence elements n times"
838834
return chain.from_iterable(repeat(tuple(iterable), n))
@@ -1193,9 +1189,6 @@ which incur interpreter overhead.
11931189
>>> take(5, map(int, repeatfunc(random.random)))
11941190
[0, 0, 0, 0, 0]
11951191

1196-
>>> list(islice(pad_none('abc'), 0, 6))
1197-
['a', 'b', 'c', None, None, None]
1198-
11991192
>>> list(ncycles('abc', 3))
12001193
['a', 'b', 'c', 'a', 'b', 'c', 'a', 'b', 'c']
12011194

‎Doc/library/random.rst

+4-1
Original file line numberDiff line numberDiff line change
@@ -320,14 +320,17 @@ be found in any statistics text.
320320
``beta > 0``. Returned values range between 0 and 1.
321321

322322

323-
.. function:: expovariate(lambd)
323+
.. function:: expovariate(lambd = 1.0)
324324

325325
Exponential distribution. *lambd* is 1.0 divided by the desired
326326
mean. It should be nonzero. (The parameter would be called
327327
"lambda", but that is a reserved word in Python.) Returned values
328328
range from 0 to positive infinity if *lambd* is positive, and from
329329
negative infinity to 0 if *lambd* is negative.
330330

331+
.. versionchanged:: 3.12
332+
Added the default value for ``lambd``.
333+
331334

332335
.. function:: gammavariate(alpha, beta)
333336

‎Doc/library/venv.rst

+60-68
Original file line numberDiff line numberDiff line change
@@ -497,76 +497,68 @@ subclass which installs setuptools and pip into a created virtual environment::
497497
url = 'https://bootstrap.pypa.io/get-pip.py'
498498
self.install_script(context, 'pip', url)
499499

500+
500501
def main(args=None):
501-
compatible = True
502-
if sys.version_info < (3, 3):
503-
compatible = False
504-
elif not hasattr(sys, 'base_prefix'):
505-
compatible = False
506-
if not compatible:
507-
raise ValueError('This script is only for use with '
508-
'Python 3.3 or later')
502+
import argparse
503+
504+
parser = argparse.ArgumentParser(prog=__name__,
505+
description='Creates virtual Python '
506+
'environments in one or '
507+
'more target '
508+
'directories.')
509+
parser.add_argument('dirs', metavar='ENV_DIR', nargs='+',
510+
help='A directory in which to create the '
511+
'virtual environment.')
512+
parser.add_argument('--no-setuptools', default=False,
513+
action='store_true', dest='nodist',
514+
help="Don't install setuptools or pip in the "
515+
"virtual environment.")
516+
parser.add_argument('--no-pip', default=False,
517+
action='store_true', dest='nopip',
518+
help="Don't install pip in the virtual "
519+
"environment.")
520+
parser.add_argument('--system-site-packages', default=False,
521+
action='store_true', dest='system_site',
522+
help='Give the virtual environment access to the '
523+
'system site-packages dir.')
524+
if os.name == 'nt':
525+
use_symlinks = False
509526
else:
510-
import argparse
511-
512-
parser = argparse.ArgumentParser(prog=__name__,
513-
description='Creates virtual Python '
514-
'environments in one or '
515-
'more target '
516-
'directories.')
517-
parser.add_argument('dirs', metavar='ENV_DIR', nargs='+',
518-
help='A directory in which to create the '
519-
'virtual environment.')
520-
parser.add_argument('--no-setuptools', default=False,
521-
action='store_true', dest='nodist',
522-
help="Don't install setuptools or pip in the "
523-
"virtual environment.")
524-
parser.add_argument('--no-pip', default=False,
525-
action='store_true', dest='nopip',
526-
help="Don't install pip in the virtual "
527-
"environment.")
528-
parser.add_argument('--system-site-packages', default=False,
529-
action='store_true', dest='system_site',
530-
help='Give the virtual environment access to the '
531-
'system site-packages dir.')
532-
if os.name == 'nt':
533-
use_symlinks = False
534-
else:
535-
use_symlinks = True
536-
parser.add_argument('--symlinks', default=use_symlinks,
537-
action='store_true', dest='symlinks',
538-
help='Try to use symlinks rather than copies, '
539-
'when symlinks are not the default for '
540-
'the platform.')
541-
parser.add_argument('--clear', default=False, action='store_true',
542-
dest='clear', help='Delete the contents of the '
543-
'virtual environment '
544-
'directory if it already '
545-
'exists, before virtual '
546-
'environment creation.')
547-
parser.add_argument('--upgrade', default=False, action='store_true',
548-
dest='upgrade', help='Upgrade the virtual '
549-
'environment directory to '
550-
'use this version of '
551-
'Python, assuming Python '
552-
'has been upgraded '
553-
'in-place.')
554-
parser.add_argument('--verbose', default=False, action='store_true',
555-
dest='verbose', help='Display the output '
556-
'from the scripts which '
557-
'install setuptools and pip.')
558-
options = parser.parse_args(args)
559-
if options.upgrade and options.clear:
560-
raise ValueError('you cannot supply --upgrade and --clear together.')
561-
builder = ExtendedEnvBuilder(system_site_packages=options.system_site,
562-
clear=options.clear,
563-
symlinks=options.symlinks,
564-
upgrade=options.upgrade,
565-
nodist=options.nodist,
566-
nopip=options.nopip,
567-
verbose=options.verbose)
568-
for d in options.dirs:
569-
builder.create(d)
527+
use_symlinks = True
528+
parser.add_argument('--symlinks', default=use_symlinks,
529+
action='store_true', dest='symlinks',
530+
help='Try to use symlinks rather than copies, '
531+
'when symlinks are not the default for '
532+
'the platform.')
533+
parser.add_argument('--clear', default=False, action='store_true',
534+
dest='clear', help='Delete the contents of the '
535+
'virtual environment '
536+
'directory if it already '
537+
'exists, before virtual '
538+
'environment creation.')
539+
parser.add_argument('--upgrade', default=False, action='store_true',
540+
dest='upgrade', help='Upgrade the virtual '
541+
'environment directory to '
542+
'use this version of '
543+
'Python, assuming Python '
544+
'has been upgraded '
545+
'in-place.')
546+
parser.add_argument('--verbose', default=False, action='store_true',
547+
dest='verbose', help='Display the output '
548+
'from the scripts which '
549+
'install setuptools and pip.')
550+
options = parser.parse_args(args)
551+
if options.upgrade and options.clear:
552+
raise ValueError('you cannot supply --upgrade and --clear together.')
553+
builder = ExtendedEnvBuilder(system_site_packages=options.system_site,
554+
clear=options.clear,
555+
symlinks=options.symlinks,
556+
upgrade=options.upgrade,
557+
nodist=options.nodist,
558+
nopip=options.nopip,
559+
verbose=options.verbose)
560+
for d in options.dirs:
561+
builder.create(d)
570562

571563
if __name__ == '__main__':
572564
rc = 1

‎Include/cpython/code.h

+17-14
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,24 @@ extern "C" {
1616
* 2**32 - 1, rather than INT_MAX.
1717
*/
1818

19-
typedef uint16_t _Py_CODEUNIT;
20-
21-
#ifdef WORDS_BIGENDIAN
22-
# define _Py_OPCODE(word) ((word) >> 8)
23-
# define _Py_OPARG(word) ((word) & 255)
24-
# define _Py_MAKECODEUNIT(opcode, oparg) (((opcode)<<8)|(oparg))
25-
#else
26-
# define _Py_OPCODE(word) ((word) & 255)
27-
# define _Py_OPARG(word) ((word) >> 8)
28-
# define _Py_MAKECODEUNIT(opcode, oparg) ((opcode)|((oparg)<<8))
29-
#endif
19+
typedef union {
20+
uint16_t cache;
21+
struct {
22+
uint8_t opcode;
23+
uint8_t oparg;
24+
};
25+
} _Py_CODEUNIT;
26+
27+
#define _Py_OPCODE(word) ((word).opcode)
28+
#define _Py_OPARG(word) ((word).oparg)
29+
30+
static inline void
31+
_py_set_opcode(_Py_CODEUNIT *word, uint8_t opcode)
32+
{
33+
word->opcode = opcode;
34+
}
3035

31-
// Use "unsigned char" instead of "uint8_t" here to avoid illegal aliasing:
32-
#define _Py_SET_OPCODE(word, opcode) \
33-
do { ((unsigned char *)&(word))[0] = (opcode); } while (0)
36+
#define _Py_SET_OPCODE(word, opcode) _py_set_opocde(&(word), opcode)
3437

3538
typedef struct {
3639
PyObject *_co_code;

0 commit comments

Comments
 (0)