8000 Merge branch 'main' into typing-subst-unpacked-vat-tuple · python/cpython@56f02d8 · GitHub
[go: up one dir, main page]
Skip to content

Commit 56f02d8

Browse files
JelleZijlstraJelleZijlstra
authored
Merge branch 'main' into typing-subst-unpacked-vat-tuple
2 parents 7dcf277 + 1713ff0 commit 56f02d8

Some content is hidden

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

45 files changed

+732
-276
lines changed

‎Doc/library/dis.rst

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66

77
**Source code:** :source:`Lib/dis.py`
88

9+
.. testsetup::
10+
11+
import dis
12+
def myfunc(alist):
13+
return len(alist)
14+
915
--------------
1016

1117
The :mod:`dis` module supports the analysis of CPython :term:`bytecode` by
@@ -37,16 +43,17 @@ Example: Given the function :func:`myfunc`::
3743
return len(alist)
3844

3945
the following command can be used to display the disassembly of
40-
:func:`myfunc`::
46+
:func:`myfunc`:
4147

42-
>>> dis.dis(myfunc)
43-
1 0 RESUME 0
48+
.. doctest::
4449

45-
2 2 PUSH_NULL
46-
4 LOAD_GLOBAL 1 (NULL + len)
47-
6 LOAD_FAST 0 (alist)
48-
8 CALL 1
49-
18 RETURN_VALUE
50+
>>> dis.dis(myfunc)
51+
2 0 RESUME 0
52+
<BLANKLINE>
53+
3 2 LOAD_GLOBAL 1 (NULL + len)
54+
14 LOAD_FAST 0 (alist)
55+
16 CALL 1
56+
26 RETURN_VALUE
5057

5158
(The "2" is a line number).
5259

@@ -108,14 +115,15 @@ code.
108115
.. versionchanged:: 3.11
109116
Added the ``show_caches`` parameter.
110117

111-
Example::
118+
Example:
119+
120+
.. doctest::
112121

113122
>>> bytecode = dis.Bytecode(myfunc)
114123
>>> for instr in bytecode:
115124
... print(instr.opname)
116125
...
117126
RESUME
118-
PUSH_NULL
119127
LOAD_GLOBAL
120128
LOAD_FAST
121129
CALL

‎Doc/library/mailcap.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,18 @@ standard. However, mailcap files are supported on most Unix systems.
6060
use) to determine whether or not the mailcap line applies. :func:`findmatch`
6161
will automatically check such conditions and skip the entry if the check fails.
6262

63+
.. versionchanged:: 3.11
64+
65+
To prevent security issues with shell metacharacters (symbols that have
66+
special effects in a shell command line), ``findmatch`` will refuse
67+
to inject ASCII characters other than alphanumerics and ``@+=:,./-_``
68+
into the returned command line.
69+
70+
If a disallowed character appears in *filename*, ``findmatch`` will always
71+
return ``(None, None)`` as if no entry was found.
72+
If such a character appears elsewhere (a value in *plist* or in *MIMEtype*),
73+
``findmatch`` will ignore all mailcap entries which use that value.
74+
A :mod:`warning <warnings>` will be raised in either case.
6375

6476
.. function:: getcaps()
6577

‎Doc/using/cmdline.rst

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,37 @@ automatically enabled, if available on your platform (see
183183
Automatic enabling of tab-completion and history editing.
184184

185185

186+
.. _using-on-generic-options:
187+
186188
Generic options
187189
~~~~~~~~~~~~~~~
188190

189191
.. cmdoption:: -?
190192
-h
191193
--help
192194

193-
Print a short description of all command line options.
195+
Print a short description of all command line options and corresponding
196+
environment variables and exit.
197+
198+
.. cmdoption:: --help-env
199+
200+
Print a short description of Python-specific environment variables
201+
and exit.
202+
203+
.. versionadded:: 3.11
204+
205+
.. cmdoption:: --help-xoptions
194206

207+
Print a description of implementation-specific :option:`-X` options
208+
and exit.
209+
210+
.. versionadded:: 3.11
211+
212+
.. cmdoption:: --help-all
213+
214+
Print complete usage information and exit.
215+
216+
.. versionadded:: 3.11
195217

196218
.. cmdoption:: -V
197219
--version
@@ -212,6 +234,7 @@ Generic options
212234
.. versionadded:: 3.6
213235
The ``-VV`` option.
214236

237+
215238
.. _using-on-misc-options:
216239

217240
Miscellaneous options
@@ -460,6 +483,7 @@ Miscellaneous options
460483
See :ref:`warning-filter` and :ref:`describing-warning-filters` for more
461484
details.
462485

486+
463487
.. cmdoption:: -x
464488

465489
Skip the first line of the source, allowing use of non-Unix forms of
@@ -553,6 +577,7 @@ Miscellaneous options
553577
The ``-X frozen_modules`` option.
554578

555579

580+
556581
Options you shouldn't use
557582
~~~~~~~~~~~~~~~~~~~~~~~~~
558583

‎Include/boolobject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ PyAPI_DATA(PyLongObject) _Py_FalseStruct;
1919
PyAPI_DATA(PyLongObject) _Py_TrueStruct;
2020

2121
/* Use these macros */
22-
#define Py_False ((PyObject *) &_Py_FalseStruct)
23-
#define Py_True ((PyObject *) &_Py_TrueStruct)
22+
#define Py_False _PyObject_CAST(&_Py_FalseStruct)
23+
#define Py_True _PyObject_CAST(&_Py_TrueStruct)
2424

2525
// Test if an object is the True singleton, the same as "x is True" in Python.
2626
PyAPI_FUNC(int) Py_IsTrue(PyObject *x);

‎Include/ceval.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords(
3131

3232
/* Deprecated since PyEval_CallObjectWithKeywords is deprecated */
3333
#define PyEval_CallObject(callable, arg) \
34-
PyEval_CallObjectWithKeywords(callable, arg, (PyObject *)NULL)
34+
PyEval_CallObjectWithKeywords(callable, arg, _PyObject_CAST(_Py_NULL))
3535

3636
Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallFunction(
3737
PyObject *callable, const char *format, ...);

‎Include/cpython/code.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ typedef uint16_t _Py_CODEUNIT;
8888
PyObject *co_qualname; /* unicode (qualname, for reference) */ \
8989
PyObject *co_linetable; /* bytes object that holds location info */ \
9090
PyObject *co_weakreflist; /* to support weakrefs to code objects */ \
91+
void *_co_code; /* cached co_code object/attribute */ \
9192
/* Scratch space for extra data relating to the code object. \
9293
Type is a void* to keep the format private in codeobject.c to force \
9394
people to go through the proper APIs. */ \

‎Include/pyerrors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ PyAPI_FUNC(void) PyException_SetContext(PyObject *, PyObject *);
6262

6363
PyAPI_FUNC(const char *) PyExceptionClass_Name(PyObject *);
6464

65-
#define PyExceptionInstance_Class(x) ((PyObject*)Py_TYPE(x))
65+
#define PyExceptionInstance_Class(x) _PyObject_CAST(Py_TYPE(x))
6666

6767
#define _PyBaseExceptionGroup_Check(x) \
6868
PyObject_TypeCheck(x, (PyTypeObject *)PyExc_BaseExceptionGroup)

‎Lib/dis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ def _unpack_opargs(code):
592592
caches = _inline_cache_entries[deop]
593593
if deop >= HAVE_ARGUMENT:
594594
arg = code[i+1] | extended_arg
595-
extended_arg = (arg << 8) if op == EXTENDED_ARG else 0
595+
extended_arg = (arg << 8) if deop == EXTENDED_ARG else 0
596596
# The oparg is stored as a signed integer
597597
# If the value exceeds its upper limit, it will overflow and wrap
598598
# to a negative integer

‎Lib/mailcap.py

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import os
44
import warnings
5+
import re
56

67
__all__ = ["getcaps","findmatch"]
78

@@ -19,6 +20,11 @@ def lineno_sort_key(entry):
1920
else:
2021
return 1, 0
2122

23+
_find_unsafe = re.compile(r'[^\xa1-\U0010FFFF\w@+=:,./-]').search
24+
25+
class UnsafeMailcapInput(Warning):
26+
"""Warning raised when refusing unsafe input"""
27+
2228

2329
# Part 1: top-level interface.
2430

@@ -171,15 +177,22 @@ def findmatch(caps, MIMEtype, key='view', filename="/dev/null", plist=[]):
171177
entry to use.
172178
173179
"""
180+
if _find_unsafe(filename):
181+
msg = "Refusing to use mailcap with filename %r. Use a safe temporary filename." % (filename,)
182+
warnings.warn(msg, UnsafeMailcapInput)
183+
return None, None
174184
entries = lookup(caps, MIMEtype, key)
175185
# XXX This code should somehow check for the needsterminal flag.
176186
for e in entries:
177187
if 'test' in e:
178188
test = subst(e['test'], filename, plist)
189+
if test is None:
190+
continue
179191
if test and os.system(test) != 0:
180192
continue
181193
command = subst(e[key], MIMEtype, filename, plist)
182-
return command, e
194+
if command is not None:
195+
return command, e
183196
return None, None
184197

185198
def lookup(caps, MIMEtype, key=None):
@@ -212,14 +225,23 @@ def subst(field, MIMEtype, filename, plist=[]):
212225
elif c == 's':
213226
res = res + filename
214227
elif c == 't':
228+
if _find_unsafe(MIMEtype):
229+
msg = "Refusing to substitute MIME type %r into a shell command." % (MIMEtype,)
230+
warnings.warn(msg, UnsafeMailcapInput)
231+
return None
215232
res = res + MIMEtype
216233
elif c == '{':
217234
start = i
218235
while i < n and field[i] != '}':
219236
i = i+1
220237
name = field[start:i]
221238
i = i+1
222-
res = res + findparam(name, plist)
239+
param = findparam(name, plist)
240+
if _find_unsafe(param):
241+
msg = "Refusing to substitute parameter %r (%s) into a shell command" % (param, name)
242+
warnings.warn(msg, UnsafeMailcapInput)
243+
return None
244+
res = res + param
223245
# XXX To do:
224246
# %n == number of parts if type is multipart/*
225247
# %F == list of alternating type and filename for parts

‎Lib/pathlib.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,8 @@ def __getitem__(self, idx):
443443

444444
if idx >= len(self) or idx < -len(self):
445445
raise IndexError(idx)
446+
if idx < 0:
447+
idx += len(self)
446448
return self._pathcls._from_parsed_parts(self._drv, self._root,
447449
self._parts[:-idx - 1])
448450

‎Lib/test/pythoninfo.py

Lines changed: 1 addition & 1 deletion
< 10000 /tr>
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def collect_sys(info_add):
144144
text = 'Yes (sys.getobjects() present)'
145145
else:
146146
text = 'No (sys.getobjects() missing)'
147-
info_add('build.Py_REF_DEBUG', text)
147+
info_add('build.Py_TRACE_REFS', text)
148148

149149

150150
def collect_platform(info_add):

‎Lib/test/support/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,8 @@ def requires(resource, msg=None):
305305
if msg is None:
306306
msg = "Use of the %r resource not enabled" % resource
307307
raise ResourceDenied(msg)
308+
if resource in {"network", "urlfetch"} and not has_socket_support:
309+
raise ResourceDenied("No socket support")
308310
if resource == 'gui' and not _is_gui_available():
309311
raise ResourceDenied(_is_gui_available.reason)
310312

‎Lib/test/test_cmd_line.py

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,55 @@ def _kill_python_and_exit_code(p):
2525
returncode = p.wait()
2626
return data, returncode
2727

28+
2829
class CmdLineTest(unittest.TestCase):
2930
def test_directories(self):
3031
assert_python_failure('.')
3132
assert_python_failure('< .')
3233

3334
def verify_valid_flag(self, cmd_line):
34-
rc, out, err = assert_python_ok(*cmd_line)
35+
rc, out, err = assert_python_ok(cmd_line)
3536
self.assertTrue(out == b'' or out.endswith(b'\n'))
3637
self.assertNotIn(b'Traceback', out)
3738
self.assertNotIn(b'Traceback', err)
39+
return out
3840

39-
def test_optimize(self):
40-
self.verify_valid_flag('-O')
41-
self.verify_valid_flag('-OO 97AE 9;)
41+
def test_help(self):
42+
self.verify_valid_flag('-h')
43+
self.verify_valid_flag('-?')
44+
out = self.verify_valid_flag('--help')
45+
lines = out.splitlines()
46+
self.assertIn(b'usage', lines[0])
47+
self.assertNotIn(b'PYTHONHOME', out)
48+
self.assertNotIn(b'-X dev', out)
49+
self.assertLess(len(lines), 50)
4250

43-
def test_site_flag(self):
44-
self.verify_valid_flag('-S')
51+
def test_help_env(self):
52+
out = self.verify_valid_flag('--help-env')
53+
self.assertIn(b'PYTHONHOME', out)
54+
55+
def test_help_xoptions(self):
56+
out = self.verify_valid_flag('--help-xoptions')
57+
self.assertIn(b'-X dev', out)
4558

46-
def test_usage(self):
47-
rc, out, err = assert_python_ok('-h')
59+
def test_help_all(self):
60+
out = self.verify_valid_flag('--help-all')
4861
lines = out.splitlines()
4962
self.assertIn(b'usage', lines[0])
63+
self.assertIn(b'PYTHONHOME', out)
64+
self.assertIn(b'-X dev', out)
65+
5066
# The first line contains the program name,
5167
# but the rest should be ASCII-only
5268
b''.join(lines[1:]).decode('ascii')
5369

70+
def test_optimize(self):
71+
self.verify_valid_flag('-O')
72+
self.verify_valid_flag('-OO')
73+
74+
def test_site_flag(self):
75+
self.verify_valid_flag('-S')
76+
5477
def test_version(self):
5578
version = ('Python %d.%d' % sys.version_info[:2]).encode("ascii")
5679
for switch in '-V', '--version', '-VV':
@@ -90,7 +113,7 @@ def get_xoptions(*args):
90113
def test_unknown_xoptions(self):
91114
rc, out, err = assert_python_failure('-X', 'blech')
92115
self.assertIn(b'Unknown value for option -X', err)
93-
msg = b'Fatal Python error: Unknown value for option -X'
116+
msg = b'Fatal Python error: Unknown value for option -X (see --help-xoptions)'
94117
self.assertEqual(err.splitlines().count(msg), 1)
95118
self.assertEqual(b'', out)
96119

@@ -134,7 +157,6 @@ def test_xoption_frozen_modules(self):
134157
}
135158
for raw, expected in tests:
136159
cmd = ['-X', f'frozen_modules{raw}',
137-
#'-c', 'import os; print(os.__spec__.loader.__name__, end="")']
138160
'-c', 'import os; print(os.__spec__.loader, end="")']
139161
with self.subTest(raw):
140162
res = assert_python_ok(*cmd)
@@ -167,7 +189,6 @@ def test_relativedir_bug46421(self):
167189
# Test `python -m unittest` with a relative directory beginning with ./
168190
# Note: We have to switch to the project's top module's directory, as per
169191
# the python unittest wiki. We will switch back when we are done.
170-
defaultwd = os.getcwd()
171192
projectlibpath = os.path.dirname(__file__).removesuffix("test")
172193
with os_helper.change_cwd(projectlibpath):
173194
# Testing with and without ./
@@ -247,7 +268,6 @@ def test_invalid_utf8_arg(self):
247268
#
248269
# Test with default config, in the C locale, in the Python UTF-8 Mode.
249270
code = 'import sys, os; s=os.fsencode(sys.argv[1]); print(ascii(s))'
250-
base_cmd = [sys.executable, '-c', code]
251271

252272
def run_default(arg):
253273
cmd = [sys.executable, '-c', code, arg]
@@ -892,6 +912,7 @@ def test_sys_flags_not_set(self):
892912
PYTHONSAFEPATH="1",
893913
)
894914

915+
895916
class SyntaxErrorTests(unittest.TestCase):
896917
def check_string(self, code):
897918
proc = subprocess.run([sys.executable, "-"], input=code,

‎Lib/test/test_compileall.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,9 @@ class CompileallTestsWithoutSourceEpoch(CompileallTestsBase,
434434
pass
435435

436436

437+
# WASI does not have a temp directory and uses cwd instead. The cwd contains
438+
# non-ASCII chars, so _walk_dir() fails to encode self.directory.
439+
@unittest.skipIf(support.is_wasi, "tempdir is not encodable on WASI")
437440
class EncodingTest(unittest.TestCase):
438441
"""Issue 6716: compileall should escape source code when printing errors
439442
to stdout."""

0 commit comments

Comments
 (0)
0