-
diff --git a/Lib/idlelib/help.py b/Lib/idlelib/help.py
index f420d40fb9ea40..cc027b9cef4f5b 100644
--- a/Lib/idlelib/help.py
+++ b/Lib/idlelib/help.py
@@ -76,9 +76,9 @@ def handle_starttag(self, tag, attrs):
if a == 'class':
class_ = v
s = ''
- if tag == 'div' and class_ == 'section':
+ if tag == 'section' and attrs == [('id', 'idle')]:
self.show = True # Start main content.
- elif tag == 'div' and class_ == 'sphinxsidebar':
+ elif tag == 'div' and class_ == 'clearer':
self.show = False # End main content.
elif tag == 'p' and self.prevtag and not self.prevtag[0]:
# Begin a new block for tags after a closed tag.
diff --git a/Lib/idlelib/help_about.py b/Lib/idlelib/help_about.py
index 9cb3ba78c50ebd..cfa4ca781f087d 100644
--- a/Lib/idlelib/help_about.py
+++ b/Lib/idlelib/help_about.py
@@ -11,15 +11,12 @@
from idlelib import textview
-version = python_version()
+pyver = python_version()
-
-def build_bits():
- "Return bits for platform."
- if sys.platform == 'darwin':
- return '64' if sys.maxsize > 2**32 else '32'
- else:
- return architecture()[0][:2]
+if sys.platform == 'darwin':
+ bits = '64' if sys.maxsize > 2**32 else '32'
+else:
+ bits = architecture()[0][:2]
class AboutDialog(Toplevel):
@@ -45,7 +42,7 @@ def __init__(self, parent, title=None, *, _htest=False, _utest=False):
self.create_widgets()
self.resizable(height=False, width=False)
self.title(title or
- f'About IDLE {version} ({build_bits()} bit)')
+ f'About IDLE {pyver} ({bits} bit)')
self.transient(parent)
self.grab_set()
self.protocol("WM_DELETE_WINDOW", self.ok)
@@ -76,8 +73,8 @@ def create_widgets(self):
bg=self.bg, font=('courier', 24, 'bold'))
header.grid(row=0, column=0, sticky=E, padx=10, pady=10)
- tk_patchlevel = self.info_patchlevel()
- ext = '.png' if tk_patchlevel >= (8, 6) else '.gif'
+ tkpatch = self._root().getvar('tk_patchLevel')
+ ext = '.png' if tkpatch >= '8.6' else '.gif'
icon = os.path.join(os.path.abspath(os.path.dirname(__file__)),
'Icons', f'idle_48{ext}')
self.icon_image = PhotoImage(master=self._root(), file=icon)
@@ -91,8 +88,9 @@ def create_widgets(self):
email = Label(frame_background, text='email: idle-dev@python.org',
justify=LEFT, fg=self.fg, bg=self.bg)
email.grid(row=6, column=0, columnspan=2, sticky=W, padx=10, pady=0)
- docs = Label(frame_background, text="https://docs.python.org/"
- f"{version[:version.rindex('.')]}/library/idle.html",
+ docs_url = ("https://docs.python.org/%d.%d/library/idle.html" %
+ sys.version_info[:2])
+ docs = Label(frame_background, text=docs_url,
justify=LEFT, fg=self.fg, bg=self.bg)
docs.grid(row=7, column=0, columnspan=2, sticky=W, padx=10, pady=0)
docs.bind("", lambda event: webbrowser.open(docs['text']))
@@ -101,13 +99,11 @@ def create_widgets(self):
height=2, bg=self.bg).grid(row=8, column=0, sticky=EW,
columnspan=3, padx=5, pady=5)
- pyver = Label(frame_background,
- text='Python version: ' + version,
- fg=self.fg, bg=self.bg)
- pyver.grid(row=9, column=0, sticky=W, padx=10, pady=0)
- tkver = Label(frame_background, text=f'Tk version: {tk_patchlevel}',
- fg=self.fg, bg=self.bg)
- tkver.grid(row=9, column=1, sticky=W, padx=2, pady=0)
+ tclver = str(self.info_patchlevel())
+ tkver = ' and ' + tkpatch if tkpatch != tclver else ''
+ versions = f"Python {pyver} with tcl/tk {tclver}{tkver}"
+ vers = Label(frame_background, text=versions, fg=self.fg, bg=self.bg)
+ vers.grid(row=9, column=0, sticky=W, padx=10, pady=0)
py_buttons = Frame(frame_background, bg=self.bg)
py_buttons.grid(row=10, column=0, columnspan=2, sticky=NSEW)
self.py_license = Button(py_buttons, text='License', width=8,
@@ -127,10 +123,10 @@ def create_widgets(self):
height=2, bg=self.bg).grid(row=11, column=0, sticky=EW,
columnspan=3, padx=5, pady=5)
- idlever = Label(frame_background,
- text='IDLE version: ' + version,
+ idle = Label(frame_background,
+ text='IDLE',
fg=self.fg, bg=self.bg)
- idlever.grid(row=12, column=0, sticky=W, padx=10, pady=0)
+ idle.grid(row=12, column=0, sticky=W, padx=10, pady=0)
idle_buttons = Frame(frame_background, bg=self.bg)
idle_buttons.grid(row=13, column=0, columnspan=3, sticky=NSEW)
self.readme = Button(idle_buttons, text='README', width=8,
diff --git a/Lib/idlelib/history.py b/Lib/idlelib/history.py
index 100f505256a940..5a9b32aaf6bb81 100644
--- a/Lib/idlelib/history.py
+++ b/Lib/idlelib/history.py
@@ -65,7 +65,7 @@ def fetch(self, reverse):
self.text.bell()
return
nprefix = len(prefix)
- while 1:
+ while True:
pointer += -1 if reverse else 1
if pointer < 0 or pointer >= nhist:
self.text.bell()
diff --git a/Lib/idlelib/hyperparser.py b/Lib/idlelib/hyperparser.py
index 77baca782b3fdc..76144ee8fb30f5 100644
--- a/Lib/idlelib/hyperparser.py
+++ b/Lib/idlelib/hyperparser.py
@@ -237,9 +237,9 @@ def get_expression(self):
last_identifier_pos = pos
postdot_phase = True
- while 1:
+ while True:
# Eat whitespaces, comments, and if postdot_phase is False - a dot
- while 1:
+ while True:
if pos>brck_limit and rawtext[pos-1] in self._whitespace_chars:
# Eat a whitespace
pos -= 1
diff --git a/Lib/idlelib/idle_test/README.txt b/Lib/idlelib/idle_test/README.txt
index 566bfd179fdf1b..cacd06db873d03 100644
--- a/Lib/idlelib/idle_test/README.txt
+++ b/Lib/idlelib/idle_test/README.txt
@@ -146,14 +146,17 @@ python -m unittest -v idlelib.idle_test
python -m test -v -ugui test_idle
python -m test.test_idle
-The idle tests are 'discovered' by
-idlelib.idle_test.__init__.load_tests, which is also imported into
-test.test_idle. Normally, neither file should be changed when working on
-individual test modules. The third command runs unittest indirectly
-through regrtest. The same happens when the entire test suite is run
-with 'python -m test'. So that command must work for buildbots to stay
-green. Idle tests must not disturb the environment in a way that makes
-other tests fail (issue 18081).
+IDLE tests are 'discovered' by idlelib.idle_test.__init__.load_tests
+when this is imported into test.test_idle. Normally, neither file
+should be changed when working on individual test modules. The third
+command runs unittest indirectly through regrtest. The same happens when
+the entire test suite is run with 'python -m test'. So that command must
+work for buildbots to stay green. IDLE tests must not disturb the
+environment in a way that makes other tests fail (GH-62281).
+
+To test subsets of modules, see idlelib.idle_test.__init__. This
+can be used to find refleaks or possible sources of "Theme changed"
+tcl messages (GH-71383).
To run an individual Testcase or test method, extend the dotted name
given to unittest on the command line or use the test -m option. The
diff --git a/Lib/idlelib/idle_test/__init__.py b/Lib/idlelib/idle_test/__init__.py
index ad067b405cab67..79b5d102dd7da5 100644
--- a/Lib/idlelib/idle_test/__init__.py
+++ b/Lib/idlelib/idle_test/__init__.py
@@ -1,17 +1,27 @@
-'''idlelib.idle_test is a private implementation of test.test_idle,
-which tests the IDLE application as part of the stdlib test suite.
-Run IDLE tests alone with "python -m test.test_idle".
-Starting with Python 3.6, IDLE requires tcl/tk 8.5 or later.
+"""idlelib.idle_test implements test.test_idle, which tests the IDLE
+application as part of the stdlib test suite.
+Run IDLE tests alone with "python -m test.test_idle (-v)".
This package and its contained modules are subject to change and
any direct use is at your own risk.
-'''
+"""
from os.path import dirname
+# test_idle imports load_tests for test discovery (default all).
+# To run subsets of idlelib module tests, insert '[]' after '_'.
+# Example: insert '[ac]' for modules beginning with 'a' or 'c'.
+# Additional .discover/.addTest pairs with separate inserts work.
+# Example: pairs with 'c' and 'g' test c* files and grep.
+
def load_tests(loader, standard_tests, pattern):
this_dir = dirname(__file__)
top_dir = dirname(dirname(this_dir))
- package_tests = loader.discover(start_dir=this_dir, pattern='test*.py',
+ module_tests = loader.discover(start_dir=this_dir,
+ pattern='test_*.py', # Insert here.
top_level_dir=top_dir)
- standard_tests.addTests(package_tests)
+ standard_tests.addTests(module_tests)
+## module_tests = loader.discover(start_dir=this_dir,
+## pattern='test_*.py', # Insert here.
+## top_level_dir=top_dir)
+## standard_tests.addTests(module_tests)
return standard_tests
diff --git a/Lib/idlelib/idle_test/test_browser.py b/Lib/idlelib/idle_test/test_browser.py
index 03a50f22ca1e82..6cfea3888cd6a9 100644
--- a/Lib/idlelib/idle_test/test_browser.py
+++ b/Lib/idlelib/idle_test/test_browser.py
@@ -5,6 +5,7 @@
import unittest
from unittest import mock
from idlelib.idle_test.mock_idle import Func
+from idlelib.util import py_extensions
from collections import deque
import os.path
@@ -57,6 +58,15 @@ def test_close(self):
self.assertTrue(mb.node.destroy.called)
del mb.top.destroy, mb.node.destroy
+ def test_is_browseable_extension(self):
+ path = "/path/to/file"
+ for ext in py_extensions:
+ with self.subTest(ext=ext):
+ filename = f'{path}{ext}'
+ actual = browser.is_browseable_extension(filename)
+ expected = ext not in browser.browseable_extension_blocklist
+ self.assertEqual(actual, expected)
+
# Nested tree same as in test_pyclbr.py except for supers on C0. C1.
mb = pyclbr
@@ -160,8 +170,7 @@ def test_ondoubleclick(self, fopen):
with mock.patch('os.path.exists', return_value=True):
mbt.OnDoubleClick()
- fopen.assert_called()
- fopen.called_with(fname)
+ fopen.assert_called_once_with(fname)
class ChildBrowserTreeItemTest(unittest.TestCase):
diff --git a/Lib/idlelib/idle_test/test_config.py b/Lib/idlelib/idle_test/test_config.py
index 697fda527968de..08ed76fe288294 100644
--- a/Lib/idlelib/idle_test/test_config.py
+++ b/Lib/idlelib/idle_test/test_config.py
@@ -191,7 +191,7 @@ def setUpClass(cls):
idle_dir = os.path.abspath(sys.path[0])
for ctype in conf.config_types:
config_path = os.path.join(idle_dir, '../config-%s.def' % ctype)
- with open(config_path, 'r') as f:
+ with open(config_path) as f:
cls.config_string[ctype] = f.read()
cls.orig_warn = config._warn
diff --git a/Lib/idlelib/idle_test/test_config_key.py b/Lib/idlelib/idle_test/test_config_key.py
index bf66cadf57cd3c..32f878b842b276 100644
--- a/Lib/idlelib/idle_test/test_config_key.py
+++ b/Lib/idlelib/idle_test/test_config_key.py
@@ -13,15 +13,13 @@
from idlelib.idle_test.mock_idle import Func
from idlelib.idle_test.mock_tk import Mbox_func
-gkd = config_key.GetKeysDialog
-
class ValidationTest(unittest.TestCase):
"Test validation methods: ok, keys_ok, bind_ok."
- class Validator(gkd):
+ class Validator(config_key.GetKeysFrame):
def __init__(self, *args, **kwargs):
- config_key.GetKeysDialog.__init__(self, *args, **kwargs)
+ super().__init__(*args, **kwargs)
class list_keys_final:
get = Func()
self.list_keys_final = list_keys_final
@@ -34,15 +32,14 @@ def setUpClass(cls):
cls.root = Tk()
cls.root.withdraw()
keylist = [[''], ['', '']]
- cls.dialog = cls.Validator(
- cls.root, 'Title', '<>', keylist, _utest=True)
+ cls.dialog = cls.Validator(cls.root, '<>', keylist)
@classmethod
def tearDownClass(cls):
- cls.dialog.cancel()
+ del cls.dialog
cls.root.update_idletasks()
cls.root.destroy()
- del cls.dialog, cls.root
+ del cls.root
def setUp(self):
self.dialog.showerror.message = ''
@@ -111,14 +108,14 @@ def setUpClass(cls):
requires('gui')
cls.root = Tk()
cls.root.withdraw()
- cls.dialog = gkd(cls.root, 'Title', '<>', [], _utest=True)
+ cls.dialog = config_key.GetKeysFrame(cls.root, '<>', [])
@classmethod
def tearDownClass(cls):
- cls.dialog.cancel()
+ del cls.dialog
cls.root.update_idletasks()
cls.root.destroy()
- del cls.dialog, cls.root
+ del cls.root
def test_toggle_level(self):
dialog = self.dialog
@@ -130,7 +127,7 @@ def stackorder():
this can be used to check whether a frame is above or
below another one.
"""
- for index, child in enumerate(dialog.frame.winfo_children()):
+ for index, child in enumerate(dialog.winfo_children()):
if child._name == 'keyseq_basic':
basic = index
if child._name == 'keyseq_advanced':
@@ -161,7 +158,7 @@ def stackorder():
class KeySelectionTest(unittest.TestCase):
"Test selecting key on Basic frames."
- class Basic(gkd):
+ class Basic(config_key.GetKeysFrame):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
class list_keys_final:
@@ -179,14 +176,14 @@ def setUpClass(cls):
requires('gui')
cls.root = Tk()
cls.root.withdraw()
- cls.dialog = cls.Basic(cls.root, 'Title', '<>', [], _utest=True)
+ cls.dialog = cls.Basic(cls.root, '<>', [])
@classmethod
def tearDownClass(cls):
- cls.dialog.cancel()
+ del cls.dialog
cls.root.update_idletasks()
cls.root.destroy()
- del cls.dialog, cls.root
+ del cls.root
def setUp(self):
self.dialog.clear_key_seq()
@@ -206,7 +203,7 @@ def test_get_modifiers(self):
dialog.modifier_checkbuttons['foo'].invoke()
eq(gm(), ['BAZ'])
- @mock.patch.object(gkd, 'get_modifiers')
+ @mock.patch.object(config_key.GetKeysFrame, 'get_modifiers')
def test_build_key_string(self, mock_modifiers):
dialog = self.dialog
key = dialog.list_keys_final
@@ -227,7 +224,7 @@ def test_build_key_string(self, mock_modifiers):
dialog.build_key_string()
eq(string(), '')
- @mock.patch.object(gkd, 'get_modifiers')
+ @mock.patch.object(config_key.GetKeysFrame, 'get_modifiers')
def test_final_key_selected(self, mock_modifiers):
dialog = self.dialog
key = dialog.list_keys_final
@@ -240,7 +237,7 @@ def test_final_key_selected(self, mock_modifiers):
eq(string(), '')
-class CancelTest(unittest.TestCase):
+class CancelWindowTest(unittest.TestCase):
"Simulate user clicking [Cancel] button."
@classmethod
@@ -248,21 +245,89 @@ def setUpClass(cls):
requires('gui')
cls.root = Tk()
cls.root.withdraw()
- cls.dialog = gkd(cls.root, 'Title', '<>', [], _utest=True)
+ cls.dialog = config_key.GetKeysWindow(
+ cls.root, 'Title', '<>', [], _utest=True)
@classmethod
def tearDownClass(cls):
cls.dialog.cancel()
+ del cls.dialog
cls.root.update_idletasks()
cls.root.destroy()
- del cls.dialog, cls.root
+ del cls.root
- def test_cancel(self):
+ @mock.patch.object(config_key.GetKeysFrame, 'ok')
+ def test_cancel(self, mock_frame_ok):
self.assertEqual(self.dialog.winfo_class(), 'Toplevel')
self.dialog.button_cancel.invoke()
with self.assertRaises(TclError):
self.dialog.winfo_class()
self.assertEqual(self.dialog.result, '')
+ mock_frame_ok.assert_not_called()
+
+
+class OKWindowTest(unittest.TestCase):
+ "Simulate user clicking [OK] button."
+
+ @classmethod
+ def setUpClass(cls):
+ requires('gui')
+ cls.root = Tk()
+ cls.root.withdraw()
+ cls.dialog = config_key.GetKeysWindow(
+ cls.root, 'Title', '<>', [], _utest=True)
+
+ @classmethod
+ def tearDownClass(cls):
+ cls.dialog.cancel()
+ del cls.dialog
+ cls.root.update_idletasks()
+ cls.root.destroy()
+ del cls.root
+
+ @mock.patch.object(config_key.GetKeysFrame, 'ok')
+ def test_ok(self, mock_frame_ok):
+ self.assertEqual(self.dialog.winfo_class(), 'Toplevel')
+ self.dialog.button_ok.invoke()
+ with self.assertRaises(TclError):
+ self.dialog.winfo_class()
+ mock_frame_ok.assert_called()
+
+
+class WindowResultTest(unittest.TestCase):
+ "Test window result get and set."
+
+ @classmethod
+ def setUpClass(cls):
+ requires('gui')
+ cls.root = Tk()
+ cls.root.withdraw()
+ cls.dialog = config_key.GetKeysWindow(
+ cls.root, 'Title', '<>', [], _utest=True)
+
+ @classmethod
+ def tearDownClass(cls):
+ cls.dialog.cancel()
+ del cls.dialog
+ cls.root.update_idletasks()
+ cls.root.destroy()
+ del cls.root
+
+ def test_result(self):
+ dialog = self.dialog
+ eq = self.assertEqual
+
+ dialog.result = ''
+ eq(dialog.result, '')
+ eq(dialog.frame.result,'')
+
+ dialog.result = 'bar'
+ eq(dialog.result,'bar')
+ eq(dialog.frame.result,'bar')
+
+ dialog.frame.result = 'foo'
+ eq(dialog.result, 'foo')
+ eq(dialog.frame.result,'foo')
class HelperTest(unittest.TestCase):
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index 3005ce08c9bf43..e5d5b4013fca57 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -954,8 +954,8 @@ def test_set_keys_type(self):
def test_get_new_keys(self):
eq = self.assertEqual
d = self.page
- orig_getkeysdialog = configdialog.GetKeysDialog
- gkd = configdialog.GetKeysDialog = Func(return_self=True)
+ orig_getkeysdialog = configdialog.GetKeysWindow
+ gkd = configdialog.GetKeysWindow = Func(return_self=True)
gnkn = d.get_new_keys_name = Func()
d.button_new_keys.state(('!disabled',))
@@ -997,7 +997,7 @@ def test_get_new_keys(self):
eq(d.keybinding.get(), '')
del d.get_new_keys_name
- configdialog.GetKeysDialog = orig_getkeysdialog
+ configdialog.GetKeysWindow = orig_getkeysdialog
def test_get_new_keys_name(self):
orig_sectionname = configdialog.SectionName
diff --git a/Lib/idlelib/idle_test/test_debugger_r.py b/Lib/idlelib/idle_test/test_debugger_r.py
index 638ebd36a7405d..cf8af05fe27e77 100644
--- a/Lib/idlelib/idle_test/test_debugger_r.py
+++ b/Lib/idlelib/idle_test/test_debugger_r.py
@@ -2,28 +2,21 @@
from idlelib import debugger_r
import unittest
-from test.support import requires
-from tkinter import Tk
-
-
-class Test(unittest.TestCase):
+# Boilerplate likely to be needed for future test classes.
+##from test.support import requires
+##from tkinter import Tk
+##class Test(unittest.TestCase):
## @classmethod
## def setUpClass(cls):
## requires('gui')
## cls.root = Tk()
-##
## @classmethod
## def tearDownClass(cls):
## cls.root.destroy()
-## del cls.root
-
- def test_init(self):
- self.assertTrue(True) # Get coverage of import
-
-# Classes GUIProxy, IdbAdapter, FrameProxy, CodeProxy, DictProxy,
-# GUIAdapter, IdbProxy plus 7 module functions.
+# GUIProxy, IdbAdapter, FrameProxy, CodeProxy, DictProxy,
+# GUIAdapter, IdbProxy, and 7 functions still need tests.
class IdbAdapterTest(unittest.TestCase):
diff --git a/Lib/idlelib/idle_test/test_editor.py b/Lib/idlelib/idle_test/test_editor.py
index 8665d680c0118f..9296a6d235fbbe 100644
--- a/Lib/idlelib/idle_test/test_editor.py
+++ b/Lib/idlelib/idle_test/test_editor.py
@@ -1,11 +1,10 @@
-"Test editor, coverage 35%."
+"Test editor, coverage 53%."
from idlelib import editor
import unittest
from collections import namedtuple
from test.support import requires
-from tkinter import Tk
-from idlelib.idle_test.mock_idle import Func
+from tkinter import Tk, Text
Editor = editor.EditorWindow
@@ -32,7 +31,7 @@ def test_init(self):
e._close()
-class TestGetLineIndent(unittest.TestCase):
+class GetLineIndentTest(unittest.TestCase):
def test_empty_lines(self):
for tabwidth in [1, 2, 4, 6, 8]:
for line in ['', '\n']:
@@ -182,6 +181,36 @@ def test_indent_and_newline_event(self):
eq(get('1.0', 'end'), ' def f1(self, a,\n \n return a + b\n')
+class IndentSearcherTest(unittest.TestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ requires('gui')
+ cls.root = Tk()
+ cls.root.withdraw()
+ cls.text = Text(cls.root)
+
+ @classmethod
+ def tearDownClass(cls):
+ cls.root.destroy()
+ del cls.root
+
+ def test_searcher(self):
+ text = self.text
+ searcher = (self.text)
+ test_info = (# text, (block, indent))
+ ("", (None, None)),
+ ("[1,", (None, None)), # TokenError
+ ("if 1:\n", ('if 1:\n', None)),
+ ("if 1:\n 2\n 3\n", ('if 1:\n', ' 2\n')),
+ )
+ for code, expected_pair in test_info:
+ with self.subTest(code=code):
+ insert(text, code)
+ actual_pair = editor.IndentSearcher(text).run()
+ self.assertEqual(actual_pair, expected_pair)
+
+
class RMenuTest(unittest.TestCase):
@classmethod
diff --git a/Lib/idlelib/idle_test/test_help_about.py b/Lib/idlelib/idle_test/test_help_about.py
index b915535acac0cc..8b79487b15d4cd 100644
--- a/Lib/idlelib/idle_test/test_help_about.py
+++ b/Lib/idlelib/idle_test/test_help_about.py
@@ -36,7 +36,7 @@ def tearDownClass(cls):
del cls.root
def test_build_bits(self):
- self.assertIn(help_about.build_bits(), ('32', '64'))
+ self.assertIn(help_about.bits, ('32', '64'))
def test_dialog_title(self):
"""Test about dialog title"""
@@ -107,7 +107,7 @@ def test_dialog_title(self):
"""Test about dialog title"""
self.assertEqual(self.dialog.title(),
f'About IDLE {python_version()}'
- f' ({help_about.build_bits()} bit)')
+ f' ({help_about.bits} bit)')
class CloseTest(unittest.TestCase):
diff --git a/Lib/idlelib/idle_test/test_iomenu.py b/Lib/idlelib/idle_test/test_iomenu.py
index e338893c09e6a1..e0642cf0cabef0 100644
--- a/Lib/idlelib/idle_test/test_iomenu.py
+++ b/Lib/idlelib/idle_test/test_iomenu.py
@@ -1,10 +1,18 @@
"Test , coverage 17%."
-from idlelib import iomenu, util
+from idlelib import iomenu
import unittest
from test.support import requires
from tkinter import Tk
from idlelib.editor import EditorWindow
+from idlelib import util
+from idlelib.idle_test.mock_idle import Func
+
+# Fail if either tokenize.open and t.detect_encoding does not exist.
+# These are used in loadfile and encode.
+# Also used in pyshell.MI.execfile and runscript.tabnanny.
+from tokenize import open, detect_encoding
+# Remove when we have proper tests that use both.
class IOBindingTest(unittest.TestCase):
@@ -36,9 +44,14 @@ def test_fixnewlines_end(self):
io = self.io
fix = io.fixnewlines
text = io.editwin.text
+
+ # Make the editor temporarily look like Shell.
self.editwin.interp = None
- eq(fix(), '')
- del self.editwin.interp
+ shelltext = '>>> if 1'
+ self.editwin.get_prompt_text = Func(result=shelltext)
+ eq(fix(), shelltext) # Get... call and '\n' not added.
+ del self.editwin.interp, self.editwin.get_prompt_text
+
text.insert(1.0, 'a')
eq(fix(), 'a'+io.eol_convention)
eq(text.get('1.0', 'end-1c'), 'a\n')
diff --git a/Lib/idlelib/idle_test/test_outwin.py b/Lib/idlelib/idle_test/test_outwin.py
index e347bfca7f191a..d6e85ad674417c 100644
--- a/Lib/idlelib/idle_test/test_outwin.py
+++ b/Lib/idlelib/idle_test/test_outwin.py
@@ -159,7 +159,7 @@ def test_file_line_helper(self, mock_open):
for line, expected_output in test_lines:
self.assertEqual(flh(line), expected_output)
if expected_output:
- mock_open.assert_called_with(expected_output[0], 'r')
+ mock_open.assert_called_with(expected_output[0])
if __name__ == '__main__':
diff --git a/Lib/idlelib/idle_test/test_parenmatch.py b/Lib/idlelib/idle_test/test_parenmatch.py
index 4a41d8433d5483..2e10d7cd36760f 100644
--- a/Lib/idlelib/idle_test/test_parenmatch.py
+++ b/Lib/idlelib/idle_test/test_parenmatch.py
@@ -83,12 +83,12 @@ def test_paren_corner(self):
"""
Test corner cases in flash_paren_event and paren_closed_event.
- These cases force conditional expression and alternate paths.
+ Force execution of conditional expressions and alternate paths.
"""
text = self.text
pm = self.get_parenmatch()
- text.insert('insert', '# this is a commen)')
+ text.insert('insert', '# Comment.)')
pm.paren_closed_event('event')
text.insert('insert', '\ndef')
diff --git a/Lib/idlelib/idle_test/test_run.py b/Lib/idlelib/idle_test/test_run.py
index d859ffc153fcdd..ec4637c5ca617a 100644
--- a/Lib/idlelib/idle_test/test_run.py
+++ b/Lib/idlelib/idle_test/test_run.py
@@ -3,7 +3,7 @@
from idlelib import run
import io
import sys
-from test.support import captured_output, captured_stderr, has_no_debug_ranges
+from test.support import captured_output, captured_stderr
import unittest
from unittest import mock
import idlelib
@@ -33,14 +33,9 @@ def __eq__(self, other):
run.print_exception()
tb = output.getvalue().strip().splitlines()
- if has_no_debug_ranges():
- self.assertEqual(11, len(tb))
- self.assertIn('UnhashableException: ex2', tb[3])
- self.assertIn('UnhashableException: ex1', tb[10])
- else:
- self.assertEqual(13, len(tb))
- self.assertIn('UnhashableException: ex2', tb[4])
- self.assertIn('UnhashableException: ex1', tb[12])
+ self.assertEqual(11, len(tb))
+ self.assertIn('UnhashableException: ex2', tb[3])
+ self.assertIn('UnhashableException: ex1', tb[10])
data = (('1/0', ZeroDivisionError, "division by zero\n"),
('abc', NameError, "name 'abc' is not defined. "
diff --git a/Lib/idlelib/idle_test/test_sidebar.py b/Lib/idlelib/idle_test/test_sidebar.py
index 01fd6a04d0de30..fb52b3a0179553 100644
--- a/Lib/idlelib/idle_test/test_sidebar.py
+++ b/Lib/idlelib/idle_test/test_sidebar.py
@@ -6,6 +6,7 @@
import unittest
import unittest.mock
from test.support import requires, swap_attr
+from test import support
import tkinter as tk
from idlelib.idle_test.tkinter_testing_utils import run_in_tk_mainloop
@@ -56,7 +57,7 @@ def setUpClass(cls):
@classmethod
def tearDownClass(cls):
cls.editwin.per.close()
- cls.root.update()
+ cls.root.update_idletasks()
cls.root.destroy()
del cls.text, cls.text_frame, cls.editwin, cls.root
@@ -327,7 +328,7 @@ def test_scroll(self):
self.assertEqual(self.linenumber.sidebar_text.index('@0,0'), '11.0')
# Generate a mouse-wheel event and make sure it scrolled up or down.
- # The meaning of the "delta" is OS-dependant, so this just checks for
+ # The meaning of the "delta" is OS-dependent, so this just checks for
# any change.
self.linenumber.sidebar_text.event_generate('',
x=0, y=0,
@@ -612,7 +613,8 @@ def test_interrupt_recall_undo_redo(self):
@run_in_tk_mainloop()
def test_very_long_wrapped_line(self):
- with swap_attr(self.shell, 'squeezer', None):
+ with support.adjust_int_max_str_digits(11_111), \
+ swap_attr(self.shell, 'squeezer', None):
self.do_input('x = ' + '1'*10_000 + '\n')
yield
self.assertEqual(self.get_sidebar_lines(), ['>>>'])
@@ -689,11 +691,12 @@ def test_mousewheel(self):
self.assertIsNotNone(text.dlineinfo(text.index(f'{last_lineno}.0')))
# Scroll up using the event.
- # The meaning delta is platform-dependant.
+ # The meaning of delta is platform-dependent.
delta = -1 if sys.platform == 'darwin' else 120
sidebar.canvas.event_generate('', x=0, y=0, delta=delta)
yield
- self.assertIsNone(text.dlineinfo(text.index(f'{last_lineno}.0')))
+ if sys.platform != 'darwin': # .update_idletasks() does not work.
+ self.assertIsNone(text.dlineinfo(text.index(f'{last_lineno}.0')))
# Scroll back down using the event.
sidebar.canvas.event_generate('', x=0, y=0)
@@ -733,7 +736,7 @@ def test_copy_with_prompts(self):
first_line = get_end_linenumber(text)
self.do_input(dedent('''\
if True:
- print(1)
+ print(1)
'''))
yield
@@ -744,9 +747,10 @@ def test_copy_with_prompts(self):
selected_lines_text = text.get('sel.first linestart', 'sel.last')
selected_lines = selected_lines_text.split('\n')
- # Expect a block of input, a single output line, and a new prompt
+ selected_lines.pop() # Final '' is a split artifact, not a line.
+ # Expect a block of input and a single output line.
expected_prompts = \
- ['>>>'] + ['...'] * (len(selected_lines) - 3) + [None, '>>>']
+ ['>>>'] + ['...'] * (len(selected_lines) - 2) + [None]
selected_text_with_prompts = '\n'.join(
line if prompt is None else prompt + ' ' + line
for prompt, line in zip(expected_prompts,
diff --git a/Lib/idlelib/idle_test/test_text.py b/Lib/idlelib/idle_test/test_text.py
index 0f31179e04b28f..43a9ba02c3d3c9 100644
--- a/Lib/idlelib/idle_test/test_text.py
+++ b/Lib/idlelib/idle_test/test_text.py
@@ -6,7 +6,7 @@
from test.support import requires
from _tkinter import TclError
-class TextTest(object):
+class TextTest:
"Define items common to both sets of tests."
hw = 'hello\nworld' # Several tests insert this after initialization.
diff --git a/Lib/idlelib/idle_test/test_zzdummy.py b/Lib/idlelib/idle_test/test_zzdummy.py
index 1013cdc3c46f4f..209d8564da0664 100644
--- a/Lib/idlelib/idle_test/test_zzdummy.py
+++ b/Lib/idlelib/idle_test/test_zzdummy.py
@@ -19,7 +19,7 @@
}
code_sample = """\
-class C1():
+class C1:
# Class comment.
def __init__(self, a, b):
self.a = a
diff --git a/Lib/idlelib/iomenu.py b/Lib/idlelib/iomenu.py
index ad3109df84096a..af8159c2b33f51 100644
--- a/Lib/idlelib/iomenu.py
+++ b/Lib/idlelib/iomenu.py
@@ -9,18 +9,12 @@
from tkinter import messagebox
from tkinter.simpledialog import askstring
-import idlelib
from idlelib.config import idleConf
from idlelib.util import py_extensions
py_extensions = ' '.join("*"+ext for ext in py_extensions)
-
encoding = 'utf-8'
-if sys.platform == 'win32':
- errors = 'surrogatepass'
-else:
- errors = 'surrogateescape'
-
+errors = 'surrogatepass' if sys.platform == 'win32' else 'surrogateescape'
class IOBinding:
@@ -257,11 +251,17 @@ def writefile(self, filename):
return False
def fixnewlines(self):
- "Return text with final \n if needed and os eols."
- if (self.text.get("end-2c") != '\n'
- and not hasattr(self.editwin, "interp")): # Not shell.
- self.text.insert("end-1c", "\n")
- text = self.text.get("1.0", "end-1c")
+ """Return text with os eols.
+
+ Add prompts if shell else final \n if missing.
+ """
+
+ if hasattr(self.editwin, "interp"): # Saving shell.
+ text = self.editwin.get_prompt_text('1.0', self.text.index('end-1c'))
+ else:
+ if self.text.get("end-2c") != '\n':
+ self.text.insert("end-1c", "\n") # Changes 'end-1c' value.
+ text = self.text.get('1.0', "end-1c")
if self.eol_convention != "\n":
text = text.replace("\n", self.eol_convention)
return text
diff --git a/Lib/idlelib/macosx.py b/Lib/idlelib/macosx.py
index 53848fb079eab1..89b645702d334d 100644
--- a/Lib/idlelib/macosx.py
+++ b/Lib/idlelib/macosx.py
@@ -14,12 +14,25 @@
_tk_type = None
def _init_tk_type():
- """
- Initializes OS X Tk variant values for
- isAquaTk(), isCarbonTk(), isCocoaTk(), and isXQuartz().
+ """ Initialize _tk_type for isXyzTk functions.
+
+ This function is only called once, when _tk_type is still None.
"""
global _tk_type
if platform == 'darwin':
+
+ # When running IDLE, GUI is present, test/* may not be.
+ # When running tests, test/* is present, GUI may not be.
+ # If not, guess most common. Does not matter for testing.
+ from idlelib.__init__ import testing
+ if testing:
+ from test.support import requires, ResourceDenied
+ try:
+ requires('gui')
+ except ResourceDenied:
+ _tk_type = "cocoa"
+ return
+
root = tkinter.Tk()
ws = root.tk.call('tk', 'windowingsystem')
if 'x11' in ws:
@@ -33,6 +46,7 @@ def _init_tk_type():
root.destroy()
else:
_tk_type = "other"
+ return
def isAquaTk():
"""
diff --git a/Lib/idlelib/mainmenu.py b/Lib/idlelib/mainmenu.py
index a1b169176cba92..91a32cebb513f9 100644
--- a/Lib/idlelib/mainmenu.py
+++ b/Lib/idlelib/mainmenu.py
@@ -42,16 +42,17 @@
('_Undo', '<>'),
('_Redo', '<>'),
None,
+ ('Select _All', '<>'),
('Cu_t', '<>'),
('_Copy', '<>'),
('_Paste', '<>'),
- ('Select _All', '<>'),
None,
('_Find...', '<>'),
('Find A_gain', '<>'),
('Find _Selection', '<>'),
('Find in Files...', '<>'),
('R_eplace...', '<>'),
+ None,
('Go to _Line', '<>'),
('S_how Completions', '<>'),
('E_xpand Word', '<>'),
@@ -110,7 +111,7 @@
('help', [
('_About IDLE', '<>'),
None,
- ('_IDLE Help', '<>'),
+ ('_IDLE Doc', '<>'),
('Python _Docs', '<>'),
]),
]
diff --git a/Lib/idlelib/multicall.py b/Lib/idlelib/multicall.py
index dc02001292fc14..0200f445cc9340 100644
--- a/Lib/idlelib/multicall.py
+++ b/Lib/idlelib/multicall.py
@@ -52,9 +52,9 @@
_modifier_masks = (MC_CONTROL, MC_ALT, MC_SHIFT, MC_META)
# a dictionary to map a modifier name into its number
-_modifier_names = dict([(name, number)
+_modifier_names = {name: number
for number in range(len(_modifiers))
- for name in _modifiers[number]])
+ for name in _modifiers[number]}
# In 3.4, if no shell window is ever open, the underlying Tk widget is
# destroyed before .__del__ methods here are called. The following
@@ -134,7 +134,7 @@ def nbits(n):
return nb
statelist = []
for state in states:
- substates = list(set(state & x for x in states))
+ substates = list({state & x for x in states})
substates.sort(key=nbits, reverse=True)
statelist.append(substates)
return statelist
@@ -258,9 +258,9 @@ def __del__(self):
_binder_classes = (_ComplexBinder,) * 4 + (_SimpleBinder,) * (len(_types)-4)
# A dictionary to map a type name into its number
-_type_names = dict([(name, number)
+_type_names = {name: number
for number in range(len(_types))
- for name in _types[number]])
+ for name in _types[number]}
_keysym_re = re.compile(r"^\w+$")
_button_re = re.compile(r"^[1-5]$")
diff --git a/Lib/idlelib/outwin.py b/Lib/idlelib/outwin.py
index 5ab08bbaf4bc95..610031e26f1dff 100644
--- a/Lib/idlelib/outwin.py
+++ b/Lib/idlelib/outwin.py
@@ -42,7 +42,7 @@ def file_line_helper(line):
if match:
filename, lineno = match.group(1, 2)
try:
- f = open(filename, "r")
+ f = open(filename)
f.close()
break
except OSError:
@@ -112,7 +112,7 @@ def write(self, s, tags=(), mark="insert"):
assert isinstance(s, str)
self.text.insert(mark, s, tags)
self.text.see(mark)
- self.text.update()
+ self.text.update_idletasks()
return len(s)
def writelines(self, lines):
diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index 2e54a81a1d38dd..bdde156166171b 100755
--- a/Lib/idlelib/pyshell.py
+++ b/Lib/idlelib/pyshell.py
@@ -249,7 +249,7 @@ def store_file_breaks(self):
breaks = self.breakpoints
filename = self.io.filename
try:
- with open(self.breakpointPath, "r") as fp:
+ with open(self.breakpointPath) as fp:
lines = fp.readlines()
except OSError:
lines = []
@@ -279,7 +279,7 @@ def restore_file_breaks(self):
if filename is None:
return
if os.path.isfile(self.breakpointPath):
- with open(self.breakpointPath, "r") as fp:
+ with open(self.breakpointPath) as fp:
lines = fp.readlines()
for line in lines:
if line.startswith(filename + '='):
@@ -441,7 +441,7 @@ def build_subprocess_arglist(self):
# run from the IDLE source directory.
del_exitf = idleConf.GetOption('main', 'General', 'delete-exitfunc',
default=False, type='bool')
- command = "__import__('idlelib.run').run.main(%r)" % (del_exitf,)
+ command = f"__import__('idlelib.run').run.main({del_exitf!r})"
return [sys.executable] + w + ["-c", command, str(self.port)]
def start_subprocess(self):
@@ -574,9 +574,9 @@ def transfer_path(self, with_cwd=False):
self.runcommand("""if 1:
import sys as _sys
- _sys.path = %r
+ _sys.path = {!r}
del _sys
- \n""" % (path,))
+ \n""".format(path))
active_seq = None
@@ -703,14 +703,14 @@ def stuffsource(self, source):
def prepend_syspath(self, filename):
"Prepend sys.path with file's directory if not already included"
self.runcommand("""if 1:
- _filename = %r
+ _filename = {!r}
import sys as _sys
from os.path import dirname as _dirname
_dir = _dirname(_filename)
if not _dir in _sys.path:
_sys.path.insert(0, _dir)
del _filename, _sys, _dirname, _dir
- \n""" % (filename,))
+ \n""".format(filename))
def showsyntaxerror(self, filename=None):
"""Override Interactive Interpreter method: Use Colorizing
@@ -986,6 +986,23 @@ def replace_event(self, event):
def get_standard_extension_names(self):
return idleConf.GetExtensions(shell_only=True)
+ def get_prompt_text(self, first, last):
+ """Return text between first and last with prompts added."""
+ text = self.text.get(first, last)
+ lineno_range = range(
+ int(float(first)),
+ int(float(last))
+ )
+ prompts = [
+ self.shell_sidebar.line_prompts.get(lineno)
+ for lineno in lineno_range
+ ]
+ return "\n".join(
+ line if prompt is None else f"{prompt} {line}"
+ for prompt, line in zip(prompts, text.splitlines())
+ ) + "\n"
+
+
def copy_with_prompts_callback(self, event=None):
"""Copy selected lines to the clipboard, with prompts.
@@ -996,31 +1013,15 @@ def copy_with_prompts_callback(self, event=None):
and/or last lines is selected.
"""
text = self.text
-
- selection_indexes = (
- self.text.index("sel.first linestart"),
- self.text.index("sel.last +1line linestart"),
- )
- if selection_indexes[0] is None:
- # There is no selection, so do nothing.
- return
-
- selected_text = self.text.get(*selection_indexes)
- selection_lineno_range = range(
- int(float(selection_indexes[0])),
- int(float(selection_indexes[1]))
- )
- prompts = [
- self.shell_sidebar.line_prompts.get(lineno)
- for lineno in selection_lineno_range
- ]
- selected_text_with_prompts = "\n".join(
- line if prompt is None else f"{prompt} {line}"
- for prompt, line in zip(prompts, selected_text.splitlines())
- ) + "\n"
-
+ selfirst = text.index('sel.first linestart')
+ if selfirst is None: # Should not be possible.
+ return # No selection, do nothing.
+ sellast = text.index('sel.last')
+ if sellast[-1] != '0':
+ sellast = text.index("sel.last+1line linestart")
text.clipboard_clear()
- text.clipboard_append(selected_text_with_prompts)
+ prompt_text = self.get_prompt_text(selfirst, sellast)
+ text.clipboard_append(prompt_text)
reading = False
executing = False
@@ -1535,7 +1536,7 @@ def main():
try:
opts, args = getopt.getopt(sys.argv[1:], "c:deihnr:st:")
except getopt.error as msg:
- print("Error: %s\n%s" % (msg, usage_msg), file=sys.stderr)
+ print(f"Error: {msg}\n{usage_msg}", file=sys.stderr)
sys.exit(2)
for o, a in opts:
if o == '-c':
@@ -1667,9 +1668,9 @@ def main():
if cmd or script:
shell.interp.runcommand("""if 1:
import sys as _sys
- _sys.argv = %r
+ _sys.argv = {!r}
del _sys
- \n""" % (sys.argv,))
+ \n""".format(sys.argv))
if cmd:
shell.interp.execsource(cmd)
elif script:
diff --git a/Lib/idlelib/redirector.py b/Lib/idlelib/redirector.py
index 9ab34c5acfb22c..4928340e98df68 100644
--- a/Lib/idlelib/redirector.py
+++ b/Lib/idlelib/redirector.py
@@ -47,9 +47,8 @@ def __init__(self, widget):
tk.createcommand(w, self.dispatch)
def __repr__(self):
- return "%s(%s<%s>)" % (self.__class__.__name__,
- self.widget.__class__.__name__,
- self.widget._w)
+ w = self.widget
+ return f"{self.__class__.__name__,}({w.__class__.__name__}<{w._w}>)"
def close(self):
"Unregister operations and revert redirection created by .__init__."
@@ -143,8 +142,7 @@ def __init__(self, redir, operation):
self.orig_and_operation = (redir.orig, operation)
def __repr__(self):
- return "%s(%r, %r)" % (self.__class__.__name__,
- self.redir, self.operation)
+ return f"{self.__class__.__name__,}({self.redir!r}, {self.operation!r})"
def __call__(self, *args):
return self.tk_call(self.orig_and_operation + args)
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
index 8efcf048fa3aa2..b08b80c9004551 100644
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -174,7 +174,7 @@ def localcall(self, seq, request):
except TypeError:
return ("ERROR", "Bad request format")
if oid not in self.objtable:
- return ("ERROR", "Unknown object id: %r" % (oid,))
+ return ("ERROR", f"Unknown object id: {oid!r}")
obj = self.objtable[oid]
if methodname == "__methods__":
methods = {}
@@ -185,7 +185,7 @@ def localcall(self, seq, request):
_getattributes(obj, attributes)
return ("OK", attributes)
if not hasattr(obj, methodname):
- return ("ERROR", "Unsupported method name: %r" % (methodname,))
+ return ("ERROR", f"Unsupported method name: {methodname!r}")
method = getattr(obj, methodname)
try:
if how == 'CALL':
@@ -307,7 +307,7 @@ def _getresponse(self, myseq, wait):
self.debug("_getresponse:myseq:", myseq)
if threading.current_thread() is self.sockthread:
# this thread does all reading of requests or responses
- while 1:
+ while True:
response = self.pollresponse(myseq, wait)
if response is not None:
return response
@@ -417,7 +417,7 @@ def pollresponse(self, myseq, wait):
self.responses and notify the owning thread.
"""
- while 1:
+ while True:
# send queued response if there is one available
try:
qmsg = response_queue.get(0)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index aaa9b5ce8d181f..9eeaaa3aa04ca4 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -52,13 +52,13 @@ def idle_formatwarning(message, category, filename, lineno, line=None):
"""Format warnings the IDLE way."""
s = "\nWarning (from warnings module):\n"
- s += ' File \"%s\", line %s\n' % (filename, lineno)
+ s += f' File \"{filename}\", line {lineno}\n'
if line is None:
line = linecache.getline(filename, lineno)
line = line.strip()
if line:
s += " %s\n" % line
- s += "%s: %s\n" % (category.__name__, message)
+ s += f"{category.__name__}: {message}\n"
return s
def idle_showwarning_subproc(
@@ -145,7 +145,7 @@ def main(del_exitfunc=False):
args=((LOCALHOST, port),))
sockthread.daemon = True
sockthread.start()
- while 1:
+ while True:
try:
if exit_now:
try:
diff --git a/Lib/idlelib/searchengine.py b/Lib/idlelib/searchengine.py
index eddef581ab40a7..0684142f43644a 100644
--- a/Lib/idlelib/searchengine.py
+++ b/Lib/idlelib/searchengine.py
@@ -165,7 +165,7 @@ def search_backward(self, text, prog, line, col, wrap, ok=0):
wrapped = 0
startline = line
chars = text.get("%d.0" % line, "%d.0" % (line+1))
- while 1:
+ while True:
m = search_reverse(prog, chars[:-1], col)
if m:
if ok or m.start() < col:
diff --git a/Lib/idlelib/textview.py b/Lib/idlelib/textview.py
index a66c1a4309a617..23f0f4cb5027ec 100644
--- a/Lib/idlelib/textview.py
+++ b/Lib/idlelib/textview.py
@@ -169,7 +169,7 @@ def view_file(parent, title, filename, encoding, modal=True, wrap='word',
with contents of the file.
"""
try:
- with open(filename, 'r', encoding=encoding) as file:
+ with open(filename, encoding=encoding) as file:
contents = file.read()
except OSError:
showerror(title='File Load Error',
diff --git a/Lib/idlelib/tooltip.py b/Lib/idlelib/tooltip.py
index d714318dae8ef1..3983690dd41177 100644
--- a/Lib/idlelib/tooltip.py
+++ b/Lib/idlelib/tooltip.py
@@ -92,7 +92,7 @@ def __init__(self, anchor_widget, hover_delay=1000):
e.g. after hovering over the anchor widget with the mouse for enough
time.
"""
- super(OnHoverTooltipBase, self).__init__(anchor_widget)
+ super().__init__(anchor_widget)
self.hover_delay = hover_delay
self._after_id = None
@@ -107,7 +107,7 @@ def __del__(self):
self.anchor_widget.unbind("", self._id3) # pragma: no cover
except TclError:
pass
- super(OnHoverTooltipBase, self).__del__()
+ super().__del__()
def _show_event(self, event=None):
"""event handler to display the tooltip"""
@@ -139,7 +139,7 @@ def hidetip(self):
self.unschedule()
except TclError: # pragma: no cover
pass
- super(OnHoverTooltipBase, self).hidetip()
+ super().hidetip()
class Hovertip(OnHoverTooltipBase):
@@ -154,7 +154,7 @@ def __init__(self, anchor_widget, text, hover_delay=1000):
e.g. after hovering over the anchor widget with the mouse for enough
time.
"""
- super(Hovertip, self).__init__(anchor_widget, hover_delay=hover_delay)
+ super().__init__(anchor_widget, hover_delay=hover_delay)
self.text = text
def showcontents(self):
diff --git a/Lib/idlelib/tree.py b/Lib/idlelib/tree.py
index 5947268f5c35ae..5f30f0f6092bfa 100644
--- a/Lib/idlelib/tree.py
+++ b/Lib/idlelib/tree.py
@@ -32,7 +32,7 @@
if os.path.isdir(_icondir):
ICONDIR = _icondir
elif not os.path.isdir(ICONDIR):
- raise RuntimeError("can't find icon directory (%r)" % (ICONDIR,))
+ raise RuntimeError(f"can't find icon directory ({ICONDIR!r})")
def listicons(icondir=ICONDIR):
"""Utility to display the available icons."""
diff --git a/Lib/idlelib/undo.py b/Lib/idlelib/undo.py
index 85ecffecb4cbcb..5f10c0f05c1acb 100644
--- a/Lib/idlelib/undo.py
+++ b/Lib/idlelib/undo.py
@@ -309,7 +309,7 @@ def __repr__(self):
s = self.__class__.__name__
strs = []
for cmd in self.cmds:
- strs.append(" %r" % (cmd,))
+ strs.append(f" {cmd!r}")
return s + "(\n" + ",\n".join(strs) + "\n)"
def __len__(self):
diff --git a/Lib/idlelib/util.py b/Lib/idlelib/util.py
index 5480219786bca6..ede670a4db5536 100644
--- a/Lib/idlelib/util.py
+++ b/Lib/idlelib/util.py
@@ -12,7 +12,6 @@
* std streams (pyshell, run),
* warning stuff (pyshell, run).
"""
-from os import path
# .pyw is for Windows; .pyi is for stub files.
py_extensions = ('.py', '.pyw', '.pyi') # Order needed for open/save dialogs.
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index afb95f4e1df869..ee93ebc3960ca3 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -747,8 +747,6 @@ def module_repr(module):
@classmethod
def find_spec(cls, fullname, path=None, target=None):
- if path is not None:
- return None
if _imp.is_builtin(fullname):
return spec_from_loader(fullname, cls, origin=cls._ORIGIN)
else:
diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
index 5f67226adfc522..f603a89f7f5a98 100644
--- a/Lib/importlib/_bootstrap_external.py
+++ b/Lib/importlib/_bootstrap_external.py
@@ -402,7 +402,8 @@ def _write_atomic(path, data, mode=0o666):
# add JUMP_BACKWARD_NO_INTERRUPT, make JUMP_NO_INTERRUPT virtual)
# Python 3.11a7 3492 (make POP_JUMP_IF_NONE/NOT_NONE/TRUE/FALSE relative)
# Python 3.11a7 3493 (Make JUMP_IF_TRUE_OR_POP/JUMP_IF_FALSE_OR_POP relative)
-# Python 3.11a7 3494 (New location info table)
+# Python 3.11a7 3494 (New location info table)
+# Python 3.11b4 3495 (Set line number of module's RESUME instr to 0 per PEP 626)
# Python 3.12 will start with magic number 3500
@@ -416,7 +417,7 @@ def _write_atomic(path, data, mode=0o666):
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
# in PC/launcher.c must also be updated.
-MAGIC_NUMBER = (3494).to_bytes(2, 'little') + b'\r\n'
+MAGIC_NUMBER = (3495).to_bytes(2, 'little') + b'\r\n'
_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c
@@ -1394,7 +1395,9 @@ def invalidate_caches():
"""Call the invalidate_caches() method on all path entry finders
stored in sys.path_importer_caches (where implemented)."""
for name, finder in list(sys.path_importer_cache.items()):
- if finder is None:
+ # Drop entry if finder name is a relative path. The current
+ # working directory may have changed.
+ if finder is None or not _path_isabs(name):
del sys.path_importer_cache[name]
elif hasattr(finder, 'invalidate_caches'):
finder.invalidate_caches()
@@ -1465,7 +1468,7 @@ def _get_spec(cls, fullname, path, target=None):
# the list of paths that will become its __path__
namespace_path = []
for entry in path:
- if not isinstance(entry, (str, bytes)):
+ if not isinstance(entry, str):
continue
finder = cls._path_importer_cache(entry)
if finder is not None:
@@ -1562,9 +1565,12 @@ def __init__(self, path, *loader_details):
loaders.extend((suffix, loader) for suffix in suffixes)
self._loaders = loaders
# Base (directory) path
- self.path = path or '.'
- if not _path_isabs(self.path):
- self.path = _path_join(_os.getcwd(), self.path)
+ if not path or path == '.':
+ self.path = _os.getcwd()
+ elif not _path_isabs(path):
+ self.path = _path_join(_os.getcwd(), path)
+ else:
+ self.path = path
self._path_mtime = -1
self._path_cache = set()
self._relaxed_path_cache = set()
diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py
index 9ceae8a0e04b5a..bbdbceebe759d9 100644
--- a/Lib/importlib/metadata/__init__.py
+++ b/Lib/importlib/metadata/__init__.py
@@ -184,6 +184,10 @@ class EntryPoint(DeprecatedTuple):
following the attr, and following any extras.
"""
+ name: str
+ value: str
+ group: str
+
dist: Optional['Distribution'] = None
def __init__(self, name, value, group):
@@ -543,7 +547,7 @@ def locate_file(self, path):
"""
@classmethod
- def from_name(cls, name):
+ def from_name(cls, name: str):
"""Return the Distribution for the given package name.
:param name: The name of the distribution package to search for.
@@ -551,13 +555,13 @@ def from_name(cls, name):
package, if found.
:raises PackageNotFoundError: When the named package's distribution
metadata cannot be found.
+ :raises ValueError: When an invalid value is supplied for name.
"""
- for resolver in cls._discover_resolvers():
- dists = resolver(DistributionFinder.Context(name=name))
- dist = next(iter(dists), None)
- if dist is not None:
- return dist
- else:
+ if not name:
+ raise ValueError("A distribution name is required.")
+ try:
+ return next(cls.discover(name=name))
+ except StopIteration:
raise PackageNotFoundError(name)
@classmethod
@@ -945,13 +949,26 @@ def _normalized_name(self):
normalized name from the file system path.
"""
stem = os.path.basename(str(self._path))
- return self._name_from_stem(stem) or super()._normalized_name
+ return (
+ pass_none(Prepared.normalize)(self._name_from_stem(stem))
+ or super()._normalized_name
+ )
- def _name_from_stem(self, stem):
- name, ext = os.path.splitext(stem)
+ @staticmethod
+ def _name_from_stem(stem):
+ """
+ >>> PathDistribution._name_from_stem('foo-3.0.egg-info')
+ 'foo'
+ >>> PathDistribution._name_from_stem('CherryPy-3.0.dist-info')
+ 'CherryPy'
+ >>> PathDistribution._name_from_stem('face.egg-info')
+ 'face'
+ >>> PathDistribution._name_from_stem('foo.bar')
+ """
+ filename, ext = os.path.splitext(stem)
if ext not in ('.dist-info', '.egg-info'):
return
- name, sep, rest = stem.partition('-')
+ name, sep, rest = filename.partition('-')
return name
@@ -991,6 +1008,15 @@ def version(distribution_name):
return distribution(distribution_name).version
+_unique = functools.partial(
+ unique_everseen,
+ key=operator.attrgetter('_normalized_name'),
+)
+"""
+Wrapper for ``distributions`` to return unique distributions by name.
+"""
+
+
def entry_points(**params) -> Union[EntryPoints, SelectableGroups]:
"""Return EntryPoint objects for all installed packages.
@@ -1008,10 +1034,8 @@ def entry_points(**params) -> Union[EntryPoints, SelectableGroups]:
:return: EntryPoints or SelectableGroups for all installed packages.
"""
- norm_name = operator.attrgetter('_normalized_name')
- unique = functools.partial(unique_everseen, key=norm_name)
eps = itertools.chain.from_iterable(
- dist.entry_points for dist in unique(distributions())
+ dist.entry_points for dist in _unique(distributions())
)
return SelectableGroups.load(eps).select(**params)
diff --git a/Lib/importlib/resources/_common.py b/Lib/importlib/resources/_common.py
index 147ea19188f718..ca1fa8ab2fe6ff 100644
--- a/Lib/importlib/resources/_common.py
+++ b/Lib/importlib/resources/_common.py
@@ -67,7 +67,10 @@ def from_package(package):
@contextlib.contextmanager
-def _tempfile(reader, suffix=''):
+def _tempfile(reader, suffix='',
+ # gh-93353: Keep a reference to call os.remove() in late Python
+ # finalization.
+ *, _os_remove=os.remove):
# Not using tempfile.NamedTemporaryFile as it leads to deeper 'try'
# blocks due to the need to close the temporary file to work on Windows
# properly.
@@ -81,7 +84,7 @@ def _tempfile(reader, suffix=''):
yield pathlib.Path(raw_path)
finally:
try:
- os.remove(raw_path)
+ _os_remove(raw_path)
except FileNotFoundError:
pass
diff --git a/Lib/inspect.py b/Lib/inspect.py
index 6e744712f014b1..14569a510a0501 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -395,7 +395,7 @@ def _has_code_flag(f, flag):
while ismethod(f):
f = f.__func__
f = functools._unwrap_partial(f)
- if not isfunction(f):
+ if not (isfunction(f) or _signature_is_functionlike(f)):
return False
return bool(f.__code__.co_flags & flag)
@@ -1175,7 +1175,6 @@ def __init__(self):
self.started = False
self.passline = False
self.indecorator = False
- self.decoratorhasargs = False
self.last = 1
self.body_col0 = None
@@ -1190,13 +1189,6 @@ def tokeneater(self, type, token, srowcol, erowcol, line):
self.islambda = True
self.started = True
self.passline = True # skip to the end of the line
- elif token == "(":
- if self.indecorator:
- self.decoratorhasargs = True
- elif token == ")":
- if self.indecorator:
- self.indecorator = False
- self.decoratorhasargs = False
elif type == tokenize.NEWLINE:
self.passline = False # stop skipping when a NEWLINE is seen
self.last = srowcol[0]
@@ -1204,7 +1196,7 @@ def tokeneater(self, type, token, srowcol, erowcol, line):
raise EndOfBlock
# hitting a NEWLINE when in a decorator without args
# ends the decorator
- if self.indecorator and not self.decoratorhasargs:
+ if self.indecorator:
self.indecorator = False
elif self.passline:
pass
@@ -1448,7 +1440,10 @@ def getargvalues(frame):
def formatannotation(annotation, base_module=None):
if getattr(annotation, '__module__', None) == 'typing':
- return repr(annotation).replace('typing.', '')
+ def repl(match):
+ text = match.group()
+ return text.removeprefix('typing.')
+ return re.sub(r'[\w\.]+', repl, repr(annotation))
if isinstance(annotation, types.GenericAlias):
return str(annotation)
if isinstance(annotation, type):
@@ -1834,8 +1829,10 @@ def getattr_static(obj, attr, default=_sentinel):
klass_result = _check_class(klass, attr)
if instance_result is not _sentinel and klass_result is not _sentinel:
- if (_check_class(type(klass_result), '__get__') is not _sentinel and
- _check_class(type(klass_result), '__set__') is not _sentinel):
+ if _check_class(type(klass_result), "__get__") is not _sentinel and (
+ _check_class(type(klass_result), "__set__") is not _sentinel
+ or _check_class(type(klass_result), "__delete__") is not _sentinel
+ ):
return klass_result
if instance_result is not _sentinel:
@@ -2121,7 +2118,7 @@ def _signature_strip_non_python_syntax(signature):
self_parameter = None
last_positional_only = None
- lines = [l.encode('ascii') for l in signature.split('\n')]
+ lines = [l.encode('ascii') for l in signature.split('\n') if l]
generator = iter(lines).__next__
token_stream = tokenize.tokenize(generator)
@@ -2197,7 +2194,6 @@ def _signature_fromstr(cls, obj, s, skip_bound_arg=True):
parameters = []
empty = Parameter.empty
- invalid = object()
module = None
module_dict = {}
@@ -2221,11 +2217,11 @@ def wrap_value(s):
try:
value = eval(s, sys_module_dict)
except NameError:
- raise RuntimeError()
+ raise ValueError
if isinstance(value, (str, int, float, bytes, bool, type(None))):
return ast.Constant(value)
- raise RuntimeError()
+ raise ValueError
class RewriteSymbolics(ast.NodeTransformer):
def visit_Attribute(self, node):
@@ -2235,7 +2231,7 @@ def visit_Attribute(self, node):
a.append(n.attr)
n = n.value
if not isinstance(n, ast.Name):
- raise RuntimeError()
+ raise ValueError
a.append(n.id)
value = ".".join(reversed(a))
return wrap_value(value)
@@ -2245,19 +2241,29 @@ def visit_Name(self, node):
raise ValueError()
return wrap_value(node.id)
+ def visit_BinOp(self, node):
+ # Support constant folding of a couple simple binary operations
+ # commonly used to define default values in text signatures
+ left = self.visit(node.left)
+ right = self.visit(node.right)
+ if not isinstance(left, ast.Constant) or not isinstance(right, ast.Constant):
+ raise ValueError
+ if isinstance(node.op, ast.Add):
+ return ast.Constant(left.value + right.value)
+ elif isinstance(node.op, ast.Sub):
+ return ast.Constant(left.value - right.value)
+ elif isinstance(node.op, ast.BitOr):
+ return ast.Constant(left.value | right.value)
+ raise ValueError
+
def p(name_node, default_node, default=empty):
name = parse_name(name_node)
- if name is invalid:
- return None
if default_node and default_node is not _empty:
try:
default_node = RewriteSymbolics().visit(default_node)
- o = ast.literal_eval(default_node)
+ default = ast.literal_eval(default_node)
except ValueError:
- o = invalid
- if o is invalid:
- return None
- default = o if o is not invalid else default
+ raise ValueError("{!r} builtin has invalid signature".format(obj)) from None
parameters.append(Parameter(name, kind, default=default, annotation=empty))
# non-keyword-only parameters
@@ -2454,7 +2460,10 @@ def _signature_from_callable(obj, *,
# Was this function wrapped by a decorator?
if follow_wrapper_chains:
- obj = unwrap(obj, stop=(lambda f: hasattr(f, "__signature__")))
+ # Unwrap until we find an explicit signature or a MethodType (which will be
+ # handled explicitly below).
+ obj = unwrap(obj, stop=(lambda f: hasattr(f, "__signature__")
+ or isinstance(f, types.MethodType)))
if isinstance(obj, types.MethodType):
# If the unwrapped object is a *method*, we might want to
# skip its first parameter (self).
@@ -2971,7 +2980,7 @@ def __init__(self, parameters=None, *, return_annotation=_empty,
if __validate_parameters__:
params = OrderedDict()
top_kind = _POSITIONAL_ONLY
- kind_defaults = False
+ seen_default = False
for param in parameters:
kind = param.kind
@@ -2986,21 +2995,19 @@ def __init__(self, parameters=None, *, return_annotation=_empty,
kind.description)
raise ValueError(msg)
elif kind > top_kind:
- kind_defaults = False
top_kind = kind
if kind in (_POSITIONAL_ONLY, _POSITIONAL_OR_KEYWORD):
if param.default is _empty:
- if kind_defaults:
+ if seen_default:
# No default for this parameter, but the
- # previous parameter of the same kind had
- # a default
+ # previous parameter of had a default
msg = 'non-default argument follows default ' \
'argument'
raise ValueError(msg)
else:
# There is a default for this parameter.
- kind_defaults = True
+ seen_default = True
if name in params:
msg = 'duplicate parameter name: {!r}'.format(name)
diff --git a/Lib/io.py b/Lib/io.py
index a205e00575f7e8..a4186499c64715 100644
--- a/Lib/io.py
+++ b/Lib/io.py
@@ -70,7 +70,7 @@ def __getattr__(name):
global OpenWrapper
OpenWrapper = open
return OpenWrapper
- raise AttributeError("module {__name__!r} has no attribute {name!r}")
+ raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
# Pretend this exception was created here.
diff --git a/Lib/ipaddress.py b/Lib/ipaddress.py
index 3f15601e700d68..1cb71d8032e173 100644
--- a/Lib/ipaddress.py
+++ b/Lib/ipaddress.py
@@ -1077,15 +1077,16 @@ def is_link_local(self):
@property
def is_private(self):
- """Test if this address is allocated for private networks.
+ """Test if this network belongs to a private range.
Returns:
- A boolean, True if the address is reserved per
+ A boolean, True if the network is reserved per
iana-ipv4-special-registry or iana-ipv6-special-registry.
"""
- return (self.network_address.is_private and
- self.broadcast_address.is_private)
+ return any(self.network_address in priv_network and
+ self.broadcast_address in priv_network
+ for priv_network in self._constants._private_networks)
@property
def is_global(self):
@@ -1122,6 +1123,15 @@ def is_loopback(self):
return (self.network_address.is_loopback and
self.broadcast_address.is_loopback)
+
+class _BaseConstants:
+
+ _private_networks = []
+
+
+_BaseNetwork._constants = _BaseConstants
+
+
class _BaseV4:
"""Base IPv4 object.
@@ -1561,6 +1571,7 @@ class _IPv4Constants:
IPv4Address._constants = _IPv4Constants
+IPv4Network._constants = _IPv4Constants
class _BaseV6:
@@ -2285,3 +2296,4 @@ class _IPv6Constants:
IPv6Address._constants = _IPv6Constants
+IPv6Network._constants = _IPv6Constants
diff --git a/Lib/json/__init__.py b/Lib/json/__init__.py
index e4c21daaf3e47f..ed2c74771ea87d 100644
--- a/Lib/json/__init__.py
+++ b/Lib/json/__init__.py
@@ -1,4 +1,4 @@
-r"""JSON (JavaScript Object Notation) is a subset of
+r"""JSON (JavaScript Object Notation) is a subset of
JavaScript syntax (ECMA-262 3rd edition) used as a lightweight data
interchange format.
diff --git a/Lib/json/decoder.py b/Lib/json/decoder.py
index d7d824454e1ba3..c5d9ae2d0d5d04 100644
--- a/Lib/json/decoder.py
+++ b/Lib/json/decoder.py
@@ -252,7 +252,7 @@ def JSONArray(s_and_end, scan_once, _w=WHITESPACE.match, _ws=WHITESPACE_STR):
class JSONDecoder(object):
- """Simple JSON decoder
+ """Simple JSON decoder
Performs the following translations in decoding by default:
diff --git a/Lib/json/encoder.py b/Lib/json/encoder.py
index 864f46d9dbb726..45f547741885a8 100644
--- a/Lib/json/encoder.py
+++ b/Lib/json/encoder.py
@@ -72,7 +72,7 @@ def replace(match):
c_encode_basestring_ascii or py_encode_basestring_ascii)
class JSONEncoder(object):
- """Extensible JSON encoder for Python data structures.
+ """Extensible JSON encoder for Python data structures.
Supports the following objects and types by default:
diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py
index e2dddbec577c02..8e7773bcae13ed 100644
--- a/Lib/lib2to3/tests/test_parser.py
+++ b/Lib/lib2to3/tests/test_parser.py
@@ -63,7 +63,7 @@ def test_load_grammar_from_pickle(self):
@unittest.skipIf(sys.executable is None, 'sys.executable required')
@unittest.skipIf(
- sys.platform == 'emscripten', 'requires working subprocess'
+ sys.platform in {'emscripten', 'wasi'}, 'requires working subprocess'
)
def test_load_grammar_from_subprocess(self):
tmpdir = tempfile.mkdtemp()
diff --git a/Lib/linecache.py b/Lib/linecache.py
index 23191d6501d2a8..97644a8e3794e1 100644
--- a/Lib/linecache.py
+++ b/Lib/linecache.py
@@ -135,7 +135,7 @@ def updatecache(filename, module_globals=None):
try:
with tokenize.open(fullname) as fp:
lines = fp.readlines()
- except OSError:
+ except (OSError, UnicodeDecodeError, SyntaxError):
return []
if lines and not lines[-1].endswith('\n'):
lines[-1] += '\n'
diff --git a/Lib/locale.py b/Lib/locale.py
index 25eb75ac65a32b..7a7694e1bfb71c 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -633,7 +633,17 @@ def resetlocale(category=LC_ALL):
getdefaultlocale(). category defaults to LC_ALL.
"""
- _setlocale(category, _build_localename(getdefaultlocale()))
+ import warnings
+ warnings.warn(
+ 'Use locale.setlocale(locale.LC_ALL, "") instead',
+ DeprecationWarning, stacklevel=2
+ )
+
+ with warnings.catch_warnings():
+ warnings.simplefilter('ignore', category=DeprecationWarning)
+ loc = getdefaultlocale()
+
+ _setlocale(category, _build_localename(loc))
try:
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index 79e4b7d09bfa43..bcee2bab0b81aa 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -334,7 +334,7 @@ def __init__(self, name, level, pathname, lineno,
self.lineno = lineno
self.funcName = func
self.created = ct
- self.msecs = (ct - int(ct)) * 1000
+ self.msecs = int((ct - int(ct)) * 1000) + 0.0 # see gh-89047
self.relativeCreated = (self.created - _startTime) * 1000
if logThreads:
self.thread = threading.get_ident()
@@ -496,7 +496,7 @@ def __init__(self, *args, **kwargs):
def usesTime(self):
fmt = self._fmt
- return fmt.find('$asctime') >= 0 or fmt.find(self.asctime_format) >= 0
+ return fmt.find('$asctime') >= 0 or fmt.find(self.asctime_search) >= 0
def validate(self):
pattern = Template.pattern
diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 86a1e4eaf4cbc9..7e78a64a2f08a6 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -28,6 +28,8 @@
import io
import logging
import logging.handlers
+import os
+import queue
import re
import struct
import threading
@@ -58,15 +60,24 @@ def fileConfig(fname, defaults=None, disable_existing_loggers=True, encoding=Non
"""
import configparser
+ if isinstance(fname, str):
+ if not os.path.exists(fname):
+ raise FileNotFoundError(f"{fname} doesn't exist")
+ elif not os.path.getsize(fname):
+ raise RuntimeError(f'{fname} is an empty file')
+
if isinstance(fname, configparser.RawConfigParser):
cp = fname
else:
- cp = configparser.ConfigParser(defaults)
- if hasattr(fname, 'readline'):
- cp.read_file(fname)
- else:
- encoding = io.text_encoding(encoding)
- cp.read(fname, encoding=encoding)
+ try:
+ cp = configparser.ConfigParser(defaults)
+ if hasattr(fname, 'readline'):
+ cp.read_file(fname)
+ else:
+ encoding = io.text_encoding(encoding)
+ cp.read(fname, encoding=encoding)
+ except configparser.ParsingError as e:
+ raise RuntimeError(f'{fname} is invalid: {e}')
formatters = _create_formatters(cp)
@@ -795,6 +806,7 @@ def configure_logger(self, name, config, incremental=False):
"""Configure a non-root logger from a dictionary."""
logger = logging.getLogger(name)
self.common_logger_config(logger, config, incremental)
+ logger.disabled = False
propagate = config.get('propagate', None)
if propagate is not None:
logger.propagate = propagate
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 78e919d195d974..f5a9760fd496b6 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -348,11 +348,15 @@ def shouldRollover(self, record):
record is not used, as we are just comparing times, but it is needed so
the method signatures are the same
"""
- # See bpo-45401: Never rollover anything other than regular files
- if os.path.exists(self.baseFilename) and not os.path.isfile(self.baseFilename):
- return False
t = int(time.time())
if t >= self.rolloverAt:
+ # See #89564: Never rollover anything other than regular files
+ if os.path.exists(self.baseFilename) and not os.path.isfile(self.baseFilename):
+ # The file is not a regular file, so do not rollover, but do
+ # set the next rollover time to avoid repeated checks.
+ self.rolloverAt = self.computeRollover(t)
+ return False
+
return True
return False
@@ -887,6 +891,13 @@ def _connect_unixsocket(self, address):
raise
def createSocket(self):
+ """
+ Try to create a socket and, if it's not a datagram socket, connect it
+ to the other end. This method is called during handler initialization,
+ but it's not regarded as an error if the other end isn't listening yet
+ --- the method will be called again when emitting an event,
+ if there is no socket at that point.
+ """
address = self.address
socktype = self.socktype
@@ -894,7 +905,7 @@ def createSocket(self):
self.unixsocket = True
# Syslog server may be unavailable during handler initialisation.
# C's openlog() function also ignores connection errors.
- # Moreover, we ignore these errors while logging, so it not worse
+ # Moreover, we ignore these errors while logging, so it's not worse
# to ignore it also here.
try:
self._connect_unixsocket(address)
@@ -1107,7 +1118,16 @@ def __init__(self, appname, dllname=None, logtype="Application"):
dllname = os.path.join(dllname[0], r'win32service.pyd')
self.dllname = dllname
self.logtype = logtype
- self._welu.AddSourceToRegistry(appname, dllname, logtype)
+ # Administrative privileges are required to add a source to the registry.
+ # This may not be available for a user that just wants to add to an
+ # existing source - handle this specific case.
+ try:
+ self._welu.AddSourceToRegistry(appname, dllname, logtype)
+ except Exception as e:
+ # This will probably be a pywintypes.error. Only raise if it's not
+ # an "access denied" error, else let it pass
+ if getattr(e, 'winerror', None) != 5: # not access denied
+ raise
self.deftype = win32evtlog.EVENTLOG_ERROR_TYPE
self.typemap = {
logging.DEBUG : win32evtlog.EVENTLOG_INFORMATION_TYPE,
@@ -1455,7 +1475,7 @@ def prepare(self, record):
# (if there's exception data), and also returns the formatted
# message. We can then use this to replace the original
# msg + args, as these might be unpickleable. We also zap the
- # exc_info and exc_text attributes, as they are no longer
+ # exc_info, exc_text and stack_info attributes, as they are no longer
# needed and, if not None, will typically not be pickleable.
msg = self.format(record)
# bpo-35726: make copy of record to avoid affecting other handlers in the chain.
@@ -1465,6 +1485,7 @@ def prepare(self, record):
record.args = None
record.exc_info = None
record.exc_text = None
+ record.stack_info = None
return record
def emit(self, record):
diff --git a/Lib/mailcap.py b/Lib/mailcap.py
index 856b6a55475f38..7278ea7051fccf 100644
--- a/Lib/mailcap.py
+++ b/Lib/mailcap.py
@@ -2,6 +2,7 @@
import os
import warnings
+import re
__all__ = ["getcaps","findmatch"]
@@ -19,6 +20,11 @@ def lineno_sort_key(entry):
else:
return 1, 0
+_find_unsafe = re.compile(r'[^\xa1-\U0010FFFF\w@+=:,./-]').search
+
+class UnsafeMailcapInput(Warning):
+ """Warning raised when refusing unsafe input"""
+
# Part 1: top-level interface.
@@ -171,15 +177,22 @@ def findmatch(caps, MIMEtype, key='view', filename="/dev/null", plist=[]):
entry to use.
"""
+ if _find_unsafe(filename):
+ msg = "Refusing to use mailcap with filename %r. Use a safe temporary filename." % (filename,)
+ warnings.warn(msg, UnsafeMailcapInput)
+ return None, None
entries = lookup(caps, MIMEtype, key)
# XXX This code should somehow check for the needsterminal flag.
for e in entries:
if 'test' in e:
test = subst(e['test'], filename, plist)
+ if test is None:
+ continue
if test and os.system(test) != 0:
continue
command = subst(e[key], MIMEtype, filename, plist)
- return command, e
+ if command is not None:
+ return command, e
return None, None
def lookup(caps, MIMEtype, key=None):
@@ -212,6 +225,10 @@ def subst(field, MIMEtype, filename, plist=[]):
elif c == 's':
res = res + filename
elif c == 't':
+ if _find_unsafe(MIMEtype):
+ msg = "Refusing to substitute MIME type %r into a shell command." % (MIMEtype,)
+ warnings.warn(msg, UnsafeMailcapInput)
+ return None
res = res + MIMEtype
elif c == '{':
start = i
@@ -219,7 +236,12 @@ def subst(field, MIMEtype, filename, plist=[]):
i = i+1
name = field[start:i]
i = i+1
- res = res + findparam(name, plist)
+ param = findparam(name, plist)
+ if _find_unsafe(param):
+ msg = "Refusing to substitute parameter %r (%s) into a shell command" % (param, name)
+ warnings.warn(msg, UnsafeMailcapInput)
+ return None
+ res = res + param
# XXX To do:
# %n == number of parts if type is multipart/*
# %F == list of alternating type and filename for parts
diff --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py
index 65303d29f51f8f..b08144f7a1a169 100644
--- a/Lib/multiprocessing/connection.py
+++ b/Lib/multiprocessing/connection.py
@@ -73,11 +73,6 @@ def arbitrary_address(family):
if family == 'AF_INET':
return ('localhost', 0)
elif family == 'AF_UNIX':
- # Prefer abstract sockets if possible to avoid problems with the address
- # size. When coding portable applications, some implementations have
- # sun_path as short as 92 bytes in the sockaddr_un struct.
- if util.abstract_sockets_supported:
- return f"\0listener-{os.getpid()}-{next(_mmap_counter)}"
return tempfile.mktemp(prefix='listener-', dir=util.get_temp_dir())
elif family == 'AF_PIPE':
return tempfile.mktemp(prefix=r'\\.\pipe\pyc-%d-%d-' %
diff --git a/Lib/multiprocessing/context.py b/Lib/multiprocessing/context.py
index 8d0525d5d62179..b1960ea296fe20 100644
--- a/Lib/multiprocessing/context.py
+++ b/Lib/multiprocessing/context.py
@@ -223,6 +223,10 @@ class Process(process.BaseProcess):
def _Popen(process_obj):
return _default_context.get_context().Process._Popen(process_obj)
+ @staticmethod
+ def _after_fork():
+ return _default_context.get_context().Process._after_fork()
+
class DefaultContext(BaseContext):
Process = Process
@@ -283,6 +287,11 @@ def _Popen(process_obj):
from .popen_spawn_posix import Popen
return Popen(process_obj)
+ @staticmethod
+ def _after_fork():
+ # process is spawned, nothing to do
+ pass
+
class ForkServerProcess(process.BaseProcess):
_start_method = 'forkserver'
@staticmethod
@@ -326,6 +335,11 @@ def _Popen(process_obj):
from .popen_spawn_win32 import Popen
return Popen(process_obj)
+ @staticmethod
+ def _after_fork():
+ # process is spawned, nothing to do
+ pass
+
class SpawnContext(BaseContext):
_name = 'spawn'
Process = SpawnProcess
diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py
index bbe05a550c349c..961d7e5991847a 100644
--- a/Lib/multiprocessing/pool.py
+++ b/Lib/multiprocessing/pool.py
@@ -203,6 +203,9 @@ def __init__(self, processes=None, initializer=None, initargs=(),
processes = os.cpu_count() or 1
if processes < 1:
raise ValueError("Number of processes must be at least 1")
+ if maxtasksperchild is not None:
+ if not isinstance(maxtasksperchild, int) or maxtasksperchild <= 0:
+ raise ValueError("maxtasksperchild must be a positive int or None")
if initializer is not None and not callable(initializer):
raise TypeError('initializer must be a callable')
diff --git a/Lib/multiprocessing/popen_spawn_win32.py b/Lib/multiprocessing/popen_spawn_win32.py
index 9c4098d0fa4f1e..4d60ffc030bea6 100644
--- a/Lib/multiprocessing/popen_spawn_win32.py
+++ b/Lib/multiprocessing/popen_spawn_win32.py
@@ -54,19 +54,20 @@ def __init__(self, process_obj):
wfd = msvcrt.open_osfhandle(whandle, 0)
cmd = spawn.get_command_line(parent_pid=os.getpid(),
pipe_handle=rhandle)
- cmd = ' '.join('"%s"' % x for x in cmd)
python_exe = spawn.get_executable()
# bpo-35797: When running in a venv, we bypass the redirect
# executor and launch our base Python.
if WINENV and _path_eq(python_exe, sys.executable):
- python_exe = sys._base_executable
+ cmd[0] = python_exe = sys._base_executable
env = os.environ.copy()
env["__PYVENV_LAUNCHER__"] = sys.executable
else:
env = None
+ cmd = ' '.join('"%s"' % x for x in cmd)
+
with open(wfd, 'wb', closefd=True) as to_child:
# start process
try:
diff --git a/Lib/multiprocessing/process.py b/Lib/multiprocessing/process.py
index 3917d2e4fa63ec..271ba3fd325138 100644
--- a/Lib/multiprocessing/process.py
+++ b/Lib/multiprocessing/process.py
@@ -61,7 +61,7 @@ def parent_process():
def _cleanup():
# check for processes which have finished
for p in list(_children):
- if p._popen.poll() is not None:
+ if (child_popen := p._popen) and child_popen.poll() is not None:
_children.discard(p)
#
@@ -304,8 +304,7 @@ def _bootstrap(self, parent_sentinel=None):
if threading._HAVE_THREAD_NATIVE_ID:
threading.main_thread()._set_native_id()
try:
- util._finalizer_registry.clear()
- util._run_after_forkers()
+ self._after_fork()
finally:
# delay finalization of the old process object until after
# _run_after_forkers() is executed
@@ -336,6 +335,13 @@ def _bootstrap(self, parent_sentinel=None):
return exitcode
+ @staticmethod
+ def _after_fork():
+ from . import util
+ util._finalizer_registry.clear()
+ util._run_after_forkers()
+
+
#
# We subclass bytes to avoid accidental transmission of auth keys over network
#
diff --git a/Lib/multiprocessing/resource_tracker.py b/Lib/multiprocessing/resource_tracker.py
index cc42dbdda05b91..ea369507297f86 100644
--- a/Lib/multiprocessing/resource_tracker.py
+++ b/Lib/multiprocessing/resource_tracker.py
@@ -161,10 +161,10 @@ def unregister(self, name, rtype):
def _send(self, cmd, name, rtype):
self.ensure_running()
msg = '{0}:{1}:{2}\n'.format(cmd, name, rtype).encode('ascii')
- if len(name) > 512:
+ if len(msg) > 512:
# posix guarantees that writes to a pipe of less than PIPE_BUF
# bytes are atomic, and that PIPE_BUF >= 512
- raise ValueError('name too long')
+ raise ValueError('msg too long')
nbytes = os.write(self._fd, msg)
assert nbytes == len(msg), "nbytes {0:n} but len(msg) {1:n}".format(
nbytes, len(msg))
diff --git a/Lib/multiprocessing/shared_memory.py b/Lib/multiprocessing/shared_memory.py
index 122b3fcebf3fed..9a1e5aa17b87a2 100644
--- a/Lib/multiprocessing/shared_memory.py
+++ b/Lib/multiprocessing/shared_memory.py
@@ -23,6 +23,7 @@
import _posixshmem
_USE_POSIX = True
+from . import resource_tracker
_O_CREX = os.O_CREAT | os.O_EXCL
@@ -116,8 +117,7 @@ def __init__(self, name=None, create=False, size=0):
self.unlink()
raise
- from .resource_tracker import register
- register(self._name, "shared_memory")
+ resource_tracker.register(self._name, "shared_memory")
else:
@@ -173,7 +173,10 @@ def __init__(self, name=None, create=False, size=0):
)
finally:
_winapi.CloseHandle(h_map)
- size = _winapi.VirtualQuerySize(p_buf)
+ try:
+ size = _winapi.VirtualQuerySize(p_buf)
+ finally:
+ _winapi.UnmapViewOfFile(p_buf)
self._mmap = mmap.mmap(-1, size, tagname=name)
self._size = size
@@ -237,9 +240,8 @@ def unlink(self):
called once (and only once) across all processes which have access
to the shared memory block."""
if _USE_POSIX and self._name:
- from .resource_tracker import unregister
_posixshmem.shm_unlink(self._name)
- unregister(self._name, "shared_memory")
+ resource_tracker.unregister(self._name, "shared_memory")
_encoding = "utf8"
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index 041ebc75cb127c..0444b0f65d10ba 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -23,6 +23,7 @@
import genericpath
from genericpath import *
+
__all__ = ["normcase","isabs","join","splitdrive","split","splitext",
"basename","dirname","commonprefix","getsize","getmtime",
"getatime","getctime", "islink","exists","lexists","isdir","isfile",
@@ -41,14 +42,39 @@ def _get_bothseps(path):
# Other normalizations (such as optimizing '../' away) are not done
# (this is done by normpath).
-def normcase(s):
- """Normalize case of pathname.
-
- Makes all characters lowercase and all slashes into backslashes."""
- s = os.fspath(s)
- if isinstance(s, bytes):
- return s.replace(b'/', b'\\').lower()
- else:
+try:
+ from _winapi import (
+ LCMapStringEx as _LCMapStringEx,
+ LOCALE_NAME_INVARIANT as _LOCALE_NAME_INVARIANT,
+ LCMAP_LOWERCASE as _LCMAP_LOWERCASE)
+
+ def normcase(s):
+ """Normalize case of pathname.
+
+ Makes all characters lowercase and all slashes into backslashes.
+ """
+ s = os.fspath(s)
+ if not s:
+ return s
+ if isinstance(s, bytes):
+ encoding = sys.getfilesystemencoding()
+ s = s.decode(encoding, 'surrogateescape').replace('/', '\\')
+ s = _LCMapStringEx(_LOCALE_NAME_INVARIANT,
+ _LCMAP_LOWERCASE, s)
+ return s.encode(encoding, 'surrogateescape')
+ else:
+ return _LCMapStringEx(_LOCALE_NAME_INVARIANT,
+ _LCMAP_LOWERCASE,
+ s.replace('/', '\\'))
+except ImportError:
+ def normcase(s):
+ """Normalize case of pathname.
+
+ Makes all characters lowercase and all slashes into backslashes.
+ """
+ s = os.fspath(s)
+ if isinstance(s, bytes):
+ return os.fsencode(os.fsdecode(s).replace('/', '\\').lower())
return s.replace('/', '\\').lower()
@@ -61,16 +87,20 @@ def normcase(s):
def isabs(s):
"""Test whether a path is absolute"""
s = os.fspath(s)
- # Paths beginning with \\?\ are always absolute, but do not
- # necessarily contain a drive.
if isinstance(s, bytes):
- if s.replace(b'/', b'\\').startswith(b'\\\\?\\'):
- return True
+ sep = b'\\'
+ altsep = b'/'
+ colon_sep = b':\\'
else:
- if s.replace('/', '\\').startswith('\\\\?\\'):
- return True
- s = splitdrive(s)[1]
- return len(s) > 0 and s[0] and s[0] in _get_bothseps(s)
+ sep = '\\'
+ altsep = '/'
+ colon_sep = ':\\'
+ s = s[:3].replace(altsep, sep)
+ # Absolute: UNC, device, and paths with a drive and root.
+ # LEGACY BUG: isabs("/x") should be false since the path has no drive.
+ if s.startswith(sep) or s.startswith(colon_sep, 1):
+ return True
+ return False
# Join two (or more) paths.
@@ -146,28 +176,26 @@ def splitdrive(p):
sep = b'\\'
altsep = b'/'
colon = b':'
+ unc_prefix = b'\\\\?\\UNC\\'
else:
sep = '\\'
altsep = '/'
colon = ':'
+ unc_prefix = '\\\\?\\UNC\\'
normp = p.replace(altsep, sep)
- if (normp[0:2] == sep*2) and (normp[2:3] != sep):
- # is a UNC path:
- # vvvvvvvvvvvvvvvvvvvv drive letter or UNC path
- # \\machine\mountpoint\directory\etc\...
- # directory ^^^^^^^^^^^^^^^
- index = normp.find(sep, 2)
+ if normp[0:2] == sep * 2:
+ # UNC drives, e.g. \\server\share or \\?\UNC\server\share
+ # Device drives, e.g. \\.\device or \\?\device
+ start = 8 if normp[:8].upper() == unc_prefix else 2
+ index = normp.find(sep, start)
if index == -1:
- return p[:0], p
+ return p, p[:0]
index2 = normp.find(sep, index + 1)
- # a UNC path can't have two slashes in a row
- # (after the initial two)
- if index2 == index + 1:
- return p[:0], p
if index2 == -1:
- index2 = len(p)
+ return p, p[:0]
return p[:index2], p[index2:]
if normp[1:2] == colon:
+ # Drive-letter drives, e.g. X:
return p[:2], p[2:]
return p[:0], p
@@ -473,20 +501,11 @@ def normpath(path):
altsep = b'/'
curdir = b'.'
pardir = b'..'
- special_prefixes = (b'\\\\.\\', b'\\\\?\\')
else:
sep = '\\'
altsep = '/'
curdir = '.'
pardir = '..'
- special_prefixes = ('\\\\.\\', '\\\\?\\')
- if path.startswith(special_prefixes):
- # in the case of paths with these prefixes:
- # \\.\ -> device names
- # \\?\ -> literal paths
- # do not do any normalization, but return the path
- # unchanged apart from the call to os.fspath()
- return path
path = path.replace(altsep, sep)
prefix, path = splitdrive(path)
@@ -613,16 +632,19 @@ def _getfinalpathname_nonstrict(path):
# 21: ERROR_NOT_READY (implies drive with no media)
# 32: ERROR_SHARING_VIOLATION (probably an NTFS paging file)
# 50: ERROR_NOT_SUPPORTED
+ # 53: ERROR_BAD_NETPATH
+ # 65: ERROR_NETWORK_ACCESS_DENIED
# 67: ERROR_BAD_NET_NAME (implies remote server unavailable)
# 87: ERROR_INVALID_PARAMETER
# 123: ERROR_INVALID_NAME
+ # 161: ERROR_BAD_PATHNAME
# 1920: ERROR_CANT_ACCESS_FILE
# 1921: ERROR_CANT_RESOLVE_FILENAME (implies unfollowable symlink)
- allowed_winerror = 1, 2, 3, 5, 21, 32, 50, 67, 87, 123, 1920, 1921
+ allowed_winerror = 1, 2, 3, 5, 21, 32, 50, 53, 65, 67, 87, 123, 161, 1920, 1921
# Non-strict algorithm is to find as much of the target directory
# as we can and join the rest.
- tail = ''
+ tail = path[:0]
while path:
try:
path = _getfinalpathname(path)
diff --git a/Lib/numbers.py b/Lib/numbers.py
index 5b98e642083b36..0985dd85f60a78 100644
--- a/Lib/numbers.py
+++ b/Lib/numbers.py
@@ -288,7 +288,7 @@ def __float__(self):
so that ratios of huge integers convert without overflowing.
"""
- return self.numerator / self.denominator
+ return int(self.numerator) / int(self.denominator)
class Integral(Rational):
diff --git a/Lib/opcode.py b/Lib/opcode.py
index 310582874dc8f0..bc3c02af2bccb3 100644
--- a/Lib/opcode.py
+++ b/Lib/opcode.py
@@ -175,7 +175,7 @@ def jabs_op(name, op):
hasfree.append(148)
def_op('COPY_FREE_VARS', 149)
-def_op('RESUME', 151)
+def_op('RESUME', 151) # This must be kept in sync with deepfreeze.py
def_op('MATCH_CLASS', 152)
def_op('FORMAT_VALUE', 155)
diff --git a/Lib/os.py b/Lib/os.py
index 67662ca7ad8588..fd1e774fdcbcfa 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -288,7 +288,8 @@ def walk(top, topdown=True, onerror=None, followlinks=False):
dirpath, dirnames, filenames
dirpath is a string, the path to the directory. dirnames is a list of
- the names of the subdirectories in dirpath (excluding '.' and '..').
+ the names of the subdirectories in dirpath (including symlinks to directories,
+ and excluding '.' and '..').
filenames is a list of the names of the non-directory files in dirpath.
Note that the names in the lists are just names, with no path components.
To get a full path (which begins with top) to a file or directory in
@@ -974,15 +975,14 @@ def spawnlpe(mode, file, *args):
# command in a shell can't be supported.
if sys.platform != 'vxworks':
# Supply os.popen()
- def popen(cmd, mode="r", buffering=-1, encoding=None):
+ def popen(cmd, mode="r", buffering=-1):
if not isinstance(cmd, str):
raise TypeError("invalid cmd type (%s, expected string)" % type(cmd))
if mode not in ("r", "w"):
raise ValueError("invalid mode %r" % mode)
if buffering == 0 or buffering is None:
raise ValueError("popen() does not support unbuffered streams")
- import subprocess, io
- encoding = io.text_encoding(encoding)
+ import subprocess
if mode == "r":
proc = subprocess.Popen(cmd,
shell=True, text=True,
diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index 1f098fe6bd5f37..ecb1e8a40d8cf0 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -388,11 +388,11 @@ def _iterate_directories(self, parent_path, is_dir, scandir):
for entry in entries:
entry_is_dir = False
try:
- entry_is_dir = entry.is_dir()
+ entry_is_dir = entry.is_dir(follow_symlinks=False)
except OSError as e:
if not _ignore_error(e):
raise
- if entry_is_dir and not entry.is_symlink():
+ if entry_is_dir:
path = parent_path._make_child_relpath(entry.name)
for p in self._iterate_directories(path, is_dir, scandir):
yield p
@@ -443,6 +443,8 @@ def __getitem__(self, idx):
if idx >= len(self) or idx < -len(self):
raise IndexError(idx)
+ if idx < 0:
+ idx += len(self)
return self._pathcls._from_parsed_parts(self._drv, self._root,
self._parts[:-idx - 1])
@@ -960,7 +962,7 @@ def rglob(self, pattern):
drv, root, pattern_parts = self._flavour.parse_parts((pattern,))
if drv or root:
raise NotImplementedError("Non-relative patterns are unsupported")
- if pattern[-1] in (self._flavour.sep, self._flavour.altsep):
+ if pattern and pattern[-1] in (self._flavour.sep, self._flavour.altsep):
pattern_parts.append('')
selector = _make_selector(("**",) + tuple(pattern_parts), self._flavour)
for p in selector.select_from(self):
diff --git a/Lib/pdb.py b/Lib/pdb.py
index 58bc720275a280..d3824e19fa82d1 100755
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -107,15 +107,6 @@ def find_function(funcname, filename):
return funcname, filename, lineno
return None
-def getsourcelines(obj):
- lines, lineno = inspect.findsource(obj)
- if inspect.isframe(obj) and obj.f_globals is obj.f_locals:
- # must be a module frame: do not try to cut a block out of it
- return lines, 1
- elif inspect.ismodule(obj):
- return lines, 1
- return inspect.getblock(lines[lineno:]), lineno+1
-
def lasti2lineno(code, lasti):
linestarts = list(dis.findlinestarts(code))
linestarts.reverse()
@@ -131,7 +122,7 @@ def __repr__(self):
return self
-class ScriptTarget(str):
+class _ScriptTarget(str):
def __new__(cls, val):
# Mutate self to be the "real path".
res = super().__new__(cls, os.path.realpath(val))
@@ -163,11 +154,11 @@ def namespace(self):
@property
def code(self):
- with io.open(self) as fp:
+ with io.open_code(self) as fp:
return f"exec(compile({fp.read()!r}, {self!r}, 'exec'))"
-class ModuleTarget(str):
+class _ModuleTarget(str):
def check(self):
try:
self._details
@@ -1332,6 +1323,12 @@ def do_list(self, arg):
if last is None:
last = first + 10
filename = self.curframe.f_code.co_filename
+ # gh-93696: stdlib frozen modules provide a useful __file__
+ # this workaround can be removed with the closure of gh-89815
+ if filename.startswith("",
someMoreData = b"" * 10,
- aDate = datetime.datetime.fromtimestamp(time.mktime(time.gmtime())),
+ aDate = datetime.datetime.now()
)
- with open(fileName, 'wb') as fp:
- dump(pl, fp)
+ print(plistlib.dumps(pl).decode())
Parse Plist example:
- with open(fileName, 'rb') as fp:
- pl = load(fp)
- print(pl["aKey"])
+ import plistlib
+
+ plist = b'''
+
+ foo
+ bar
+
+ '''
+ pl = plistlib.loads(plist)
+ print(pl["foo"])
"""
__all__ = [
"InvalidFileException", "FMT_XML", "FMT_BINARY", "load", "dump", "loads", "dumps", "UID"
@@ -152,7 +161,7 @@ def _date_to_string(d):
def _escape(text):
m = _controlCharPat.search(text)
if m is not None:
- raise ValueError("strings can't contains control characters; "
+ raise ValueError("strings can't contain control characters; "
"use bytes instead")
text = text.replace("\r\n", "\n") # convert DOS line endings
text = text.replace("\r", "\n") # convert Mac line endings
diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index a7b2f2d64824fa..5b4d78bca06132 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -195,6 +195,7 @@ def ismount(path):
if stat.S_ISLNK(s1.st_mode):
return False
+ path = os.fspath(path)
if isinstance(path, bytes):
parent = join(path, b'..')
else:
@@ -364,7 +365,7 @@ def normpath(path):
initial_slashes = path.startswith(sep)
# POSIX allows one or two initial slashes, but treats three or more
# as single slash.
- # (see http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_13)
+ # (see https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_13)
if (initial_slashes and
path.startswith(sep*2) and not path.startswith(sep*3)):
initial_slashes = 2
diff --git a/Lib/profile.py b/Lib/profile.py
index d8599fb4eebd66..90c4e4c9ff583e 100755
--- a/Lib/profile.py
+++ b/Lib/profile.py
@@ -24,6 +24,7 @@
# governing permissions and limitations under the License.
+import io
import sys
import time
import marshal
@@ -587,7 +588,7 @@ def main():
else:
progname = args[0]
sys.path.insert(0, os.path.dirname(progname))
- with open(progname, 'rb') as fp:
+ with io.open_code(progname) as fp:
code = compile(fp.read(), progname, 'exec')
globs = {
'__file__': progname,
diff --git a/Lib/pstats.py b/Lib/pstats.py
index 8e0743f2e5f29d..80408313e8b27f 100644
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -57,7 +57,7 @@ def __new__(cls, *values):
@dataclass(unsafe_hash=True)
class FunctionProfile:
- ncalls: int
+ ncalls: str
tottime: float
percall_tottime: float
cumtime: float
diff --git a/Lib/pty.py b/Lib/pty.py
index 8d8ce40df541c1..fefb63abfb04e4 100644
--- a/Lib/pty.py
+++ b/Lib/pty.py
@@ -121,12 +121,6 @@ def fork():
# Parent and child process.
return pid, master_fd
-def _writen(fd, data):
- """Write all the data to a descriptor."""
- while data:
- n = os.write(fd, data)
- data = data[n:]
-
def _read(fd):
"""Default read function."""
return os.read(fd, 1024)
@@ -136,9 +130,42 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
Copies
pty master -> standard output (master_read)
standard input -> pty master (stdin_read)"""
- fds = [master_fd, STDIN_FILENO]
- while fds:
- rfds, _wfds, _xfds = select(fds, [], [])
+ if os.get_blocking(master_fd):
+ # If we write more than tty/ndisc is willing to buffer, we may block
+ # indefinitely. So we set master_fd to non-blocking temporarily during
+ # the copy operation.
+ os.set_blocking(master_fd, False)
+ try:
+ _copy(master_fd, master_read=master_read, stdin_read=stdin_read)
+ finally:
+ # restore blocking mode for backwards compatibility
+ os.set_blocking(master_fd, True)
+ return
+ high_waterlevel = 4096
+ stdin_avail = master_fd != STDIN_FILENO
+ stdout_avail = master_fd != STDOUT_FILENO
+ i_buf = b''
+ o_buf = b''
+ while 1:
+ rfds = []
+ wfds = []
+ if stdin_avail and len(i_buf) < high_waterlevel:
+ rfds.append(STDIN_FILENO)
+ if stdout_avail and len(o_buf) < high_waterlevel:
+ rfds.append(master_fd)
+ if stdout_avail and len(o_buf) > 0:
+ wfds.append(STDOUT_FILENO)
+ if len(i_buf) > 0:
+ wfds.append(master_fd)
+
+ rfds, wfds, _xfds = select(rfds, wfds, [])
+
+ if STDOUT_FILENO in wfds:
+ try:
+ n = os.write(STDOUT_FILENO, o_buf)
+ o_buf = o_buf[n:]
+ except OSError:
+ stdout_avail = False
if master_fd in rfds:
# Some OSes signal EOF by returning an empty byte string,
@@ -150,15 +177,18 @@ def _copy(master_fd, master_read=_read, stdin_read=_read):
if not data: # Reached EOF.
return # Assume the child process has exited and is
# unreachable, so we clean up.
- else:
- os.write(STDOUT_FILENO, data)
+ o_buf += data
+
+ if master_fd in wfds:
+ n = os.write(master_fd, i_buf)
+ i_buf = i_buf[n:]
- if STDIN_FILENO in rfds:
+ if stdin_avail and STDIN_FILENO in rfds:
data = stdin_read(STDIN_FILENO)
if not data:
- fds.remove(STDIN_FILENO)
+ stdin_avail = False
else:
- _writen(master_fd, data)
+ i_buf += data
def spawn(argv, master_read=_read, stdin_read=_read):
"""Create a spawned process."""
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 297ff967a2ce9c..088a3ba8817ceb 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -70,7 +70,6 @@ class or function within a module or module in a package. If the
import sysconfig
import time
import tokenize
-import types
import urllib.parse
import warnings
from collections import deque
@@ -92,16 +91,13 @@ def pathdirs():
normdirs.append(normdir)
return dirs
-def _isclass(object):
- return inspect.isclass(object) and not isinstance(object, types.GenericAlias)
-
def _findclass(func):
cls = sys.modules.get(func.__module__)
if cls is None:
return None
for name in func.__qualname__.split('.')[:-1]:
cls = getattr(cls, name)
- if not _isclass(cls):
+ if not inspect.isclass(cls):
return None
return cls
@@ -109,7 +105,7 @@ def _finddoc(obj):
if inspect.ismethod(obj):
name = obj.__func__.__name__
self = obj.__self__
- if (_isclass(self) and
+ if (inspect.isclass(self) and
getattr(getattr(self, name, None), '__func__') is obj.__func__):
# classmethod
cls = self
@@ -123,7 +119,7 @@ def _finddoc(obj):
elif inspect.isbuiltin(obj):
name = obj.__name__
self = obj.__self__
- if (_isclass(self) and
+ if (inspect.isclass(self) and
self.__qualname__ + '.' + name == obj.__qualname__):
# classmethod
cls = self
@@ -210,7 +206,7 @@ def classname(object, modname):
def isdata(object):
"""Check if an object is of a type that probably means it's data."""
- return not (inspect.ismodule(object) or _isclass(object) or
+ return not (inspect.ismodule(object) or inspect.isclass(object) or
inspect.isroutine(object) or inspect.isframe(object) or
inspect.istraceback(object) or inspect.iscode(object))
@@ -481,7 +477,7 @@ def document(self, object, name=None, *args):
# by lacking a __name__ attribute) and an instance.
try:
if inspect.ismodule(object): return self.docmodule(*args)
- if _isclass(object): return self.docclass(*args)
+ if inspect.isclass(object): return self.docclass(*args)
if inspect.isroutine(object): return self.docroutine(*args)
except AttributeError:
pass
@@ -783,7 +779,7 @@ def docmodule(self, object, name=None, mod=None, *ignored):
modules = inspect.getmembers(object, inspect.ismodule)
classes, cdict = [], {}
- for key, value in inspect.getmembers(object, _isclass):
+ for key, value in inspect.getmembers(object, inspect.isclass):
# if __all__ exists, believe it. Otherwise use old heuristic.
if (all is not None or
(inspect.getmodule(value) or object) is object):
@@ -1223,7 +1219,7 @@ def docmodule(self, object, name=None, mod=None):
result = result + self.section('DESCRIPTION', desc)
classes = []
- for key, value in inspect.getmembers(object, _isclass):
+ for key, value in inspect.getmembers(object, inspect.isclass):
# if __all__ exists, believe it. Otherwise use old heuristic.
if (all is not None
or (inspect.getmodule(value) or object) is object):
@@ -1707,7 +1703,7 @@ def describe(thing):
return 'member descriptor %s.%s.%s' % (
thing.__objclass__.__module__, thing.__objclass__.__name__,
thing.__name__)
- if _isclass(thing):
+ if inspect.isclass(thing):
return 'class ' + thing.__name__
if inspect.isfunction(thing):
return 'function ' + thing.__name__
@@ -1768,7 +1764,7 @@ def render_doc(thing, title='Python Library Documentation: %s', forceload=0,
desc += ' in module ' + module.__name__
if not (inspect.ismodule(object) or
- _isclass(object) or
+ inspect.isclass(object) or
inspect.isroutine(object) or
inspect.isdatadescriptor(object) or
_getdoc(object)):
@@ -2002,7 +1998,10 @@ def __repr__(self):
_GoInteractive = object()
def __call__(self, request=_GoInteractive):
if request is not self._GoInteractive:
- self.help(request)
+ try:
+ self.help(request)
+ except ImportError as e:
+ self.output.write(f'{e}\n')
else:
self.intro()
self.interact()
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index f3ceaadfad6459..3d9e748fe13291 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Fri May 6 23:53:34 2022
+# Autogenerated by Sphinx on Tue Apr 4 23:22:02 2023
topics = {'assert': 'The "assert" statement\n'
'**********************\n'
'\n'
@@ -358,7 +358,7 @@
'yield_expression)]\n'
'\n'
'The difference from normal Assignment statements is that only '
- 'single\n'
+ 'a single\n'
'target is allowed.\n'
'\n'
'For simple names as assignment targets, if in class or module '
@@ -408,12 +408,13 @@
'analysis\n'
' tools and IDEs.\n'
'\n'
- 'Changed in version 3.8: Now annotated assignments allow same\n'
- 'expressions in the right hand side as the regular '
- 'assignments.\n'
- 'Previously, some expressions (like un-parenthesized tuple '
- 'expressions)\n'
- 'caused a syntax error.\n',
+ 'Changed in version 3.8: Now annotated assignments allow the '
+ 'same\n'
+ 'expressions in the right hand side as regular assignments. '
+ 'Previously,\n'
+ 'some expressions (like un-parenthesized tuple expressions) '
+ 'caused a\n'
+ 'syntax error.\n',
'async': 'Coroutines\n'
'**********\n'
'\n'
@@ -1133,10 +1134,11 @@
'future, a\n'
' check may be added to prevent this.\n'
'\n'
- '* Nonempty *__slots__* does not work for classes derived '
- 'from\n'
- ' “variable-length” built-in types such as "int", '
- '"bytes" and "tuple".\n'
+ '* "TypeError" will be raised if nonempty *__slots__* are '
+ 'defined for a\n'
+ ' class derived from a ""variable-length" built-in type" '
+ 'such as\n'
+ ' "int", "bytes", and "tuple".\n'
'\n'
'* Any non-string *iterable* may be assigned to '
'*__slots__*.\n'
@@ -1671,10 +1673,26 @@
'If the syntax "**expression" appears in the function call,\n'
'"expression" must evaluate to a *mapping*, the contents of which '
'are\n'
- 'treated as additional keyword arguments. If a keyword is already\n'
- 'present (as an explicit keyword argument, or from another '
- 'unpacking),\n'
- 'a "TypeError" exception is raised.\n'
+ 'treated as additional keyword arguments. If a parameter matching a '
+ 'key\n'
+ 'has already been given a value (by an explicit keyword argument, '
+ 'or\n'
+ 'from another unpacking), a "TypeError" exception is raised.\n'
+ '\n'
+ 'When "**expression" is used, each key in this mapping must be a\n'
+ 'string. Each value from the mapping is assigned to the first '
+ 'formal\n'
+ 'parameter eligible for keyword assignment whose name is equal to '
+ 'the\n'
+ 'key. A key need not be a Python identifier (e.g. ""max-temp °F"" '
+ 'is\n'
+ 'acceptable, although it will not match any formal parameter that '
+ 'could\n'
+ 'be declared). If there is no match to a formal parameter the '
+ 'key-value\n'
+ 'pair is collected by the "**" parameter, if there is one, or if '
+ 'there\n'
+ 'is not, a "TypeError" exception is raised.\n'
'\n'
'Formal parameters using the syntax "*identifier" or "**identifier"\n'
'cannot be used as positional argument slots or as keyword argument\n'
@@ -2022,7 +2040,7 @@
'\n'
'* Mappings (instances of "dict") compare equal if and only if '
'they\n'
- ' have equal *(key, value)* pairs. Equality comparison of the '
+ ' have equal "(key, value)" pairs. Equality comparison of the '
'keys and\n'
' values enforces reflexivity.\n'
'\n'
@@ -2365,12 +2383,10 @@
'finished,\n'
'but if the sequence is empty, they will not have been assigned '
'to at\n'
- 'all by the loop. Hint: the built-in function "range()" returns '
- 'an\n'
- 'iterator of integers suitable to emulate the effect of Pascal’s '
- '"for i\n'
- ':= a to b do"; e.g., "list(range(3))" returns the list "[0, 1, '
- '2]".\n'
+ 'all by the loop. Hint: the built-in type "range()" represents\n'
+ 'immutable arithmetic sequences of integers. For instance, '
+ 'iterating\n'
+ '"range(3)" successively yields 0, 1, and then 2.\n'
'\n'
'Changed in version 3.11: Starred elements are now allowed in '
'the\n'
@@ -2398,35 +2414,43 @@
' try3_stmt ::= "try" ":" suite\n'
' "finally" ":" suite\n'
'\n'
+ 'Additional information on exceptions can be found in section\n'
+ 'Exceptions, and information on using the "raise" statement to '
+ 'generate\n'
+ 'exceptions may be found in section The raise statement.\n'
+ '\n'
+ '\n'
+ '"except" clause\n'
+ '---------------\n'
+ '\n'
'The "except" clause(s) specify one or more exception handlers. '
'When no\n'
'exception occurs in the "try" clause, no exception handler is\n'
'executed. When an exception occurs in the "try" suite, a search '
'for an\n'
- 'exception handler is started. This search inspects the except '
- 'clauses\n'
- 'in turn until one is found that matches the exception. An '
- 'expression-\n'
- 'less except clause, if present, must be last; it matches any\n'
- 'exception. For an except clause with an expression, that '
- 'expression\n'
- 'is evaluated, and the clause matches the exception if the '
- 'resulting\n'
- 'object is “compatible” with the exception. An object is '
- 'compatible\n'
- 'with an exception if the object is the class or a *non-virtual '
- 'base\n'
- 'class* of the exception object, or a tuple containing an item '
- 'that is\n'
- 'the class or a non-virtual base class of the exception object.\n'
- '\n'
- 'If no except clause matches the exception, the search for an '
+ 'exception handler is started. This search inspects the "except"\n'
+ 'clauses in turn until one is found that matches the exception. '
+ 'An\n'
+ 'expression-less "except" clause, if present, must be last; it '
+ 'matches\n'
+ 'any exception. For an "except" clause with an expression, that\n'
+ 'expression is evaluated, and the clause matches the exception if '
+ 'the\n'
+ 'resulting object is “compatible” with the exception. An object '
+ 'is\n'
+ 'compatible with an exception if the object is the class or a '
+ '*non-\n'
+ 'virtual base class* of the exception object, or a tuple '
+ 'containing an\n'
+ 'item that is the class or a non-virtual base class of the '
'exception\n'
- 'handler continues in the surrounding code and on the invocation '
- 'stack.\n'
- '[1]\n'
+ 'object.\n'
'\n'
- 'If the evaluation of an expression in the header of an except '
+ 'If no "except" clause matches the exception, the search for an\n'
+ 'exception handler continues in the surrounding code and on the\n'
+ 'invocation stack. [1]\n'
+ '\n'
+ 'If the evaluation of an expression in the header of an "except" '
'clause\n'
'raises an exception, the original search for a handler is '
'canceled and\n'
@@ -2436,24 +2460,24 @@
'raised\n'
'the exception).\n'
'\n'
- 'When a matching except clause is found, the exception is '
+ 'When a matching "except" clause is found, the exception is '
'assigned to\n'
- 'the target specified after the "as" keyword in that except '
- 'clause, if\n'
- 'present, and the except clause’s suite is executed. All except\n'
- 'clauses must have an executable block. When the end of this '
+ 'the target specified after the "as" keyword in that "except" '
+ 'clause,\n'
+ 'if present, and the "except" clause’s suite is executed. All '
+ '"except"\n'
+ 'clauses must have an executable block. When the end of this '
'block is\n'
- 'reached, execution continues normally after the entire try '
- 'statement.\n'
- '(This means that if two nested handlers exist for the same '
- 'exception,\n'
- 'and the exception occurs in the try clause of the inner handler, '
- 'the\n'
- 'outer handler will not handle the exception.)\n'
+ 'reached, execution continues normally after the entire "try"\n'
+ 'statement. (This means that if two nested handlers exist for the '
+ 'same\n'
+ 'exception, and the exception occurs in the "try" clause of the '
+ 'inner\n'
+ 'handler, the outer handler will not handle the exception.)\n'
'\n'
'When an exception has been assigned using "as target", it is '
'cleared\n'
- 'at the end of the except clause. This is as if\n'
+ 'at the end of the "except" clause. This is as if\n'
'\n'
' except E as N:\n'
' foo\n'
@@ -2468,7 +2492,7 @@
'\n'
'This means the exception must be assigned to a different name to '
'be\n'
- 'able to refer to it after the except clause. Exceptions are '
+ 'able to refer to it after the "except" clause. Exceptions are '
'cleared\n'
'because with the traceback attached to them, they form a '
'reference\n'
@@ -2476,41 +2500,37 @@
'alive\n'
'until the next garbage collection occurs.\n'
'\n'
- 'Before an except clause’s suite is executed, details about the\n'
- 'exception are stored in the "sys" module and can be accessed '
- 'via\n'
- '"sys.exc_info()". "sys.exc_info()" returns a 3-tuple consisting '
- 'of the\n'
- 'exception class, the exception instance and a traceback object '
- '(see\n'
- 'section The standard type hierarchy) identifying the point in '
- 'the\n'
- 'program where the exception occurred. The details about the '
- 'exception\n'
- 'accessed via "sys.exc_info()" are restored to their previous '
- 'values\n'
- 'when leaving an exception handler:\n'
+ 'Before an "except" clause’s suite is executed, the exception is '
+ 'stored\n'
+ 'in the "sys" module, where it can be accessed from within the '
+ 'body of\n'
+ 'the "except" clause by calling "sys.exception()". When leaving '
+ 'an\n'
+ 'exception handler, the exception stored in the "sys" module is '
+ 'reset\n'
+ 'to its previous value:\n'
'\n'
- ' >>> print(sys.exc_info())\n'
- ' (None, None, None)\n'
+ ' >>> print(sys.exception())\n'
+ ' None\n'
' >>> try:\n'
' ... raise TypeError\n'
' ... except:\n'
- ' ... print(sys.exc_info())\n'
+ ' ... print(repr(sys.exception()))\n'
' ... try:\n'
' ... raise ValueError\n'
' ... except:\n'
- ' ... print(sys.exc_info())\n'
- ' ... print(sys.exc_info())\n'
+ ' ... print(repr(sys.exception()))\n'
+ ' ... print(repr(sys.exception()))\n'
' ...\n'
- " (, TypeError(), )\n'
- " (, ValueError(), )\n'
- " (, TypeError(), )\n'
- ' >>> print(sys.exc_info())\n'
- ' (None, None, None)\n'
+ ' TypeError()\n'
+ ' ValueError()\n'
+ ' TypeError()\n'
+ ' >>> print(sys.exception())\n'
+ ' None\n'
+ '\n'
+ '\n'
+ '"except*" clause\n'
+ '----------------\n'
'\n'
'The "except*" clause(s) are used for handling "ExceptionGroup"s. '
'The\n'
@@ -2520,13 +2540,15 @@
'when\n'
'the type matches some of the exceptions in the group. This means '
'that\n'
- 'multiple except* clauses can execute, each handling part of the\n'
- 'exception group. Each clause executes once and handles an '
- 'exception\n'
- 'group of all matching exceptions. Each exception in the group '
- 'is\n'
- 'handled by at most one except* clause, the first that matches '
- 'it.\n'
+ 'multiple "except*" clauses can execute, each handling part of '
+ 'the\n'
+ 'exception group. Each clause executes at most once and handles '
+ 'an\n'
+ 'exception group of all matching exceptions. Each exception in '
+ 'the\n'
+ 'group is handled by at most one "except*" clause, the first '
+ 'that\n'
+ 'matches it.\n'
'\n'
' >>> try:\n'
' ... raise ExceptionGroup("eg",\n'
@@ -2548,22 +2570,37 @@
' +-+---------------- 1 ----------------\n'
' | ValueError: 1\n'
' +------------------------------------\n'
- ' >>>\n'
'\n'
- ' Any remaining exceptions that were not handled by any except* '
+ 'Any remaining exceptions that were not handled by any "except*" '
'clause\n'
- ' are re-raised at the end, combined into an exception group '
- 'along with\n'
- ' all exceptions that were raised from within except* clauses.\n'
- '\n'
- ' An except* clause must have a matching type, and this type '
- 'cannot be a\n'
- ' subclass of :exc:`BaseExceptionGroup`. It is not possible to '
- 'mix except\n'
- ' and except* in the same :keyword:`try`. :keyword:`break`,\n'
- ' :keyword:`continue` and :keyword:`return` cannot appear in an '
- 'except*\n'
- ' clause.\n'
+ 'are re-raised at the end, combined into an exception group along '
+ 'with\n'
+ 'all exceptions that were raised from within "except*" clauses.\n'
+ '\n'
+ 'If the raised exception is not an exception group and its type '
+ 'matches\n'
+ 'one of the "except*" clauses, it is caught and wrapped by an '
+ 'exception\n'
+ 'group with an empty message string.\n'
+ '\n'
+ ' >>> try:\n'
+ ' ... raise BlockingIOError\n'
+ ' ... except* BlockingIOError as e:\n'
+ ' ... print(repr(e))\n'
+ ' ...\n'
+ " ExceptionGroup('', (BlockingIOError()))\n"
+ '\n'
+ 'An "except*" clause must have a matching type, and this type '
+ 'cannot be\n'
+ 'a subclass of "BaseExceptionGroup". It is not possible to mix '
+ '"except"\n'
+ 'and "except*" in the same "try". "break", "continue" and '
+ '"return"\n'
+ 'cannot appear in an "except*" clause.\n'
+ '\n'
+ '\n'
+ '"else" clause\n'
+ '-------------\n'
'\n'
'The optional "else" clause is executed if the control flow '
'leaves the\n'
@@ -2573,6 +2610,10 @@
'are\n'
'not handled by the preceding "except" clauses.\n'
'\n'
+ '\n'
+ '"finally" clause\n'
+ '----------------\n'
+ '\n'
'If "finally" is present, it specifies a ‘cleanup’ handler. The '
'"try"\n'
'clause is executed, including any "except" and "else" clauses. '
@@ -2626,11 +2667,6 @@
' >>> foo()\n'
" 'finally'\n"
'\n'
- 'Additional information on exceptions can be found in section\n'
- 'Exceptions, and information on using the "raise" statement to '
- 'generate\n'
- 'exceptions may be found in section The raise statement.\n'
- '\n'
'Changed in version 3.8: Prior to Python 3.8, a "continue" '
'statement\n'
'was illegal in the "finally" clause due to a problem with the\n'
@@ -2680,7 +2716,7 @@
'the\n'
' target list, it will be treated the same as an error '
'occurring\n'
- ' within the suite would be. See step 6 below.\n'
+ ' within the suite would be. See step 7 below.\n'
'\n'
'6. The suite is executed.\n'
'\n'
@@ -3037,7 +3073,7 @@
'AS\n'
'pattern binds the subject to the name on the right of the as '
'keyword\n'
- 'and succeeds. "capture_pattern" cannot be a a "_".\n'
+ 'and succeeds. "capture_pattern" cannot be a "_".\n'
'\n'
'In simple terms "P as NAME" will match with "P", and on success '
'it\n'
@@ -3482,8 +3518,8 @@
' there is matched against the whole object rather than an '
'attribute.\n'
' For example "int(0|1)" matches the value "0", but not the '
- 'values\n'
- ' "0.0" or "False".\n'
+ 'value\n'
+ ' "0.0".\n'
'\n'
'In simple terms "CLS(P1, attr=P2)" matches only if the '
'following\n'
@@ -4144,7 +4180,7 @@
' invoking the superclass’s "__new__()" method using\n'
' "super().__new__(cls[, ...])" with appropriate arguments '
'and then\n'
- ' modifying the newly-created instance as necessary before '
+ ' modifying the newly created instance as necessary before '
'returning\n'
' it.\n'
'\n'
@@ -4489,7 +4525,7 @@
'objects and\n'
' implements an "__eq__()" method, it should not '
'implement\n'
- ' "__hash__()", since the implementation of hashable '
+ ' "__hash__()", since the implementation of *hashable* '
'collections\n'
' requires that a key’s hash value is immutable (if the '
'object’s hash\n'
@@ -4547,7 +4583,7 @@
'Python.This is\n'
' intended to provide protection against a '
'denial-of-service caused\n'
- ' by carefully-chosen inputs that exploit the worst '
+ ' by carefully chosen inputs that exploit the worst '
'case\n'
' performance of a dict insertion, O(n^2) complexity. '
'See\n'
@@ -4603,6 +4639,18 @@
'the source. The extension interface uses the modules "bdb" and '
'"cmd".\n'
'\n'
+ 'See also:\n'
+ '\n'
+ ' Module "faulthandler"\n'
+ ' Used to dump Python tracebacks explicitly, on a fault, '
+ 'after a\n'
+ ' timeout, or on a user signal.\n'
+ '\n'
+ ' Module "traceback"\n'
+ ' Standard interface to extract, format and print stack '
+ 'traces of\n'
+ ' Python programs.\n'
+ '\n'
'The debugger’s prompt is "(Pdb)". Typical usage to run a program '
'under\n'
'control of the debugger is:\n'
@@ -4628,7 +4676,7 @@
'scripts. For\n'
'example:\n'
'\n'
- ' python3 -m pdb myscript.py\n'
+ ' python -m pdb myscript.py\n'
'\n'
'When invoked as a script, pdb will automatically enter '
'post-mortem\n'
@@ -4648,7 +4696,7 @@
'\n'
'New in version 3.7: "pdb.py" now accepts a "-m" option that '
'execute\n'
- 'modules similar to the way "python3 -m" does. As with a script, '
+ 'modules similar to the way "python -m" does. As with a script, '
'the\n'
'debugger will pause execution just before the first line of the\n'
'module.\n'
@@ -4712,8 +4760,8 @@
'object)\n'
' under debugger control. When "runeval()" returns, it returns '
'the\n'
- ' value of the expression. Otherwise this function is similar '
- 'to\n'
+ ' value of the *expression*. Otherwise this function is '
+ 'similar to\n'
' "run()".\n'
'\n'
'pdb.runcall(function, *args, **kwds)\n'
@@ -4861,7 +4909,10 @@
'is\n'
'applied to separating the commands; the input is split at the '
'first\n'
- '";;" pair, even if it is in the middle of a quoted string.\n'
+ '";;" pair, even if it is in the middle of a quoted string. A\n'
+ 'workaround for strings with double semicolons is to use '
+ 'implicit\n'
+ 'string concatenation "\';\'\';\'" or "";"";"".\n'
'\n'
'If a file ".pdbrc" exists in the user’s home directory or in '
'the\n'
@@ -4972,14 +5023,15 @@
'ignore bpnumber [count]\n'
'\n'
' Set the ignore count for the given breakpoint number. If '
- 'count is\n'
- ' omitted, the ignore count is set to 0. A breakpoint becomes '
- 'active\n'
- ' when the ignore count is zero. When non-zero, the count is\n'
- ' decremented each time the breakpoint is reached and the '
- 'breakpoint\n'
- ' is not disabled and any associated condition evaluates to '
- 'true.\n'
+ '*count*\n'
+ ' is omitted, the ignore count is set to 0. A breakpoint '
+ 'becomes\n'
+ ' active when the ignore count is zero. When non-zero, the '
+ '*count*\n'
+ ' is decremented each time the breakpoint is reached and the\n'
+ ' breakpoint is not disabled and any associated condition '
+ 'evaluates\n'
+ ' to true.\n'
'\n'
'condition bpnumber [condition]\n'
'\n'
@@ -5029,7 +5081,7 @@
' breakpoint—which could have its own command list, leading to\n'
' ambiguities about which list to execute.\n'
'\n'
- ' If you use the ‘silent’ command in the command list, the '
+ ' If you use the "silent" command in the command list, the '
'usual\n'
' message about stopping at a breakpoint is not printed. This '
'may be\n'
@@ -5064,11 +5116,10 @@
'number\n'
' greater than the current one is reached.\n'
'\n'
- ' With a line number, continue execution until a line with a '
- 'number\n'
- ' greater or equal to that is reached. In both cases, also '
- 'stop when\n'
- ' the current frame returns.\n'
+ ' With *lineno*, continue execution until a line with a number\n'
+ ' greater or equal to *lineno* is reached. In both cases, also '
+ 'stop\n'
+ ' when the current frame returns.\n'
'\n'
' Changed in version 3.2: Allow giving an explicit line '
'number.\n'
@@ -5132,9 +5183,8 @@
'\n'
'p expression\n'
'\n'
- ' Evaluate the *expression* in the current context and print '
- 'its\n'
- ' value.\n'
+ ' Evaluate *expression* in the current context and print its '
+ 'value.\n'
'\n'
' Note:\n'
'\n'
@@ -5144,26 +5194,26 @@
'\n'
'pp expression\n'
'\n'
- ' Like the "p" command, except the value of the expression is '
+ ' Like the "p" command, except the value of *expression* is '
'pretty-\n'
' printed using the "pprint" module.\n'
'\n'
'whatis expression\n'
'\n'
- ' Print the type of the *expression*.\n'
+ ' Print the type of *expression*.\n'
'\n'
'source expression\n'
'\n'
- ' Try to get source code for the given object and display it.\n'
+ ' Try to get source code of *expression* and display it.\n'
'\n'
' New in version 3.2.\n'
'\n'
'display [expression]\n'
'\n'
- ' Display the value of the expression if it changed, each time\n'
+ ' Display the value of *expression* if it changed, each time\n'
' execution stops in the current frame.\n'
'\n'
- ' Without expression, list all display expressions for the '
+ ' Without *expression*, list all display expressions for the '
'current\n'
' frame.\n'
'\n'
@@ -5171,10 +5221,10 @@
'\n'
'undisplay [expression]\n'
'\n'
- ' Do not display the expression any more in the current frame.\n'
- ' Without expression, clear all display expressions for the '
- 'current\n'
- ' frame.\n'
+ ' Do not display *expression* anymore in the current frame. '
+ 'Without\n'
+ ' *expression*, clear all display expressions for the current '
+ 'frame.\n'
'\n'
' New in version 3.2.\n'
'\n'
@@ -5190,16 +5240,16 @@
'\n'
'alias [name [command]]\n'
'\n'
- ' Create an alias called *name* that executes *command*. The '
- 'command\n'
- ' must *not* be enclosed in quotes. Replaceable parameters can '
- 'be\n'
- ' indicated by "%1", "%2", and so on, while "%*" is replaced by '
- 'all\n'
- ' the parameters. If no command is given, the current alias '
- 'for\n'
- ' *name* is shown. If no arguments are given, all aliases are '
- 'listed.\n'
+ ' Create an alias called *name* that executes *command*. The\n'
+ ' *command* must *not* be enclosed in quotes. Replaceable '
+ 'parameters\n'
+ ' can be indicated by "%1", "%2", and so on, while "%*" is '
+ 'replaced\n'
+ ' by all the parameters. If *command* is omitted, the current '
+ 'alias\n'
+ ' for *name* is shown. If no arguments are given, all aliases '
+ 'are\n'
+ ' listed.\n'
'\n'
' Aliases may be nested and can contain anything that can be '
'legally\n'
@@ -5218,14 +5268,14 @@
' in the ".pdbrc" file):\n'
'\n'
' # Print instance variables (usage "pi classInst")\n'
- ' alias pi for k in %1.__dict__.keys(): '
- 'print("%1.",k,"=",%1.__dict__[k])\n'
+ ' alias pi for k in %1.__dict__.keys(): print(f"%1.{k} = '
+ '{%1.__dict__[k]}")\n'
' # Print instance variables in self\n'
' alias ps pi self\n'
'\n'
'unalias name\n'
'\n'
- ' Delete the specified alias.\n'
+ ' Delete the specified alias *name*.\n'
'\n'
'! statement\n'
'\n'
@@ -5245,12 +5295,13 @@
'run [args ...]\n'
'restart [args ...]\n'
'\n'
- ' Restart the debugged Python program. If an argument is '
- 'supplied,\n'
- ' it is split with "shlex" and the result is used as the new\n'
- ' "sys.argv". History, breakpoints, actions and debugger '
- 'options are\n'
- ' preserved. "restart" is an alias for "run".\n'
+ ' Restart the debugged Python program. If *args* is supplied, '
+ 'it is\n'
+ ' split with "shlex" and the result is used as the new '
+ '"sys.argv".\n'
+ ' History, breakpoints, actions and debugger options are '
+ 'preserved.\n'
+ ' "restart" is an alias for "run".\n'
'\n'
'q(uit)\n'
'\n'
@@ -5259,11 +5310,11 @@
'\n'
'debug code\n'
'\n'
- ' Enter a recursive debugger that steps through the code '
- 'argument\n'
- ' (which is an arbitrary expression or statement to be executed '
- 'in\n'
- ' the current environment).\n'
+ ' Enter a recursive debugger that steps through *code* (which '
+ 'is an\n'
+ ' arbitrary expression or statement to be executed in the '
+ 'current\n'
+ ' environment).\n'
'\n'
'retval\n'
'\n'
@@ -5537,9 +5588,10 @@
'\n'
' * "for" loop header,\n'
'\n'
- ' * after "as" in a "with" statement, "except" clause or in the '
- 'as-\n'
- ' pattern in structural pattern matching,\n'
+ ' * after "as" in a "with" statement, "except" clause, '
+ '"except*"\n'
+ ' clause, or in the as-pattern in structural pattern '
+ 'matching,\n'
'\n'
' * in a capture pattern in structural pattern matching\n'
'\n'
@@ -5618,7 +5670,8 @@
'be\n'
'determined by scanning the entire text of the block for name '
'binding\n'
- 'operations.\n'
+ 'operations. See the FAQ entry on UnboundLocalError for '
+ 'examples.\n'
'\n'
'If the "global" statement occurs within a block, all uses of '
'the names\n'
@@ -5920,10 +5973,9 @@
'\n'
'Names in the target list are not deleted when the loop is finished,\n'
'but if the sequence is empty, they will not have been assigned to at\n'
- 'all by the loop. Hint: the built-in function "range()" returns an\n'
- 'iterator of integers suitable to emulate the effect of Pascal’s "for '
- 'i\n'
- ':= a to b do"; e.g., "list(range(3))" returns the list "[0, 1, 2]".\n'
+ 'all by the loop. Hint: the built-in type "range()" represents\n'
+ 'immutable arithmetic sequences of integers. For instance, iterating\n'
+ '"range(3)" successively yields 0, 1, and then 2.\n'
'\n'
'Changed in version 3.11: Starred elements are now allowed in the\n'
'expression list.\n',
@@ -6119,7 +6171,8 @@
'The general form of a *standard format specifier* is:\n'
'\n'
' format_spec ::= '
- '[[fill]align][sign][z][#][0][width][grouping_option][.precision][type]\n'
+ '[[fill]align][sign]["z"]["#"]["0"][width][grouping_option]["." '
+ 'precision][type]\n'
' fill ::= \n'
' align ::= "<" | ">" | "=" | "^"\n'
' sign ::= "+" | "-" | " "\n'
@@ -7271,7 +7324,7 @@
'the clauses had been separated out into individual import '
'statements.\n'
'\n'
- 'The details of the first step, finding and loading modules are\n'
+ 'The details of the first step, finding and loading modules, are\n'
'described in greater detail in the section on the import system, '
'which\n'
'also describes the various types of packages and modules that can '
@@ -7654,9 +7707,8 @@
'\n'
' * "for" loop header,\n'
'\n'
- ' * after "as" in a "with" statement, "except" clause or in the '
- 'as-\n'
- ' pattern in structural pattern matching,\n'
+ ' * after "as" in a "with" statement, "except" clause, "except*"\n'
+ ' clause, or in the as-pattern in structural pattern matching,\n'
'\n'
' * in a capture pattern in structural pattern matching\n'
'\n'
@@ -7732,7 +7784,7 @@
'within a code block. The local variables of a code block can be\n'
'determined by scanning the entire text of the block for name '
'binding\n'
- 'operations.\n'
+ 'operations. See the FAQ entry on UnboundLocalError for examples.\n'
'\n'
'If the "global" statement occurs within a block, all uses of the '
'names\n'
@@ -8229,8 +8281,9 @@
'the syntax is explicitly given, operators are binary. '
'Operators in\n'
'the same box group left to right (except for '
- 'exponentiation, which\n'
- 'groups from right to left).\n'
+ 'exponentiation and\n'
+ 'conditional expressions, which group from right to '
+ 'left).\n'
'\n'
'Note that comparisons, membership tests, and identity '
'tests, all have\n'
@@ -8254,7 +8307,7 @@
'| "x(arguments...)", "x.attribute" | '
'attribute reference |\n'
'+-------------------------------------------------+---------------------------------------+\n'
- '| "await" "x" | '
+ '| "await x" | '
'Await expression |\n'
'+-------------------------------------------------+---------------------------------------+\n'
'| "**" | '
@@ -8290,7 +8343,7 @@
'| ">=", "!=", "==" | '
'tests and identity tests |\n'
'+-------------------------------------------------+---------------------------------------+\n'
- '| "not" "x" | '
+ '| "not x" | '
'Boolean NOT |\n'
'+-------------------------------------------------+---------------------------------------+\n'
'| "and" | '
@@ -8980,31 +9033,7 @@
' still alive. The list is in definition order. Example:\n'
'\n'
' >>> int.__subclasses__()\n'
- " []\n"
- '\n'
- '-[ Footnotes ]-\n'
- '\n'
- '[1] Additional information on these special methods may be '
- 'found in\n'
- ' the Python Reference Manual (Basic customization).\n'
- '\n'
- '[2] As a consequence, the list "[1, 2]" is considered equal '
- 'to "[1.0,\n'
- ' 2.0]", and similarly for tuples.\n'
- '\n'
- '[3] They must have since the parser can’t tell the type of '
- 'the\n'
- ' operands.\n'
- '\n'
- '[4] Cased characters are those with general category '
- 'property being\n'
- ' one of “Lu” (Letter, uppercase), “Ll” (Letter, '
- 'lowercase), or “Lt”\n'
- ' (Letter, titlecase).\n'
- '\n'
- '[5] To format only a tuple you should therefore provide a '
- 'singleton\n'
- ' tuple whose only element is the tuple to be formatted.\n',
+ " []\n",
'specialnames': 'Special method names\n'
'********************\n'
'\n'
@@ -9073,7 +9102,7 @@
' invoking the superclass’s "__new__()" method using\n'
' "super().__new__(cls[, ...])" with appropriate arguments '
'and then\n'
- ' modifying the newly-created instance as necessary before '
+ ' modifying the newly created instance as necessary before '
'returning\n'
' it.\n'
'\n'
@@ -9417,7 +9446,7 @@
' hashable collections. If a class defines mutable objects '
'and\n'
' implements an "__eq__()" method, it should not implement\n'
- ' "__hash__()", since the implementation of hashable '
+ ' "__hash__()", since the implementation of *hashable* '
'collections\n'
' requires that a key’s hash value is immutable (if the '
'object’s hash\n'
@@ -9474,7 +9503,7 @@
'is\n'
' intended to provide protection against a '
'denial-of-service caused\n'
- ' by carefully-chosen inputs that exploit the worst case\n'
+ ' by carefully chosen inputs that exploit the worst case\n'
' performance of a dict insertion, O(n^2) complexity. '
'See\n'
' http://www.ocert.org/advisories/ocert-2011-003.html '
@@ -9954,10 +9983,11 @@
'future, a\n'
' check may be added to prevent this.\n'
'\n'
- '* Nonempty *__slots__* does not work for classes derived '
- 'from\n'
- ' “variable-length” built-in types such as "int", "bytes" '
- 'and "tuple".\n'
+ '* "TypeError" will be raised if nonempty *__slots__* are '
+ 'defined for a\n'
+ ' class derived from a ""variable-length" built-in type" '
+ 'such as\n'
+ ' "int", "bytes", and "tuple".\n'
'\n'
'* Any non-string *iterable* may be assigned to *__slots__*.\n'
'\n'
@@ -11083,8 +11113,9 @@
'y)" is\n'
'typically invalid without special support in "MyClass". To '
'be able to\n'
- 'use that kind of patterns, the class needs to define a\n'
- '*__match_args__* attribute.\n'
+ 'use that kind of pattern, the class needs to define a '
+ '*__match_args__*\n'
+ 'attribute.\n'
'\n'
'object.__match_args__\n'
'\n'
@@ -11289,37 +11320,41 @@
'*start* and\n'
' *end* are interpreted as in slice notation.\n'
'\n'
+ ' If *sub* is empty, returns the number of empty strings '
+ 'between\n'
+ ' characters which is the length of the string plus one.\n'
+ '\n'
"str.encode(encoding='utf-8', errors='strict')\n"
'\n'
- ' Return an encoded version of the string as a bytes '
- 'object. Default\n'
- ' encoding is "\'utf-8\'". *errors* may be given to set a '
- 'different\n'
- ' error handling scheme. The default for *errors* is '
- '"\'strict\'",\n'
- ' meaning that encoding errors raise a "UnicodeError". '
+ ' Return the string encoded to "bytes".\n'
+ '\n'
+ ' *encoding* defaults to "\'utf-8\'"; see Standard '
+ 'Encodings for\n'
+ ' possible values.\n'
+ '\n'
+ ' *errors* controls how encoding errors are handled. If '
+ '"\'strict\'"\n'
+ ' (the default), a "UnicodeError" exception is raised. '
'Other possible\n'
' values are "\'ignore\'", "\'replace\'", '
'"\'xmlcharrefreplace\'",\n'
' "\'backslashreplace\'" and any other name registered '
'via\n'
- ' "codecs.register_error()", see section Error Handlers. '
- 'For a list\n'
- ' of possible encodings, see section Standard Encodings.\n'
+ ' "codecs.register_error()". See Error Handlers for '
+ 'details.\n'
'\n'
- ' By default, the *errors* argument is not checked for '
- 'best\n'
- ' performances, but only used at the first encoding '
- 'error. Enable the\n'
- ' Python Development Mode, or use a debug build to check '
- '*errors*.\n'
+ ' For performance reasons, the value of *errors* is not '
+ 'checked for\n'
+ ' validity unless an encoding error actually occurs, '
+ 'Python\n'
+ ' Development Mode is enabled or a debug build is used.\n'
'\n'
- ' Changed in version 3.1: Support for keyword arguments '
- 'added.\n'
+ ' Changed in version 3.1: Added support for keyword '
+ 'arguments.\n'
'\n'
- ' Changed in version 3.9: The *errors* is now checked in '
- 'development\n'
- ' mode and in debug mode.\n'
+ ' Changed in version 3.9: The value of the *errors* '
+ 'argument is now\n'
+ ' checked in Python Development Mode and in debug mode.\n'
'\n'
'str.endswith(suffix[, start[, end]])\n'
'\n'
@@ -11795,7 +11830,7 @@
'followed by\n'
' the string itself.\n'
'\n'
- 'str.rsplit(sep=None, maxsplit=- 1)\n'
+ 'str.rsplit(sep=None, maxsplit=-1)\n'
'\n'
' Return a list of the words in the string, using *sep* '
'as the\n'
@@ -11836,7 +11871,7 @@
" >>> 'Monty Python'.removesuffix(' Python')\n"
" 'Monty'\n"
'\n'
- 'str.split(sep=None, maxsplit=- 1)\n'
+ 'str.split(sep=None, maxsplit=-1)\n'
'\n'
' Return a list of the words in the string, using *sep* '
'as the\n'
@@ -12253,8 +12288,8 @@
'| Escape Sequence | Meaning | Notes '
'|\n'
'|===================|===================================|=========|\n'
- '| "\\newline" | Backslash and newline ignored '
- '| |\n'
+ '| "\\" | Backslash and newline ignored | '
+ '(1) |\n'
'+-------------------+-----------------------------------+---------+\n'
'| "\\\\" | Backslash ("\\") '
'| |\n'
@@ -12287,10 +12322,10 @@
'| |\n'
'+-------------------+-----------------------------------+---------+\n'
'| "\\ooo" | Character with octal value *ooo* | '
- '(1,3) |\n'
+ '(2,4) |\n'
'+-------------------+-----------------------------------+---------+\n'
'| "\\xhh" | Character with hex value *hh* | '
- '(2,3) |\n'
+ '(3,4) |\n'
'+-------------------+-----------------------------------+---------+\n'
'\n'
'Escape sequences only recognized in string literals are:\n'
@@ -12300,24 +12335,36 @@
'|\n'
'|===================|===================================|=========|\n'
'| "\\N{name}" | Character named *name* in the | '
- '(4) |\n'
+ '(5) |\n'
'| | Unicode database | '
'|\n'
'+-------------------+-----------------------------------+---------+\n'
'| "\\uxxxx" | Character with 16-bit hex value | '
- '(5) |\n'
+ '(6) |\n'
'| | *xxxx* | '
'|\n'
'+-------------------+-----------------------------------+---------+\n'
'| "\\Uxxxxxxxx" | Character with 32-bit hex value | '
- '(6) |\n'
+ '(7) |\n'
'| | *xxxxxxxx* | '
'|\n'
'+-------------------+-----------------------------------+---------+\n'
'\n'
'Notes:\n'
'\n'
- '1. As in Standard C, up to three octal digits are accepted.\n'
+ '1. A backslash can be added at the end of a line to ignore the\n'
+ ' newline:\n'
+ '\n'
+ " >>> 'This string will not include \\\n"
+ " ... backslashes or newline characters.'\n"
+ " 'This string will not include backslashes or newline "
+ "characters.'\n"
+ '\n'
+ ' The same result can be achieved using triple-quoted strings, '
+ 'or\n'
+ ' parentheses and string literal concatenation.\n'
+ '\n'
+ '2. As in Standard C, up to three octal digits are accepted.\n'
'\n'
' Changed in version 3.11: Octal escapes with value larger than\n'
' "0o377" produce a "DeprecationWarning". In a future Python '
@@ -12325,20 +12372,20 @@
' they will be a "SyntaxWarning" and eventually a '
'"SyntaxError".\n'
'\n'
- '2. Unlike in Standard C, exactly two hex digits are required.\n'
+ '3. Unlike in Standard C, exactly two hex digits are required.\n'
'\n'
- '3. In a bytes literal, hexadecimal and octal escapes denote the '
+ '4. In a bytes literal, hexadecimal and octal escapes denote the '
'byte\n'
' with the given value. In a string literal, these escapes '
'denote a\n'
' Unicode character with the given value.\n'
'\n'
- '4. Changed in version 3.3: Support for name aliases [1] has been\n'
+ '5. Changed in version 3.3: Support for name aliases [1] has been\n'
' added.\n'
'\n'
- '5. Exactly four hex digits are required.\n'
+ '6. Exactly four hex digits are required.\n'
'\n'
- '6. Any Unicode character can be encoded this way. Exactly eight '
+ '7. Any Unicode character can be encoded this way. Exactly eight '
'hex\n'
' digits are required.\n'
'\n'
@@ -12509,31 +12556,39 @@
' try3_stmt ::= "try" ":" suite\n'
' "finally" ":" suite\n'
'\n'
+ 'Additional information on exceptions can be found in section\n'
+ 'Exceptions, and information on using the "raise" statement to '
+ 'generate\n'
+ 'exceptions may be found in section The raise statement.\n'
+ '\n'
+ '\n'
+ '"except" clause\n'
+ '===============\n'
+ '\n'
'The "except" clause(s) specify one or more exception handlers. When '
'no\n'
'exception occurs in the "try" clause, no exception handler is\n'
'executed. When an exception occurs in the "try" suite, a search for '
'an\n'
- 'exception handler is started. This search inspects the except '
- 'clauses\n'
- 'in turn until one is found that matches the exception. An '
- 'expression-\n'
- 'less except clause, if present, must be last; it matches any\n'
- 'exception. For an except clause with an expression, that expression\n'
- 'is evaluated, and the clause matches the exception if the resulting\n'
- 'object is “compatible” with the exception. An object is compatible\n'
- 'with an exception if the object is the class or a *non-virtual base\n'
- 'class* of the exception object, or a tuple containing an item that '
- 'is\n'
- 'the class or a non-virtual base class of the exception object.\n'
+ 'exception handler is started. This search inspects the "except"\n'
+ 'clauses in turn until one is found that matches the exception. An\n'
+ 'expression-less "except" clause, if present, must be last; it '
+ 'matches\n'
+ 'any exception. For an "except" clause with an expression, that\n'
+ 'expression is evaluated, and the clause matches the exception if the\n'
+ 'resulting object is “compatible” with the exception. An object is\n'
+ 'compatible with an exception if the object is the class or a *non-\n'
+ 'virtual base class* of the exception object, or a tuple containing '
+ 'an\n'
+ 'item that is the class or a non-virtual base class of the exception\n'
+ 'object.\n'
'\n'
- 'If no except clause matches the exception, the search for an '
- 'exception\n'
- 'handler continues in the surrounding code and on the invocation '
- 'stack.\n'
- '[1]\n'
+ 'If no "except" clause matches the exception, the search for an\n'
+ 'exception handler continues in the surrounding code and on the\n'
+ 'invocation stack. [1]\n'
'\n'
- 'If the evaluation of an expression in the header of an except clause\n'
+ 'If the evaluation of an expression in the header of an "except" '
+ 'clause\n'
'raises an exception, the original search for a handler is canceled '
'and\n'
'a search starts for the new exception in the surrounding code and on\n'
@@ -12541,21 +12596,20 @@
'raised\n'
'the exception).\n'
'\n'
- 'When a matching except clause is found, the exception is assigned to\n'
- 'the target specified after the "as" keyword in that except clause, '
- 'if\n'
- 'present, and the except clause’s suite is executed. All except\n'
- 'clauses must have an executable block. When the end of this block '
- 'is\n'
- 'reached, execution continues normally after the entire try '
- 'statement.\n'
- '(This means that if two nested handlers exist for the same '
- 'exception,\n'
- 'and the exception occurs in the try clause of the inner handler, the\n'
- 'outer handler will not handle the exception.)\n'
+ 'When a matching "except" clause is found, the exception is assigned '
+ 'to\n'
+ 'the target specified after the "as" keyword in that "except" clause,\n'
+ 'if present, and the "except" clause’s suite is executed. All '
+ '"except"\n'
+ 'clauses must have an executable block. When the end of this block is\n'
+ 'reached, execution continues normally after the entire "try"\n'
+ 'statement. (This means that if two nested handlers exist for the '
+ 'same\n'
+ 'exception, and the exception occurs in the "try" clause of the inner\n'
+ 'handler, the outer handler will not handle the exception.)\n'
'\n'
'When an exception has been assigned using "as target", it is cleared\n'
- 'at the end of the except clause. This is as if\n'
+ 'at the end of the "except" clause. This is as if\n'
'\n'
' except E as N:\n'
' foo\n'
@@ -12569,42 +12623,41 @@
' del N\n'
'\n'
'This means the exception must be assigned to a different name to be\n'
- 'able to refer to it after the except clause. Exceptions are cleared\n'
+ 'able to refer to it after the "except" clause. Exceptions are '
+ 'cleared\n'
'because with the traceback attached to them, they form a reference\n'
'cycle with the stack frame, keeping all locals in that frame alive\n'
'until the next garbage collection occurs.\n'
'\n'
- 'Before an except clause’s suite is executed, details about the\n'
- 'exception are stored in the "sys" module and can be accessed via\n'
- '"sys.exc_info()". "sys.exc_info()" returns a 3-tuple consisting of '
- 'the\n'
- 'exception class, the exception instance and a traceback object (see\n'
- 'section The standard type hierarchy) identifying the point in the\n'
- 'program where the exception occurred. The details about the '
- 'exception\n'
- 'accessed via "sys.exc_info()" are restored to their previous values\n'
- 'when leaving an exception handler:\n'
+ 'Before an "except" clause’s suite is executed, the exception is '
+ 'stored\n'
+ 'in the "sys" module, where it can be accessed from within the body '
+ 'of\n'
+ 'the "except" clause by calling "sys.exception()". When leaving an\n'
+ 'exception handler, the exception stored in the "sys" module is reset\n'
+ 'to its previous value:\n'
'\n'
- ' >>> print(sys.exc_info())\n'
- ' (None, None, None)\n'
+ ' >>> print(sys.exception())\n'
+ ' None\n'
' >>> try:\n'
' ... raise TypeError\n'
' ... except:\n'
- ' ... print(sys.exc_info())\n'
+ ' ... print(repr(sys.exception()))\n'
' ... try:\n'
' ... raise ValueError\n'
' ... except:\n'
- ' ... print(sys.exc_info())\n'
- ' ... print(sys.exc_info())\n'
+ ' ... print(repr(sys.exception()))\n'
+ ' ... print(repr(sys.exception()))\n'
' ...\n'
- " (, TypeError(), )\n'
- " (, ValueError(), )\n'
- " (, TypeError(), )\n'
- ' >>> print(sys.exc_info())\n'
- ' (None, None, None)\n'
+ ' TypeError()\n'
+ ' ValueError()\n'
+ ' TypeError()\n'
+ ' >>> print(sys.exception())\n'
+ ' None\n'
+ '\n'
+ '\n'
+ '"except*" clause\n'
+ '================\n'
'\n'
'The "except*" clause(s) are used for handling "ExceptionGroup"s. The\n'
'exception type for matching is interpreted as in the case of '
@@ -12612,10 +12665,11 @@
'but in the case of exception groups we can have partial matches when\n'
'the type matches some of the exceptions in the group. This means '
'that\n'
- 'multiple except* clauses can execute, each handling part of the\n'
- 'exception group. Each clause executes once and handles an exception\n'
- 'group of all matching exceptions. Each exception in the group is\n'
- 'handled by at most one except* clause, the first that matches it.\n'
+ 'multiple "except*" clauses can execute, each handling part of the\n'
+ 'exception group. Each clause executes at most once and handles an\n'
+ 'exception group of all matching exceptions. Each exception in the\n'
+ 'group is handled by at most one "except*" clause, the first that\n'
+ 'matches it.\n'
'\n'
' >>> try:\n'
' ... raise ExceptionGroup("eg",\n'
@@ -12635,22 +12689,36 @@
' +-+---------------- 1 ----------------\n'
' | ValueError: 1\n'
' +------------------------------------\n'
- ' >>>\n'
'\n'
- ' Any remaining exceptions that were not handled by any except* '
+ 'Any remaining exceptions that were not handled by any "except*" '
'clause\n'
- ' are re-raised at the end, combined into an exception group along '
+ 'are re-raised at the end, combined into an exception group along '
'with\n'
- ' all exceptions that were raised from within except* clauses.\n'
+ 'all exceptions that were raised from within "except*" clauses.\n'
+ '\n'
+ 'If the raised exception is not an exception group and its type '
+ 'matches\n'
+ 'one of the "except*" clauses, it is caught and wrapped by an '
+ 'exception\n'
+ 'group with an empty message string.\n'
+ '\n'
+ ' >>> try:\n'
+ ' ... raise BlockingIOError\n'
+ ' ... except* BlockingIOError as e:\n'
+ ' ... print(repr(e))\n'
+ ' ...\n'
+ " ExceptionGroup('', (BlockingIOError()))\n"
+ '\n'
+ 'An "except*" clause must have a matching type, and this type cannot '
+ 'be\n'
+ 'a subclass of "BaseExceptionGroup". It is not possible to mix '
+ '"except"\n'
+ 'and "except*" in the same "try". "break", "continue" and "return"\n'
+ 'cannot appear in an "except*" clause.\n'
+ '\n'
'\n'
- ' An except* clause must have a matching type, and this type cannot '
- 'be a\n'
- ' subclass of :exc:`BaseExceptionGroup`. It is not possible to mix '
- 'except\n'
- ' and except* in the same :keyword:`try`. :keyword:`break`,\n'
- ' :keyword:`continue` and :keyword:`return` cannot appear in an '
- 'except*\n'
- ' clause.\n'
+ '"else" clause\n'
+ '=============\n'
'\n'
'The optional "else" clause is executed if the control flow leaves '
'the\n'
@@ -12659,6 +12727,10 @@
'"break" statement was executed. Exceptions in the "else" clause are\n'
'not handled by the preceding "except" clauses.\n'
'\n'
+ '\n'
+ '"finally" clause\n'
+ '================\n'
+ '\n'
'If "finally" is present, it specifies a ‘cleanup’ handler. The '
'"try"\n'
'clause is executed, including any "except" and "else" clauses. If '
@@ -12706,11 +12778,6 @@
' >>> foo()\n'
" 'finally'\n"
'\n'
- 'Additional information on exceptions can be found in section\n'
- 'Exceptions, and information on using the "raise" statement to '
- 'generate\n'
- 'exceptions may be found in section The raise statement.\n'
- '\n'
'Changed in version 3.8: Prior to Python 3.8, a "continue" statement\n'
'was illegal in the "finally" clause due to a problem with the\n'
'implementation.\n',
@@ -12910,7 +12977,7 @@
' points. All the code points in the range "U+0000 - '
'U+10FFFF"\n'
' can be represented in a string. Python doesn’t have a '
- '*char*\n'
+ 'char\n'
' type; instead, every code point in the string is '
'represented\n'
' as a string object with length "1". The built-in '
@@ -13908,17 +13975,11 @@
'dictionaries or\n'
'other mutable types (that are compared by value rather than '
'by object\n'
- 'identity) may not be used as keys. Numeric types used for '
- 'keys obey\n'
- 'the normal rules for numeric comparison: if two numbers '
- 'compare equal\n'
- '(such as "1" and "1.0") then they can be used '
- 'interchangeably to index\n'
- 'the same dictionary entry. (Note however, that since '
- 'computers store\n'
- 'floating-point numbers as approximations it is usually '
- 'unwise to use\n'
- 'them as dictionary keys.)\n'
+ 'identity) may not be used as keys. Values that compare equal '
+ '(such as\n'
+ '"1", "1.0", and "True") can be used interchangeably to index '
+ 'the same\n'
+ 'dictionary entry.\n'
'\n'
'class dict(**kwargs)\n'
'class dict(mapping, **kwargs)\n'
@@ -14325,7 +14386,7 @@
' New in version 3.10.\n'
'\n'
'Keys views are set-like since their entries are unique and '
- 'hashable.\n'
+ '*hashable*.\n'
'If all values are hashable, so that "(key, value)" pairs are '
'unique\n'
'and hashable, then the items view is also set-like. (Values '
@@ -14374,8 +14435,7 @@
' >>> # get back a read-only proxy for the original '
'dictionary\n'
' >>> values.mapping\n'
- " mappingproxy({'eggs': 2, 'sausage': 1, 'bacon': 1, "
- "'spam': 500})\n"
+ " mappingproxy({'bacon': 1, 'spam': 500})\n"
" >>> values.mapping['spam']\n"
' 500\n',
'typesmethods': 'Methods\n'
@@ -15421,7 +15481,7 @@
' returns without an error, then "__exit__()" will always be\n'
' called. Thus, if an error occurs during the assignment to the\n'
' target list, it will be treated the same as an error occurring\n'
- ' within the suite would be. See step 6 below.\n'
+ ' within the suite would be. See step 7 below.\n'
'\n'
'6. The suite is executed.\n'
'\n'
diff --git a/Lib/random.py b/Lib/random.py
index 1f3530e880fce2..d07fffba609454 100644
--- a/Lib/random.py
+++ b/Lib/random.py
@@ -282,10 +282,10 @@ def randbytes(self, n):
## -------------------- integer methods -------------------
def randrange(self, start, stop=None, step=_ONE):
- """Choose a random item from range(start, stop[, step]).
+ """Choose a random item from range(stop) or range(start, stop[, step]).
- This fixes the problem with randint() which includes the
- endpoint; in Python this is usually not what you want.
+ Roughly equivalent to ``choice(range(start, stop, step))`` but
+ supports arbitrarily large ranges and is optimized for common cases.
"""
@@ -366,7 +366,10 @@ def randint(self, a, b):
def choice(self, seq):
"""Choose a random element from a non-empty sequence."""
- if not seq:
+
+ # As an accommodation for NumPy, we don't use "if not seq"
+ # because bool(numpy.array()) raises a ValueError.
+ if not len(seq):
raise IndexError('Cannot choose from an empty sequence')
return seq[self._randbelow(len(seq))]
@@ -791,7 +794,7 @@ class SystemRandom(Random):
"""
def random(self):
- """Get the next random number in the range [0.0, 1.0)."""
+ """Get the next random number in the range 0.0 <= X < 1.0."""
return (int.from_bytes(_urandom(7)) >> 3) * RECIP_BPF
def getrandbits(self, k):
diff --git a/Lib/re/__init__.py b/Lib/re/__init__.py
index c9b511422f1e59..d58c2117ef3e14 100644
--- a/Lib/re/__init__.py
+++ b/Lib/re/__init__.py
@@ -129,7 +129,7 @@
# public symbols
__all__ = [
"match", "fullmatch", "search", "sub", "subn", "split",
- "findall", "finditer", "compile", "purge", "escape",
+ "findall", "finditer", "compile", "purge", "template", "escape",
"error", "Pattern", "Match", "A", "I", "L", "M", "S", "X", "U",
"ASCII", "IGNORECASE", "LOCALE", "MULTILINE", "DOTALL", "VERBOSE",
"UNICODE", "NOFLAG", "RegexFlag",
@@ -148,6 +148,8 @@ class RegexFlag:
MULTILINE = M = _compiler.SRE_FLAG_MULTILINE # make anchors look for newline
DOTALL = S = _compiler.SRE_FLAG_DOTALL # make dot match newline
VERBOSE = X = _compiler.SRE_FLAG_VERBOSE # ignore whitespace and comments
+ # sre extensions (experimental, don't rely on these)
+ TEMPLATE = T = _compiler.SRE_FLAG_TEMPLATE # unknown purpose, deprecated
DEBUG = _compiler.SRE_FLAG_DEBUG # dump pattern after compilation
__str__ = object.__str__
_numeric_repr_ = hex
@@ -229,6 +231,18 @@ def purge():
_cache.clear()
_compile_repl.cache_clear()
+def template(pattern, flags=0):
+ "Compile a template pattern, returning a Pattern object, deprecated"
+ import warnings
+ warnings.warn("The re.template() function is deprecated "
+ "as it is an undocumented function "
+ "without an obvious purpose. "
+ "Use re.compile() instead.",
+ DeprecationWarning)
+ with warnings.catch_warnings():
+ warnings.simplefilter("ignore", DeprecationWarning) # warn just once
+ return _compile(pattern, flags|T)
+
# SPECIAL_CHARS
# closing ')', '}' and ']'
# '-' (a range in character set)
@@ -270,6 +284,13 @@ def _compile(pattern, flags):
return pattern
if not _compiler.isstring(pattern):
raise TypeError("first argument must be string or compiled pattern")
+ if flags & T:
+ import warnings
+ warnings.warn("The re.TEMPLATE/re.T flag is deprecated "
+ "as it is an undocumented flag "
+ "without an obvious purpose. "
+ "Don't use it.",
+ DeprecationWarning)
p = _compiler.compile(pattern, flags)
if not (flags & DEBUG):
if len(_cache) >= _MAXCACHE:
diff --git a/Lib/re/_compiler.py b/Lib/re/_compiler.py
index 63d82025505b74..d8e0d2fdefdcca 100644
--- a/Lib/re/_compiler.py
+++ b/Lib/re/_compiler.py
@@ -28,21 +28,14 @@
POSSESSIVE_REPEAT: (POSSESSIVE_REPEAT, SUCCESS, POSSESSIVE_REPEAT_ONE),
}
-class _CompileData:
- __slots__ = ('code', 'repeat_count')
- def __init__(self):
- self.code = []
- self.repeat_count = 0
-
def _combine_flags(flags, add_flags, del_flags,
TYPE_FLAGS=_parser.TYPE_FLAGS):
if add_flags & TYPE_FLAGS:
flags &= ~TYPE_FLAGS
return (flags | add_flags) & ~del_flags
-def _compile(data, pattern, flags):
+def _compile(code, pattern, flags):
# internal: compile a (sub)pattern
- code = data.code
emit = code.append
_len = len
LITERAL_CODES = _LITERAL_CODES
@@ -108,12 +101,14 @@ def _compile(data, pattern, flags):
else:
emit(ANY)
elif op in REPEATING_CODES:
+ if flags & SRE_FLAG_TEMPLATE:
+ raise error("internal: unsupported template operator %r" % (op,))
if _simple(av[2]):
emit(REPEATING_CODES[op][2])
skip = _len(code); emit(0)
emit(av[0])
emit(av[1])
- _compile(data, av[2], flags)
+ _compile(code, av[2], flags)
emit(SUCCESS)
code[skip] = _len(code) - skip
else:
@@ -121,11 +116,7 @@ def _compile(data, pattern, flags):
skip = _len(code); emit(0)
emit(av[0])
emit(av[1])
- # now op is in (MIN_REPEAT, MAX_REPEAT, POSSESSIVE_REPEAT)
- if op != POSSESSIVE_REPEAT:
- emit(data.repeat_count)
- data.repeat_count += 1
- _compile(data, av[2], flags)
+ _compile(code, av[2], flags)
code[skip] = _len(code) - skip
emit(REPEATING_CODES[op][1])
elif op is SUBPATTERN:
@@ -134,7 +125,7 @@ def _compile(data, pattern, flags):
emit(MARK)
emit((group-1)*2)
# _compile_info(code, p, _combine_flags(flags, add_flags, del_flags))
- _compile(data, p, _combine_flags(flags, add_flags, del_flags))
+ _compile(code, p, _combine_flags(flags, add_flags, del_flags))
if group:
emit(MARK)
emit((group-1)*2+1)
@@ -146,7 +137,7 @@ def _compile(data, pattern, flags):
# pop their stack if they reach it
emit(ATOMIC_GROUP)
skip = _len(code); emit(0)
- _compile(data, av, flags)
+ _compile(code, av, flags)
emit(SUCCESS)
code[skip] = _len(code) - skip
elif op in SUCCESS_CODES:
@@ -161,7 +152,7 @@ def _compile(data, pattern, flags):
if lo != hi:
raise error("look-behind requires fixed-width pattern")
emit(lo) # look behind
- _compile(data, av[1], flags)
+ _compile(code, av[1], flags)
emit(SUCCESS)
code[skip] = _len(code) - skip
elif op is AT:
@@ -180,7 +171,7 @@ def _compile(data, pattern, flags):
for av in av[1]:
skip = _len(code); emit(0)
# _compile_info(code, av, flags)
- _compile(data, av, flags)
+ _compile(code, av, flags)
emit(JUMP)
tailappend(_len(code)); emit(0)
code[skip] = _len(code) - skip
@@ -208,12 +199,12 @@ def _compile(data, pattern, flags):
emit(op)
emit(av[0]-1)
skipyes = _len(code); emit(0)
- _compile(data, av[1], flags)
+ _compile(code, av[1], flags)
if av[2]:
emit(JUMP)
skipno = _len(code); emit(0)
code[skipyes] = _len(code) - skipyes + 1
- _compile(data, av[2], flags)
+ _compile(code, av[2], flags)
code[skipno] = _len(code) - skipno
else:
code[skipyes] = _len(code) - skipyes + 1
@@ -580,17 +571,17 @@ def isstring(obj):
def _code(p, flags):
flags = p.state.flags | flags
- data = _CompileData()
+ code = []
# compile info block
- _compile_info(data.code, p, flags)
+ _compile_info(code, p, flags)
# compile the pattern
- _compile(data, p.data, flags)
+ _compile(code, p.data, flags)
- data.code.append(SUCCESS)
+ code.append(SUCCESS)
- return data
+ return code
def _hex_code(code):
return '[%s]' % ', '.join('%#0*x' % (_sre.CODESIZE*2+2, x) for x in code)
@@ -691,7 +682,7 @@ def print_2(*args):
else:
print_(FAILURE)
i += 1
- elif op in (REPEAT_ONE, MIN_REPEAT_ONE,
+ elif op in (REPEAT, REPEAT_ONE, MIN_REPEAT_ONE,
POSSESSIVE_REPEAT, POSSESSIVE_REPEAT_ONE):
skip, min, max = code[i: i+3]
if max == MAXREPEAT:
@@ -699,13 +690,6 @@ def print_2(*args):
print_(op, skip, min, max, to=i+skip)
dis_(i+3, i+skip)
i += skip
- elif op is REPEAT:
- skip, min, max, repeat_index = code[i: i+4]
- if max == MAXREPEAT:
- max = 'MAXREPEAT'
- print_(op, skip, min, max, repeat_index, to=i+skip)
- dis_(i+4, i+skip)
- i += skip
elif op is GROUPREF_EXISTS:
arg, skip = code[i: i+2]
print_(op, arg, skip, to=i+skip)
@@ -760,11 +744,11 @@ def compile(p, flags=0):
else:
pattern = None
- data = _code(p, flags)
+ code = _code(p, flags)
if flags & SRE_FLAG_DEBUG:
print()
- dis(data.code)
+ dis(code)
# map in either direction
groupindex = p.state.groupdict
@@ -773,6 +757,7 @@ def compile(p, flags=0):
indexgroup[i] = k
return _sre.compile(
- pattern, flags | p.state.flags, data.code,
- p.state.groups-1, groupindex, tuple(indexgroup),
- data.repeat_count)
+ pattern, flags | p.state.flags, code,
+ p.state.groups-1,
+ groupindex, tuple(indexgroup)
+ )
diff --git a/Lib/re/_constants.py b/Lib/re/_constants.py
index 71204d903b3226..10ee14bfab46ee 100644
--- a/Lib/re/_constants.py
+++ b/Lib/re/_constants.py
@@ -13,7 +13,7 @@
# update when constants are added or removed
-MAGIC = 20220423
+MAGIC = 20220615
from _sre import MAXREPEAT, MAXGROUPS
@@ -204,6 +204,7 @@ def _makecodes(*names):
}
# flags
+SRE_FLAG_TEMPLATE = 1 # template mode (unknown purpose, deprecated)
SRE_FLAG_IGNORECASE = 2 # case insensitive
SRE_FLAG_LOCALE = 4 # honour system locale
SRE_FLAG_MULTILINE = 8 # treat target as multiline string
diff --git a/Lib/re/_parser.py b/Lib/re/_parser.py
index a393c508d86e5d..f747a0396b1f3b 100644
--- a/Lib/re/_parser.py
+++ b/Lib/re/_parser.py
@@ -61,11 +61,12 @@
"x": SRE_FLAG_VERBOSE,
# extensions
"a": SRE_FLAG_ASCII,
+ "t": SRE_FLAG_TEMPLATE,
"u": SRE_FLAG_UNICODE,
}
TYPE_FLAGS = SRE_FLAG_ASCII | SRE_FLAG_LOCALE | SRE_FLAG_UNICODE
-GLOBAL_FLAGS = SRE_FLAG_DEBUG
+GLOBAL_FLAGS = SRE_FLAG_DEBUG | SRE_FLAG_TEMPLATE
class State:
# keeps track of state for parsing
diff --git a/Lib/shutil.py b/Lib/shutil.py
index de82453aa56e1a..f4efaef38933d2 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -489,12 +489,13 @@ def _copytree(entries, src, dst, symlinks, ignore, copy_function,
# otherwise let the copy occur. copy2 will raise an error
if srcentry.is_dir():
copytree(srcobj, dstname, symlinks, ignore,
- copy_function, dirs_exist_ok=dirs_exist_ok)
+ copy_function, ignore_dangling_symlinks,
+ dirs_exist_ok)
else:
copy_function(srcobj, dstname)
elif srcentry.is_dir():
copytree(srcobj, dstname, symlinks, ignore, copy_function,
- dirs_exist_ok=dirs_exist_ok)
+ ignore_dangling_symlinks, dirs_exist_ok)
else:
# Will raise a SpecialFileError for unsupported file types
copy_function(srcobj, dstname)
@@ -896,7 +897,7 @@ def _get_uid(name):
return None
def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0,
- owner=None, group=None, logger=None):
+ owner=None, group=None, logger=None, root_dir=None):
"""Create a (possibly compressed) tar file from all the files under
'base_dir'.
@@ -953,14 +954,20 @@ def _set_uid_gid(tarinfo):
if not dry_run:
tar = tarfile.open(archive_name, 'w|%s' % tar_compression)
+ arcname = base_dir
+ if root_dir is not None:
+ base_dir = os.path.join(root_dir, base_dir)
try:
- tar.add(base_dir, filter=_set_uid_gid)
+ tar.add(base_dir, arcname, filter=_set_uid_gid)
finally:
tar.close()
+ if root_dir is not None:
+ archive_name = os.path.abspath(archive_name)
return archive_name
-def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None):
+def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0,
+ logger=None, owner=None, group=None, root_dir=None):
"""Create a zip file from all the files under 'base_dir'.
The output zip file will be named 'base_name' + ".zip". Returns the
@@ -984,42 +991,60 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None):
if not dry_run:
with zipfile.ZipFile(zip_filename, "w",
compression=zipfile.ZIP_DEFLATED) as zf:
- path = os.path.normpath(base_dir)
- if path != os.curdir:
- zf.write(path, path)
+ arcname = os.path.normpath(base_dir)
+ if root_dir is not None:
+ base_dir = os.path.join(root_dir, base_dir)
+ base_dir = os.path.normpath(base_dir)
+ if arcname != os.curdir:
+ zf.write(base_dir, arcname)
if logger is not None:
- logger.info("adding '%s'", path)
+ logger.info("adding '%s'", base_dir)
for dirpath, dirnames, filenames in os.walk(base_dir):
+ arcdirpath = dirpath
+ if root_dir is not None:
+ arcdirpath = os.path.relpath(arcdirpath, root_dir)
+ arcdirpath = os.path.normpath(arcdirpath)
for name in sorted(dirnames):
- path = os.path.normpath(os.path.join(dirpath, name))
- zf.write(path, path)
+ path = os.path.join(dirpath, name)
+ arcname = os.path.join(arcdirpath, name)
+ zf.write(path, arcname)
if logger is not None:
logger.info("adding '%s'", path)
for name in filenames:
- path = os.path.normpath(os.path.join(dirpath, name))
+ path = os.path.join(dirpath, name)
+ path = os.path.normpath(path)
if os.path.isfile(path):
- zf.write(path, path)
+ arcname = os.path.join(arcdirpath, name)
+ zf.write(path, arcname)
if logger is not None:
logger.info("adding '%s'", path)
+ if root_dir is not None:
+ zip_filename = os.path.abspath(zip_filename)
return zip_filename
+# Maps the name of the archive format to a tuple containing:
+# * the archiving function
+# * extra keyword arguments
+# * description
+# * does it support the root_dir argument?
_ARCHIVE_FORMATS = {
- 'tar': (_make_tarball, [('compress', None)], "uncompressed tar file"),
+ 'tar': (_make_tarball, [('compress', None)],
+ "uncompressed tar file", True),
}
if _ZLIB_SUPPORTED:
_ARCHIVE_FORMATS['gztar'] = (_make_tarball, [('compress', 'gzip')],
- "gzip'ed tar-file")
- _ARCHIVE_FORMATS['zip'] = (_make_zipfile, [], "ZIP file")
+ "gzip'ed tar-file", True)
+ _ARCHIVE_FORMATS['zip'] = (_make_zipfile, [], "ZIP file", True)
if _BZ2_SUPPORTED:
_ARCHIVE_FORMATS['bztar'] = (_make_tarball, [('compress', 'bzip2')],
- "bzip2'ed tar-file")
+ "bzip2'ed tar-file", True)
if _LZMA_SUPPORTED:
_ARCHIVE_FORMATS['xztar'] = (_make_tarball, [('compress', 'xz')],
- "xz'ed tar-file")
+ "xz'ed tar-file", True)
def get_archive_formats():
"""Returns a list of supported formats for archiving and unarchiving.
@@ -1050,7 +1075,7 @@ def register_archive_format(name, function, extra_args=None, description=''):
if not isinstance(element, (tuple, list)) or len(element) !=2:
raise TypeError('extra_args elements are : (arg_name, value)')
- _ARCHIVE_FORMATS[name] = (function, extra_args, description)
+ _ARCHIVE_FORMATS[name] = (function, extra_args, description, False)
def unregister_archive_format(name):
del _ARCHIVE_FORMATS[name]
@@ -1074,36 +1099,40 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
uses the current owner and group.
"""
sys.audit("shutil.make_archive", base_name, format, root_dir, base_dir)
- save_cwd = os.getcwd()
- if root_dir is not None:
- if logger is not None:
- logger.debug("changing into '%s'", root_dir)
- base_name = os.path.abspath(base_name)
- if not dry_run:
- os.chdir(root_dir)
-
- if base_dir is None:
- base_dir = os.curdir
-
- kwargs = {'dry_run': dry_run, 'logger': logger}
-
try:
format_info = _ARCHIVE_FORMATS[format]
except KeyError:
raise ValueError("unknown archive format '%s'" % format) from None
+ kwargs = {'dry_run': dry_run, 'logger': logger,
+ 'owner': owner, 'group': group}
+
func = format_info[0]
for arg, val in format_info[1]:
kwargs[arg] = val
- if format != 'zip':
- kwargs['owner'] = owner
- kwargs['group'] = group
+ if base_dir is None:
+ base_dir = os.curdir
+
+ support_root_dir = format_info[3]
+ save_cwd = None
+ if root_dir is not None:
+ if support_root_dir:
+ # Support path-like base_name here for backwards-compatibility.
+ base_name = os.fspath(base_name)
+ kwargs['root_dir'] = root_dir
+ else:
+ save_cwd = os.getcwd()
+ if logger is not None:
+ logger.debug("changing into '%s'", root_dir)
+ base_name = os.path.abspath(base_name)
+ if not dry_run:
+ os.chdir(root_dir)
try:
filename = func(base_name, base_dir, **kwargs)
finally:
- if root_dir is not None:
+ if save_cwd is not None:
if logger is not None:
logger.debug("changing back to '%s'", save_cwd)
os.chdir(save_cwd)
@@ -1202,7 +1231,7 @@ def _unpack_zipfile(filename, extract_dir):
finally:
zip.close()
-def _unpack_tarfile(filename, extract_dir):
+def _unpack_tarfile(filename, extract_dir, *, filter=None):
"""Unpack tar/tar.gz/tar.bz2/tar.xz `filename` to `extract_dir`
"""
import tarfile # late import for breaking circular dependency
@@ -1212,10 +1241,15 @@ def _unpack_tarfile(filename, extract_dir):
raise ReadError(
"%s is not a compressed or uncompressed tar file" % filename)
try:
- tarobj.extractall(extract_dir)
+ tarobj.extractall(extract_dir, filter=filter)
finally:
tarobj.close()
+# Maps the name of the unpack format to a tuple containing:
+# * extensions
+# * the unpacking function
+# * extra keyword arguments
+# * description
_UNPACK_FORMATS = {
'tar': (['.tar'], _unpack_tarfile, [], "uncompressed tar file"),
'zip': (['.zip'], _unpack_zipfile, [], "ZIP file"),
@@ -1240,7 +1274,7 @@ def _find_unpack_format(filename):
return name
return None
-def unpack_archive(filename, extract_dir=None, format=None):
+def unpack_archive(filename, extract_dir=None, format=None, *, filter=None):
"""Unpack an archive.
`filename` is the name of the archive.
@@ -1254,6 +1288,9 @@ def unpack_archive(filename, extract_dir=None, format=None):
was registered for that extension.
In case none is found, a ValueError is raised.
+
+ If `filter` is given, it is passed to the underlying
+ extraction function.
"""
sys.audit("shutil.unpack_archive", filename, extract_dir, format)
@@ -1263,6 +1300,10 @@ def unpack_archive(filename, extract_dir=None, format=None):
extract_dir = os.fspath(extract_dir)
filename = os.fspath(filename)
+ if filter is None:
+ filter_kwargs = {}
+ else:
+ filter_kwargs = {'filter': filter}
if format is not None:
try:
format_info = _UNPACK_FORMATS[format]
@@ -1270,7 +1311,7 @@ def unpack_archive(filename, extract_dir=None, format=None):
raise ValueError("Unknown unpack format '{0}'".format(format)) from None
func = format_info[1]
- func(filename, extract_dir, **dict(format_info[2]))
+ func(filename, extract_dir, **dict(format_info[2]), **filter_kwargs)
else:
# we need to look at the registered unpackers supported extensions
format = _find_unpack_format(filename)
@@ -1278,7 +1319,7 @@ def unpack_archive(filename, extract_dir=None, format=None):
raise ReadError("Unknown archive format '{0}'".format(filename))
func = _UNPACK_FORMATS[format][1]
- kwargs = dict(_UNPACK_FORMATS[format][2])
+ kwargs = dict(_UNPACK_FORMATS[format][2]) | filter_kwargs
func(filename, extract_dir, **kwargs)
diff --git a/Lib/site.py b/Lib/site.py
index b11cd48e69e9a8..69670d9d7f2230 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -266,8 +266,8 @@ def _getuserbase():
if env_base:
return env_base
- # VxWorks has no home directories
- if sys.platform == "vxworks":
+ # Emscripten, VxWorks, and WASI have no home directories
+ if sys.platform in {"emscripten", "vxworks", "wasi"}:
return None
def joinuser(*args):
diff --git a/Lib/sndhdr.py b/Lib/sndhdr.py
index 98a783448239a8..45def9ad16d32c 100644
--- a/Lib/sndhdr.py
+++ b/Lib/sndhdr.py
@@ -77,6 +77,7 @@ def whathdr(filename):
tests = []
def test_aifc(h, f):
+ """AIFC and AIFF files"""
with warnings.catch_warnings():
warnings.simplefilter('ignore', category=DeprecationWarning)
import aifc
@@ -100,6 +101,7 @@ def test_aifc(h, f):
def test_au(h, f):
+ """AU and SND files"""
if h.startswith(b'.snd'):
func = get_long_be
elif h[:4] in (b'\0ds.', b'dns.'):
@@ -133,6 +135,7 @@ def test_au(h, f):
def test_hcom(h, f):
+ """HCOM file"""
if h[65:69] != b'FSSD' or h[128:132] != b'HCOM':
return None
divisor = get_long_be(h[144:148])
@@ -146,6 +149,7 @@ def test_hcom(h, f):
def test_voc(h, f):
+ """VOC file"""
if not h.startswith(b'Creative Voice File\032'):
return None
sbseek = get_short_le(h[20:22])
@@ -160,6 +164,7 @@ def test_voc(h, f):
def test_wav(h, f):
+ """WAV file"""
import wave
# 'RIFF' 'WAVE' 'fmt '
if not h.startswith(b'RIFF') or h[8:12] != b'WAVE' or h[12:16] != b'fmt ':
@@ -176,6 +181,7 @@ def test_wav(h, f):
def test_8svx(h, f):
+ """8SVX file"""
if not h.startswith(b'FORM') or h[8:12] != b'8SVX':
return None
# Should decode it to get #channels -- assume always 1
@@ -185,6 +191,7 @@ def test_8svx(h, f):
def test_sndt(h, f):
+ """SNDT file"""
if h.startswith(b'SOUND'):
nsamples = get_long_le(h[8:12])
rate = get_short_le(h[20:22])
@@ -194,6 +201,7 @@ def test_sndt(h, f):
def test_sndr(h, f):
+ """SNDR file"""
if h.startswith(b'\0\0'):
rate = get_short_le(h[2:4])
if 4000 <= rate <= 25000:
diff --git a/Lib/socket.py b/Lib/socket.py
old mode 100755
new mode 100644
index e08fb620eb1be2..b5d46eb32bda3b
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -122,7 +122,7 @@ def _intenum_converter(value, enum_klass):
errorTab[10014] = "A fault occurred on the network??" # WSAEFAULT
errorTab[10022] = "An invalid operation was attempted."
errorTab[10024] = "Too many open files."
- errorTab[10035] = "The socket operation would block"
+ errorTab[10035] = "The socket operation would block."
errorTab[10036] = "A blocking operation is already in progress."
errorTab[10037] = "Operation already in progress."
errorTab[10038] = "Socket operation on nonsocket."
@@ -254,17 +254,18 @@ def __repr__(self):
self.type,
self.proto)
if not closed:
+ # getsockname and getpeername may not be available on WASI.
try:
laddr = self.getsockname()
if laddr:
s += ", laddr=%s" % str(laddr)
- except error:
+ except (error, AttributeError):
pass
try:
raddr = self.getpeername()
if raddr:
s += ", raddr=%s" % str(raddr)
- except error:
+ except (error, AttributeError):
pass
s += '>'
return s
@@ -783,11 +784,11 @@ def getfqdn(name=''):
First the hostname returned by gethostbyaddr() is checked, then
possibly existing aliases. In case no FQDN is available and `name`
- was given, it is returned unchanged. If `name` was empty or '0.0.0.0',
+ was given, it is returned unchanged. If `name` was empty, '0.0.0.0' or '::',
hostname from gethostname() is returned.
"""
name = name.strip()
- if not name or name == '0.0.0.0':
+ if not name or name in ('0.0.0.0', '::'):
name = gethostname()
try:
hostname, aliases, ipaddrs = gethostbyaddr(name)
@@ -908,7 +909,7 @@ def create_server(address, *, family=AF_INET, backlog=None, reuse_port=False,
# address, effectively preventing this one from accepting
# connections. Also, it may set the process in a state where
# it'll no longer respond to any signals or graceful kills.
- # See: msdn2.microsoft.com/en-us/library/ms740621(VS.85).aspx
+ # See: https://learn.microsoft.com/windows/win32/winsock/using-so-reuseaddr-and-so-exclusiveaddruse
if os.name not in ('nt', 'cygwin') and \
hasattr(_socket, 'SO_REUSEADDR'):
try:
diff --git a/Lib/sqlite3/dump.py b/Lib/sqlite3/dump.py
index de9c368be3014e..07b9da10b920f9 100644
--- a/Lib/sqlite3/dump.py
+++ b/Lib/sqlite3/dump.py
@@ -28,9 +28,16 @@ def _iterdump(connection):
ORDER BY "name"
"""
schema_res = cu.execute(q)
+ sqlite_sequence = []
for table_name, type, sql in schema_res.fetchall():
if table_name == 'sqlite_sequence':
- yield('DELETE FROM "sqlite_sequence";')
+ rows = cu.execute('SELECT * FROM "sqlite_sequence";').fetchall()
+ sqlite_sequence = ['DELETE FROM "sqlite_sequence"']
+ sqlite_sequence += [
+ f'INSERT INTO "sqlite_sequence" VALUES(\'{row[0]}\',{row[1]})'
+ for row in rows
+ ]
+ continue
elif table_name == 'sqlite_stat1':
yield('ANALYZE "sqlite_master";')
elif table_name.startswith('sqlite_'):
@@ -67,4 +74,9 @@ def _iterdump(connection):
for name, type, sql in schema_res.fetchall():
yield('{0};'.format(sql))
+ # gh-79009: Yield statements concerning the sqlite_sequence table at the
+ # end of the transaction.
+ for row in sqlite_sequence:
+ yield('{0};'.format(row))
+
yield('COMMIT;')
diff --git a/Lib/statistics.py b/Lib/statistics.py
index 54f4e132651897..3b3b43babb42e2 100644
--- a/Lib/statistics.py
+++ b/Lib/statistics.py
@@ -298,7 +298,7 @@ def _exact_ratio(x):
# The integer ratios for binary floats can have numerators or
# denominators with over 300 decimal digits. The problem is more
- # acute with decimal floats where the the default decimal context
+ # acute with decimal floats where the default decimal context
# supports a huge range of exponents from Emin=-999999 to
# Emax=999999. When expanded with as_integer_ratio(), numbers like
# Decimal('3.14E+5000') and Decimal('3.14E-5000') have large
@@ -611,7 +611,7 @@ def median_high(data):
return data[n // 2]
-def median_grouped(data, interval=1):
+def median_grouped(data, interval=1.0):
"""Estimates the median for numeric data binned around the midpoints
of consecutive, fixed-width intervals.
@@ -650,35 +650,34 @@ def median_grouped(data, interval=1):
by exact multiples of *interval*. This is essential for getting a
correct result. The function does not check this precondition.
+ Inputs may be any numeric type that can be coerced to a float during
+ the interpolation step.
+
"""
data = sorted(data)
n = len(data)
- if n == 0:
+ if not n:
raise StatisticsError("no median for empty data")
- elif n == 1:
- return data[0]
# Find the value at the midpoint. Remember this corresponds to the
# midpoint of the class interval.
x = data[n // 2]
- # Generate a clear error message for non-numeric data
- for obj in (x, interval):
- if isinstance(obj, (str, bytes)):
- raise TypeError(f'expected a number but got {obj!r}')
-
# Using O(log n) bisection, find where all the x values occur in the data.
# All x will lie within data[i:j].
i = bisect_left(data, x)
j = bisect_right(data, x, lo=i)
+ # Coerce to floats, raising a TypeError if not possible
+ try:
+ interval = float(interval)
+ x = float(x)
+ except ValueError:
+ raise TypeError(f'Value cannot be converted to a float')
+
# Interpolate the median using the formula found at:
# https://www.cuemath.com/data/median-of-grouped-data/
- try:
- L = x - interval / 2 # The lower limit of the median interval.
- except TypeError:
- # Coerce mixed types to float.
- L = float(x) - float(interval) / 2
+ L = x - interval / 2.0 # Lower limit of the median interval
cf = i # Cumulative frequency of the preceding interval
f = j - i # Number of elements in the median internal
return L + interval * (n / 2 - cf) / f
@@ -1383,3 +1382,9 @@ def __hash__(self):
def __repr__(self):
return f'{type(self).__name__}(mu={self._mu!r}, sigma={self._sigma!r})'
+
+ def __getstate__(self):
+ return self._mu, self._sigma
+
+ def __setstate__(self, state):
+ self._mu, self._sigma = state
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 6e61cc2e5e7b08..fbc76b8d0f14b2 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -74,6 +74,9 @@
else:
_mswindows = True
+# wasm32-emscripten and wasm32-wasi do not support processes
+_can_fork_exec = sys.platform not in {"emscripten", "wasi"}
+
if _mswindows:
import _winapi
from _winapi import (CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP,
@@ -97,13 +100,21 @@
"CREATE_NO_WINDOW", "DETACHED_PROCESS",
"CREATE_DEFAULT_ERROR_MODE", "CREATE_BREAKAWAY_FROM_JOB"])
else:
- if sys.platform in {"emscripten", "wasi"}:
- def _fork_exec(*args, **kwargs):
- raise OSError(
- errno.ENOTSUP, f"{sys.platform} does not support processes."
- )
- else:
+ if _can_fork_exec:
from _posixsubprocess import fork_exec as _fork_exec
+ # used in methods that are called by __del__
+ _waitpid = os.waitpid
+ _waitstatus_to_exitcode = os.waitstatus_to_exitcode
+ _WIFSTOPPED = os.WIFSTOPPED
+ _WSTOPSIG = os.WSTOPSIG
+ _WNOHANG = os.WNOHANG
+ else:
+ _fork_exec = None
+ _waitpid = None
+ _waitstatus_to_exitcode = None
+ _WIFSTOPPED = None
+ _WSTOPSIG = None
+ _WNOHANG = None
import select
import selectors
@@ -445,7 +456,8 @@ def check_output(*popenargs, timeout=None, **kwargs):
if 'input' in kwargs and kwargs['input'] is None:
# Explicitly passing input=None was previously equivalent to passing an
# empty string. That is maintained here for backwards compatibility.
- if kwargs.get('universal_newlines') or kwargs.get('text'):
+ if kwargs.get('universal_newlines') or kwargs.get('text') or kwargs.get('encoding') \
+ or kwargs.get('errors'):
empty = ''
else:
empty = b''
@@ -497,7 +509,8 @@ def run(*popenargs,
The returned instance will have attributes args, returncode, stdout and
stderr. By default, stdout and stderr are not captured, and those attributes
- will be None. Pass stdout=PIPE and/or stderr=PIPE in order to capture them.
+ will be None. Pass stdout=PIPE and/or stderr=PIPE in order to capture them,
+ or pass capture_output=True to capture both.
If check is True and the exit code was non-zero, it raises a
CalledProcessError. The CalledProcessError object will have the return code
@@ -801,6 +814,11 @@ def __init__(self, args, bufsize=-1, executable=None,
encoding=None, errors=None, text=None, umask=-1, pipesize=-1,
process_group=None):
"""Create new Popen instance."""
+ if not _can_fork_exec:
+ raise OSError(
+ errno.ENOTSUP, f"{sys.platform} does not support processes."
+ )
+
_cleanup()
# Held while anything is calling waitpid before returncode has been
# updated to prevent clobbering returncode if wait() or poll() are
@@ -854,37 +872,6 @@ def __init__(self, args, bufsize=-1, executable=None,
'and universal_newlines are supplied but '
'different. Pass one or the other.')
- # Input and output objects. The general principle is like
- # this:
- #
- # Parent Child
- # ------ -----
- # p2cwrite ---stdin---> p2cread
- # c2pread <--stdout--- c2pwrite
- # errread <--stderr--- errwrite
- #
- # On POSIX, the child objects are file descriptors. On
- # Windows, these are Windows file handles. The parent objects
- # are file descriptors on both platforms. The parent objects
- # are -1 when not using PIPEs. The child objects are -1
- # when not redirecting.
-
- (p2cread, p2cwrite,
- c2pread, c2pwrite,
- errread, errwrite) = self._get_handles(stdin, stdout, stderr)
-
- # We wrap OS handles *before* launching the child, otherwise a
- # quickly terminating child could make our fds unwrappable
- # (see #8458).
-
- if _mswindows:
- if p2cwrite != -1:
- p2cwrite = msvcrt.open_osfhandle(p2cwrite.Detach(), 0)
- if c2pread != -1:
- c2pread = msvcrt.open_osfhandle(c2pread.Detach(), 0)
- if errread != -1:
- errread = msvcrt.open_osfhandle(errread.Detach(), 0)
-
self.text_mode = encoding or errors or text or universal_newlines
if self.text_mode and encoding is None:
self.encoding = encoding = _text_encoding()
@@ -985,6 +972,39 @@ def __init__(self, args, bufsize=-1, executable=None,
if uid < 0:
raise ValueError(f"User ID cannot be negative, got {uid}")
+ # Input and output objects. The general principle is like
+ # this:
+ #
+ # Parent Child
+ # ------ -----
+ # p2cwrite ---stdin---> p2cread
+ # c2pread <--stdout--- c2pwrite
+ # errread <--stderr--- errwrite
+ #
+ # On POSIX, the child objects are file descriptors. On
+ # Windows, these are Windows file handles. The parent objects
+ # are file descriptors on both platforms. The parent objects
+ # are -1 when not using PIPEs. The child objects are -1
+ # when not redirecting.
+
+ (p2cread, p2cwrite,
+ c2pread, c2pwrite,
+ errread, errwrite) = self._get_handles(stdin, stdout, stderr)
+
+ # From here on, raising exceptions may cause file descriptor leakage
+
+ # We wrap OS handles *before* launching the child, otherwise a
+ # quickly terminating child could make our fds unwrappable
+ # (see #8458).
+
+ if _mswindows:
+ if p2cwrite != -1:
+ p2cwrite = msvcrt.open_osfhandle(p2cwrite.Detach(), 0)
+ if c2pread != -1:
+ c2pread = msvcrt.open_osfhandle(c2pread.Detach(), 0)
+ if errread != -1:
+ errread = msvcrt.open_osfhandle(errread.Detach(), 0)
+
try:
if p2cwrite != -1:
self.stdin = io.open(p2cwrite, 'wb', bufsize)
@@ -1288,6 +1308,26 @@ def _close_pipe_fds(self,
# Prevent a double close of these handles/fds from __init__ on error.
self._closed_child_pipe_fds = True
+ @contextlib.contextmanager
+ def _on_error_fd_closer(self):
+ """Helper to ensure file descriptors opened in _get_handles are closed"""
+ to_close = []
+ try:
+ yield to_close
+ except:
+ if hasattr(self, '_devnull'):
+ to_close.append(self._devnull)
+ del self._devnull
+ for fd in to_close:
+ try:
+ if _mswindows and isinstance(fd, Handle):
+ fd.Close()
+ else:
+ os.close(fd)
+ except OSError:
+ pass
+ raise
+
if _mswindows:
#
# Windows methods
@@ -1303,61 +1343,68 @@ def _get_handles(self, stdin, stdout, stderr):
c2pread, c2pwrite = -1, -1
errread, errwrite = -1, -1
- if stdin is None:
- p2cread = _winapi.GetStdHandle(_winapi.STD_INPUT_HANDLE)
- if p2cread is None:
- p2cread, _ = _winapi.CreatePipe(None, 0)
- p2cread = Handle(p2cread)
- _winapi.CloseHandle(_)
- elif stdin == PIPE:
- p2cread, p2cwrite = _winapi.CreatePipe(None, 0)
- p2cread, p2cwrite = Handle(p2cread), Handle(p2cwrite)
- elif stdin == DEVNULL:
- p2cread = msvcrt.get_osfhandle(self._get_devnull())
- elif isinstance(stdin, int):
- p2cread = msvcrt.get_osfhandle(stdin)
- else:
- # Assuming file-like object
- p2cread = msvcrt.get_osfhandle(stdin.fileno())
- p2cread = self._make_inheritable(p2cread)
-
- if stdout is None:
- c2pwrite = _winapi.GetStdHandle(_winapi.STD_OUTPUT_HANDLE)
- if c2pwrite is None:
- _, c2pwrite = _winapi.CreatePipe(None, 0)
- c2pwrite = Handle(c2pwrite)
- _winapi.CloseHandle(_)
- elif stdout == PIPE:
- c2pread, c2pwrite = _winapi.CreatePipe(None, 0)
- c2pread, c2pwrite = Handle(c2pread), Handle(c2pwrite)
- elif stdout == DEVNULL:
- c2pwrite = msvcrt.get_osfhandle(self._get_devnull())
- elif isinstance(stdout, int):
- c2pwrite = msvcrt.get_osfhandle(stdout)
- else:
- # Assuming file-like object
- c2pwrite = msvcrt.get_osfhandle(stdout.fileno())
- c2pwrite = self._make_inheritable(c2pwrite)
-
- if stderr is None:
- errwrite = _winapi.GetStdHandle(_winapi.STD_ERROR_HANDLE)
- if errwrite is None:
- _, errwrite = _winapi.CreatePipe(None, 0)
- errwrite = Handle(errwrite)
- _winapi.CloseHandle(_)
- elif stderr == PIPE:
- errread, errwrite = _winapi.CreatePipe(None, 0)
- errread, errwrite = Handle(errread), Handle(errwrite)
- elif stderr == STDOUT:
- errwrite = c2pwrite
- elif stderr == DEVNULL:
- errwrite = msvcrt.get_osfhandle(self._get_devnull())
- elif isinstance(stderr, int):
- errwrite = msvcrt.get_osfhandle(stderr)
- else:
- # Assuming file-like object
- errwrite = msvcrt.get_osfhandle(stderr.fileno())
- errwrite = self._make_inheritable(errwrite)
+ with self._on_error_fd_closer() as err_close_fds:
+ if stdin is None:
+ p2cread = _winapi.GetStdHandle(_winapi.STD_INPUT_HANDLE)
+ if p2cread is None:
+ p2cread, _ = _winapi.CreatePipe(None, 0)
+ p2cread = Handle(p2cread)
+ err_close_fds.append(p2cread)
+ _winapi.CloseHandle(_)
+ elif stdin == PIPE:
+ p2cread, p2cwrite = _winapi.CreatePipe(None, 0)
+ p2cread, p2cwrite = Handle(p2cread), Handle(p2cwrite)
+ err_close_fds.extend((p2cread, p2cwrite))
+ elif stdin == DEVNULL:
+ p2cread = msvcrt.get_osfhandle(self._get_devnull())
+ elif isinstance(stdin, int):
+ p2cread = msvcrt.get_osfhandle(stdin)
+ else:
+ # Assuming file-like object
+ p2cread = msvcrt.get_osfhandle(stdin.fileno())
+ p2cread = self._make_inheritable(p2cread)
+
+ if stdout is None:
+ c2pwrite = _winapi.GetStdHandle(_winapi.STD_OUTPUT_HANDLE)
+ if c2pwrite is None:
+ _, c2pwrite = _winapi.CreatePipe(None, 0)
+ c2pwrite = Handle(c2pwrite)
+ err_close_fds.append(c2pwrite)
+ _winapi.CloseHandle(_)
+ elif stdout == PIPE:
+ c2pread, c2pwrite = _winapi.CreatePipe(None, 0)
+ c2pread, c2pwrite = Handle(c2pread), Handle(c2pwrite)
+ err_close_fds.extend((c2pread, c2pwrite))
+ elif stdout == DEVNULL:
+ c2pwrite = msvcrt.get_osfhandle(self._get_devnull())
+ elif isinstance(stdout, int):
+ c2pwrite = msvcrt.get_osfhandle(stdout)
+ else:
+ # Assuming file-like object
+ c2pwrite = msvcrt.get_osfhandle(stdout.fileno())
+ c2pwrite = self._make_inheritable(c2pwrite)
+
+ if stderr is None:
+ errwrite = _winapi.GetStdHandle(_winapi.STD_ERROR_HANDLE)
+ if errwrite is None:
+ _, errwrite = _winapi.CreatePipe(None, 0)
+ errwrite = Handle(errwrite)
+ err_close_fds.append(errwrite)
+ _winapi.CloseHandle(_)
+ elif stderr == PIPE:
+ errread, errwrite = _winapi.CreatePipe(None, 0)
+ errread, errwrite = Handle(errread), Handle(errwrite)
+ err_close_fds.extend((errread, errwrite))
+ elif stderr == STDOUT:
+ errwrite = c2pwrite
+ elif stderr == DEVNULL:
+ errwrite = msvcrt.get_osfhandle(self._get_devnull())
+ elif isinstance(stderr, int):
+ errwrite = msvcrt.get_osfhandle(stderr)
+ else:
+ # Assuming file-like object
+ errwrite = msvcrt.get_osfhandle(stderr.fileno())
+ errwrite = self._make_inheritable(errwrite)
return (p2cread, p2cwrite,
c2pread, c2pwrite,
@@ -1462,7 +1509,23 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
if shell:
startupinfo.dwFlags |= _winapi.STARTF_USESHOWWINDOW
startupinfo.wShowWindow = _winapi.SW_HIDE
- comspec = os.environ.get("COMSPEC", "cmd.exe")
+ if not executable:
+ # gh-101283: without a fully-qualified path, before Windows
+ # checks the system directories, it first looks in the
+ # application directory, and also the current directory if
+ # NeedCurrentDirectoryForExePathW(ExeName) is true, so try
+ # to avoid executing unqualified "cmd.exe".
+ comspec = os.environ.get('ComSpec')
+ if not comspec:
+ system_root = os.environ.get('SystemRoot', '')
+ comspec = os.path.join(system_root, 'System32', 'cmd.exe')
+ if not os.path.isabs(comspec):
+ raise FileNotFoundError('shell not found: neither %ComSpec% nor %SystemRoot% is set')
+ if os.path.isabs(comspec):
+ executable = comspec
+ else:
+ comspec = executable
+
args = '{} /c "{}"'.format (comspec, args)
if cwd is not None:
@@ -1628,52 +1691,56 @@ def _get_handles(self, stdin, stdout, stderr):
c2pread, c2pwrite = -1, -1
errread, errwrite = -1, -1
- if stdin is None:
- pass
- elif stdin == PIPE:
- p2cread, p2cwrite = os.pipe()
- if self.pipesize > 0 and hasattr(fcntl, "F_SETPIPE_SZ"):
- fcntl.fcntl(p2cwrite, fcntl.F_SETPIPE_SZ, self.pipesize)
- elif stdin == DEVNULL:
- p2cread = self._get_devnull()
- elif isinstance(stdin, int):
- p2cread = stdin
- else:
- # Assuming file-like object
- p2cread = stdin.fileno()
+ with self._on_error_fd_closer() as err_close_fds:
+ if stdin is None:
+ pass
+ elif stdin == PIPE:
+ p2cread, p2cwrite = os.pipe()
+ err_close_fds.extend((p2cread, p2cwrite))
+ if self.pipesize > 0 and hasattr(fcntl, "F_SETPIPE_SZ"):
+ fcntl.fcntl(p2cwrite, fcntl.F_SETPIPE_SZ, self.pipesize)
+ elif stdin == DEVNULL:
+ p2cread = self._get_devnull()
+ elif isinstance(stdin, int):
+ p2cread = stdin
+ else:
+ # Assuming file-like object
+ p2cread = stdin.fileno()
- if stdout is None:
- pass
- elif stdout == PIPE:
- c2pread, c2pwrite = os.pipe()
- if self.pipesize > 0 and hasattr(fcntl, "F_SETPIPE_SZ"):
- fcntl.fcntl(c2pwrite, fcntl.F_SETPIPE_SZ, self.pipesize)
- elif stdout == DEVNULL:
- c2pwrite = self._get_devnull()
- elif isinstance(stdout, int):
- c2pwrite = stdout
- else:
- # Assuming file-like object
- c2pwrite = stdout.fileno()
+ if stdout is None:
+ pass
+ elif stdout == PIPE:
+ c2pread, c2pwrite = os.pipe()
+ err_close_fds.extend((c2pread, c2pwrite))
+ if self.pipesize > 0 and hasattr(fcntl, "F_SETPIPE_SZ"):
+ fcntl.fcntl(c2pwrite, fcntl.F_SETPIPE_SZ, self.pipesize)
+ elif stdout == DEVNULL:
+ c2pwrite = self._get_devnull()
+ elif isinstance(stdout, int):
+ c2pwrite = stdout
+ else:
+ # Assuming file-like object
+ c2pwrite = stdout.fileno()
- if stderr is None:
- pass
- elif stderr == PIPE:
- errread, errwrite = os.pipe()
- if self.pipesize > 0 and hasattr(fcntl, "F_SETPIPE_SZ"):
- fcntl.fcntl(errwrite, fcntl.F_SETPIPE_SZ, self.pipesize)
- elif stderr == STDOUT:
- if c2pwrite != -1:
- errwrite = c2pwrite
- else: # child's stdout is not set, use parent's stdout
- errwrite = sys.__stdout__.fileno()
- elif stderr == DEVNULL:
- errwrite = self._get_devnull()
- elif isinstance(stderr, int):
- errwrite = stderr
- else:
- # Assuming file-like object
- errwrite = stderr.fileno()
+ if stderr is None:
+ pass
+ elif stderr == PIPE:
+ errread, errwrite = os.pipe()
+ err_close_fds.extend((errread, errwrite))
+ if self.pipesize > 0 and hasattr(fcntl, "F_SETPIPE_SZ"):
+ fcntl.fcntl(errwrite, fcntl.F_SETPIPE_SZ, self.pipesize)
+ elif stderr == STDOUT:
+ if c2pwrite != -1:
+ errwrite = c2pwrite
+ else: # child's stdout is not set, use parent's stdout
+ errwrite = sys.__stdout__.fileno()
+ elif stderr == DEVNULL:
+ errwrite = self._get_devnull()
+ elif isinstance(stderr, int):
+ errwrite = stderr
+ else:
+ # Assuming file-like object
+ errwrite = stderr.fileno()
return (p2cread, p2cwrite,
c2pread, c2pwrite,
@@ -1885,19 +1952,19 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
def _handle_exitstatus(self, sts,
- waitstatus_to_exitcode=os.waitstatus_to_exitcode,
- _WIFSTOPPED=os.WIFSTOPPED,
- _WSTOPSIG=os.WSTOPSIG):
+ _waitstatus_to_exitcode=_waitstatus_to_exitcode,
+ _WIFSTOPPED=_WIFSTOPPED,
+ _WSTOPSIG=_WSTOPSIG):
"""All callers to this function MUST hold self._waitpid_lock."""
# This method is called (indirectly) by __del__, so it cannot
# refer to anything outside of its local scope.
if _WIFSTOPPED(sts):
self.returncode = -_WSTOPSIG(sts)
else:
- self.returncode = waitstatus_to_exitcode(sts)
+ self.returncode = _waitstatus_to_exitcode(sts)
- def _internal_poll(self, _deadstate=None, _waitpid=os.waitpid,
- _WNOHANG=os.WNOHANG, _ECHILD=errno.ECHILD):
+ def _internal_poll(self, _deadstate=None, _waitpid=_waitpid,
+ _WNOHANG=_WNOHANG, _ECHILD=errno.ECHILD):
"""Check if child process has terminated. Returns returncode
attribute.
diff --git a/Lib/symtable.py b/Lib/symtable.py
index 75ff0921f4c0db..5dd71ffc6b4f19 100644
--- a/Lib/symtable.py
+++ b/Lib/symtable.py
@@ -111,7 +111,7 @@ def has_children(self):
return bool(self._table.children)
def get_identifiers(self):
- """Return a list of names of symbols in the table.
+ """Return a view object containing the names of symbols in the table.
"""
return self._table.symbols.keys()
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index e21b7303fecc6b..ebe37118274222 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -111,8 +111,8 @@ def _getuserbase():
if env_base:
return env_base
- # VxWorks has no home directories
- if sys.platform == "vxworks":
+ # Emscripten, VxWorks, and WASI have no home directories
+ if sys.platform in {"emscripten", "vxworks", "wasi"}:
return None
def joinuser(*args):
@@ -195,37 +195,38 @@ def _safe_realpath(path):
# unable to retrieve the real program name
_PROJECT_BASE = _safe_realpath(os.getcwd())
-if (os.name == 'nt' and
- _PROJECT_BASE.lower().endswith(('\\pcbuild\\win32', '\\pcbuild\\amd64'))):
- _PROJECT_BASE = _safe_realpath(os.path.join(_PROJECT_BASE, pardir, pardir))
+# In a virtual environment, `sys._home` gives us the target directory
+# `_PROJECT_BASE` for the executable that created it when the virtual
+# python is an actual executable ('venv --copies' or Windows).
+_sys_home = getattr(sys, '_home', None)
+if _sys_home:
+ _PROJECT_BASE = _sys_home
+
+if os.name == 'nt':
+ # In a source build, the executable is in a subdirectory of the root
+ # that we want (\PCbuild\).
+ # `_BASE_PREFIX` is used as the base installation is where the source
+ # will be. The realpath is needed to prevent mount point confusion
+ # that can occur with just string comparisons.
+ if _safe_realpath(_PROJECT_BASE).startswith(
+ _safe_realpath(f'{_BASE_PREFIX}\\PCbuild')):
+ _PROJECT_BASE = _BASE_PREFIX
# set for cross builds
if "_PYTHON_PROJECT_BASE" in os.environ:
_PROJECT_BASE = _safe_realpath(os.environ["_PYTHON_PROJECT_BASE"])
-def _is_python_source_dir(d):
+def is_python_build(check_home=None):
+ if check_home is not None:
+ import warnings
+ warnings.warn("check_home argument is deprecated and ignored.",
+ DeprecationWarning, stacklevel=2)
for fn in ("Setup", "Setup.local"):
- if os.path.isfile(os.path.join(d, "Modules", fn)):
+ if os.path.isfile(os.path.join(_PROJECT_BASE, "Modules", fn)):
return True
return False
-_sys_home = getattr(sys, '_home', None)
-
-if os.name == 'nt':
- def _fix_pcbuild(d):
- if d and os.path.normcase(d).startswith(
- os.path.normcase(os.path.join(_PREFIX, "PCbuild"))):
- return _PREFIX
- return d
- _PROJECT_BASE = _fix_pcbuild(_PROJECT_BASE)
- _sys_home = _fix_pcbuild(_sys_home)
-
-def is_python_build(check_home=False):
- if check_home and _sys_home:
- return _is_python_source_dir(_sys_home)
- return _is_python_source_dir(_PROJECT_BASE)
-
-_PYTHON_BUILD = is_python_build(True)
+_PYTHON_BUILD = is_python_build()
if _PYTHON_BUILD:
for scheme in ('posix_prefix', 'posix_home'):
@@ -442,7 +443,7 @@ def _parse_makefile(filename, vars=None, keep_unresolved=True):
def get_makefile_filename():
"""Return the path of the Makefile."""
if _PYTHON_BUILD:
- return os.path.join(_sys_home or _PROJECT_BASE, "Makefile")
+ return os.path.join(_PROJECT_BASE, "Makefile")
if hasattr(sys, 'abiflags'):
config_dir_name = f'config-{_PY_VERSION_SHORT}{sys.abiflags}'
else:
@@ -587,9 +588,9 @@ def get_config_h_filename():
"""Return the path of pyconfig.h."""
if _PYTHON_BUILD:
if os.name == "nt":
- inc_dir = os.path.join(_sys_home or _PROJECT_BASE, "PC")
+ inc_dir = os.path.join(_PROJECT_BASE, "PC")
else:
- inc_dir = _sys_home or _PROJECT_BASE
+ inc_dir = _PROJECT_BASE
else:
inc_dir = get_path('platinclude')
return os.path.join(inc_dir, 'pyconfig.h')
diff --git a/Lib/tabnanny.py b/Lib/tabnanny.py
index 7973f26f98b8b2..a47f5a96b89722 100755
--- a/Lib/tabnanny.py
+++ b/Lib/tabnanny.py
@@ -23,8 +23,6 @@
import os
import sys
import tokenize
-if not hasattr(tokenize, 'NL'):
- raise ValueError("tokenize.NL doesn't exist -- tokenize module too old")
__all__ = ["check", "NannyNag", "process_tokens"]
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
index 8d43d0da7b9880..130b5e0f45dcd5 100755
--- a/Lib/tarfile.py
+++ b/Lib/tarfile.py
@@ -46,6 +46,7 @@
import struct
import copy
import re
+import warnings
try:
import pwd
@@ -71,6 +72,7 @@
"ENCODING", "USTAR_FORMAT", "GNU_FORMAT", "PAX_FORMAT",
"DEFAULT_FORMAT", "open"]
+
#---------------------------------------------------------
# tar constants
#---------------------------------------------------------
@@ -158,6 +160,8 @@
def stn(s, length, encoding, errors):
"""Convert a string to a null-terminated bytes object.
"""
+ if s is None:
+ raise ValueError("metadata cannot contain None")
s = s.encode(encoding, errors)
return s[:length] + (length - len(s)) * NUL
@@ -709,9 +713,127 @@ def __init__(self, tarfile, tarinfo):
super().__init__(fileobj)
#class ExFileObject
+
+#-----------------------------
+# extraction filters (PEP 706)
+#-----------------------------
+
+class FilterError(TarError):
+ pass
+
+class AbsolutePathError(FilterError):
+ def __init__(self, tarinfo):
+ self.tarinfo = tarinfo
+ super().__init__(f'member {tarinfo.name!r} has an absolute path')
+
+class OutsideDestinationError(FilterError):
+ def __init__(self, tarinfo, path):
+ self.tarinfo = tarinfo
+ self._path = path
+ super().__init__(f'{tarinfo.name!r} would be extracted to {path!r}, '
+ + 'which is outside the destination')
+
+class SpecialFileError(FilterError):
+ def __init__(self, tarinfo):
+ self.tarinfo = tarinfo
+ super().__init__(f'{tarinfo.name!r} is a special file')
+
+class AbsoluteLinkError(FilterError):
+ def __init__(self, tarinfo):
+ self.tarinfo = tarinfo
+ super().__init__(f'{tarinfo.name!r} is a symlink to an absolute path')
+
+class LinkOutsideDestinationError(FilterError):
+ def __init__(self, tarinfo, path):
+ self.tarinfo = tarinfo
+ self._path = path
+ super().__init__(f'{tarinfo.name!r} would link to {path!r}, '
+ + 'which is outside the destination')
+
+def _get_filtered_attrs(member, dest_path, for_data=True):
+ new_attrs = {}
+ name = member.name
+ dest_path = os.path.realpath(dest_path)
+ # Strip leading / (tar's directory separator) from filenames.
+ # Include os.sep (target OS directory separator) as well.
+ if name.startswith(('/', os.sep)):
+ name = new_attrs['name'] = member.path.lstrip('/' + os.sep)
+ if os.path.isabs(name):
+ # Path is absolute even after stripping.
+ # For example, 'C:/foo' on Windows.
+ raise AbsolutePathError(member)
+ # Ensure we stay in the destination
+ target_path = os.path.realpath(os.path.join(dest_path, name))
+ if os.path.commonpath([target_path, dest_path]) != dest_path:
+ raise OutsideDestinationError(member, target_path)
+ # Limit permissions (no high bits, and go-w)
+ mode = member.mode
+ if mode is not None:
+ # Strip high bits & group/other write bits
+ mode = mode & 0o755
+ if for_data:
+ # For data, handle permissions & file types
+ if member.isreg() or member.islnk():
+ if not mode & 0o100:
+ # Clear executable bits if not executable by user
+ mode &= ~0o111
+ # Ensure owner can read & write
+ mode |= 0o600
+ elif member.isdir() or member.issym():
+ # Ignore mode for directories & symlinks
+ mode = None
+ else:
+ # Reject special files
+ raise SpecialFileError(member)
+ if mode != member.mode:
+ new_attrs['mode'] = mode
+ if for_data:
+ # Ignore ownership for 'data'
+ if member.uid is not None:
+ new_attrs['uid'] = None
+ if member.gid is not None:
+ new_attrs['gid'] = None
+ if member.uname is not None:
+ new_attrs['uname'] = None
+ if member.gname is not None:
+ new_attrs['gname'] = None
+ # Check link destination for 'data'
+ if member.islnk() or member.issym():
+ if os.path.isabs(member.linkname):
+ raise AbsoluteLinkError(member)
+ target_path = os.path.realpath(os.path.join(dest_path, member.linkname))
+ if os.path.commonpath([target_path, dest_path]) != dest_path:
+ raise LinkOutsideDestinationError(member, target_path)
+ return new_attrs
+
+def fully_trusted_filter(member, dest_path):
+ return member
+
+def tar_filter(member, dest_path):
+ new_attrs = _get_filtered_attrs(member, dest_path, False)
+ if new_attrs:
+ return member.replace(**new_attrs, deep=False)
+ return member
+
+def data_filter(member, dest_path):
+ new_attrs = _get_filtered_attrs(member, dest_path, True)
+ if new_attrs:
+ return member.replace(**new_attrs, deep=False)
+ return member
+
+_NAMED_FILTERS = {
+ "fully_trusted": fully_trusted_filter,
+ "tar": tar_filter,
+ "data": data_filter,
+}
+
#------------------
# Exported Classes
#------------------
+
+# Sentinel for replace() defaults, meaning "don't change the attribute"
+_KEEP = object()
+
class TarInfo(object):
"""Informational class which holds the details about an
archive member given by a tar header block.
@@ -792,12 +914,44 @@ def linkpath(self, linkname):
def __repr__(self):
return "<%s %r at %#x>" % (self.__class__.__name__,self.name,id(self))
+ def replace(self, *,
+ name=_KEEP, mtime=_KEEP, mode=_KEEP, linkname=_KEEP,
+ uid=_KEEP, gid=_KEEP, uname=_KEEP, gname=_KEEP,
+ deep=True, _KEEP=_KEEP):
+ """Return a deep copy of self with the given attributes replaced.
+ """
+ if deep:
+ result = copy.deepcopy(self)
+ else:
+ result = copy.copy(self)
+ if name is not _KEEP:
+ result.name = name
+ if mtime is not _KEEP:
+ result.mtime = mtime
+ if mode is not _KEEP:
+ result.mode = mode
+ if linkname is not _KEEP:
+ result.linkname = linkname
+ if uid is not _KEEP:
+ result.uid = uid
+ if gid is not _KEEP:
+ result.gid = gid
+ if uname is not _KEEP:
+ result.uname = uname
+ if gname is not _KEEP:
+ result.gname = gname
+ return result
+
def get_info(self):
"""Return the TarInfo's attributes as a dictionary.
"""
+ if self.mode is None:
+ mode = None
+ else:
+ mode = self.mode & 0o7777
info = {
"name": self.name,
- "mode": self.mode & 0o7777,
+ "mode": mode,
"uid": self.uid,
"gid": self.gid,
"size": self.size,
@@ -820,6 +974,9 @@ def tobuf(self, format=DEFAULT_FORMAT, encoding=ENCODING, errors="surrogateescap
"""Return a tar header as a string of 512 byte blocks.
"""
info = self.get_info()
+ for name, value in info.items():
+ if value is None:
+ raise ValueError("%s may not be None" % name)
if format == USTAR_FORMAT:
return self.create_ustar_header(info, encoding, errors)
@@ -950,6 +1107,12 @@ def _create_header(info, format, encoding, errors):
devmajor = stn("", 8, encoding, errors)
devminor = stn("", 8, encoding, errors)
+ # None values in metadata should cause ValueError.
+ # itn()/stn() do this for all fields except type.
+ filetype = info.get("type", REGTYPE)
+ if filetype is None:
+ raise ValueError("TarInfo.type must not be None")
+
parts = [
stn(info.get("name", ""), 100, encoding, errors),
itn(info.get("mode", 0) & 0o7777, 8, format),
@@ -958,7 +1121,7 @@ def _create_header(info, format, encoding, errors):
itn(info.get("size", 0), 12, format),
itn(info.get("mtime", 0), 12, format),
b" ", # checksum field
- info.get("type", REGTYPE),
+ filetype,
stn(info.get("linkname", ""), 100, encoding, errors),
info.get("magic", POSIX_MAGIC),
stn(info.get("uname", ""), 32, encoding, errors),
@@ -1163,6 +1326,11 @@ def _proc_builtin(self, tarfile):
# header information.
self._apply_pax_info(tarfile.pax_headers, tarfile.encoding, tarfile.errors)
+ # Remove redundant slashes from directories. This is to be consistent
+ # with frombuf().
+ if self.isdir():
+ self.name = self.name.rstrip("/")
+
return self
def _proc_gnulong(self, tarfile):
@@ -1185,6 +1353,11 @@ def _proc_gnulong(self, tarfile):
elif self.type == GNUTYPE_LONGLINK:
next.linkname = nts(buf, tarfile.encoding, tarfile.errors)
+ # Remove redundant slashes from directories. This is to be consistent
+ # with frombuf().
+ if next.isdir():
+ next.name = next.name.removesuffix("/")
+
return next
def _proc_sparse(self, tarfile):
@@ -1458,6 +1631,8 @@ class TarFile(object):
fileobject = ExFileObject # The file-object for extractfile().
+ extraction_filter = None # The default filter for extraction.
+
def __init__(self, name=None, mode="r", fileobj=None, format=None,
tarinfo=None, dereference=None, ignore_zeros=None, encoding=None,
errors="surrogateescape", pax_headers=None, debug=None,
@@ -1930,7 +2105,10 @@ def list(self, verbose=True, *, members=None):
members = self
for tarinfo in members:
if verbose:
- _safe_print(stat.filemode(tarinfo.mode))
+ if tarinfo.mode is None:
+ _safe_print("??????????")
+ else:
+ _safe_print(stat.filemode(tarinfo.mode))
_safe_print("%s/%s" % (tarinfo.uname or tarinfo.uid,
tarinfo.gname or tarinfo.gid))
if tarinfo.ischr() or tarinfo.isblk():
@@ -1938,8 +2116,11 @@ def list(self, verbose=True, *, members=None):
("%d,%d" % (tarinfo.devmajor, tarinfo.devminor)))
else:
_safe_print("%10d" % tarinfo.size)
- _safe_print("%d-%02d-%02d %02d:%02d:%02d" \
- % time.localtime(tarinfo.mtime)[:6])
+ if tarinfo.mtime is None:
+ _safe_print("????-??-?? ??:??:??")
+ else:
+ _safe_print("%d-%02d-%02d %02d:%02d:%02d" \
+ % time.localtime(tarinfo.mtime)[:6])
_safe_print(tarinfo.name + ("/" if tarinfo.isdir() else ""))
@@ -2026,32 +2207,58 @@ def addfile(self, tarinfo, fileobj=None):
self.members.append(tarinfo)
- def extractall(self, path=".", members=None, *, numeric_owner=False):
+ def _get_filter_function(self, filter):
+ if filter is None:
+ filter = self.extraction_filter
+ if filter is None:
+ return fully_trusted_filter
+ if isinstance(filter, str):
+ raise TypeError(
+ 'String names are not supported for '
+ + 'TarFile.extraction_filter. Use a function such as '
+ + 'tarfile.data_filter directly.')
+ return filter
+ if callable(filter):
+ return filter
+ try:
+ return _NAMED_FILTERS[filter]
+ except KeyError:
+ raise ValueError(f"filter {filter!r} not found") from None
+
+ def extractall(self, path=".", members=None, *, numeric_owner=False,
+ filter=None):
"""Extract all members from the archive to the current working
directory and set owner, modification time and permissions on
directories afterwards. `path' specifies a different directory
to extract to. `members' is optional and must be a subset of the
list returned by getmembers(). If `numeric_owner` is True, only
the numbers for user/group names are used and not the names.
+
+ The `filter` function will be called on each member just
+ before extraction.
+ It can return a changed TarInfo or None to skip the member.
+ String names of common filters are accepted.
"""
directories = []
+ filter_function = self._get_filter_function(filter)
if members is None:
members = self
- for tarinfo in members:
+ for member in members:
+ tarinfo = self._get_extract_tarinfo(member, filter_function, path)
+ if tarinfo is None:
+ continue
if tarinfo.isdir():
- # Extract directories with a safe mode.
+ # For directories, delay setting attributes until later,
+ # since permissions can interfere with extraction and
+ # extracting contents can reset mtime.
directories.append(tarinfo)
- tarinfo = copy.copy(tarinfo)
- tarinfo.mode = 0o700
- # Do not set_attrs directories, as we will do that further down
- self.extract(tarinfo, path, set_attrs=not tarinfo.isdir(),
- numeric_owner=numeric_owner)
+ self._extract_one(tarinfo, path, set_attrs=not tarinfo.isdir(),
+ numeric_owner=numeric_owner)
# Reverse sort directories.
- directories.sort(key=lambda a: a.name)
- directories.reverse()
+ directories.sort(key=lambda a: a.name, reverse=True)
# Set correct owner, mtime and filemode on directories.
for tarinfo in directories:
@@ -2061,12 +2268,10 @@ def extractall(self, path=".", members=None, *, numeric_owner=False):
self.utime(tarinfo, dirpath)
self.chmod(tarinfo, dirpath)
except ExtractError as e:
- if self.errorlevel > 1:
- raise
- else:
- self._dbg(1, "tarfile: %s" % e)
+ self._handle_nonfatal_error(e)
- def extract(self, member, path="", set_attrs=True, *, numeric_owner=False):
+ def extract(self, member, path="", set_attrs=True, *, numeric_owner=False,
+ filter=None):
"""Extract a member from the archive to the current working directory,
using its full name. Its file information is extracted as accurately
as possible. `member' may be a filename or a TarInfo object. You can
@@ -2074,35 +2279,70 @@ def extract(self, member, path="", set_attrs=True, *, numeric_owner=False):
mtime, mode) are set unless `set_attrs' is False. If `numeric_owner`
is True, only the numbers for user/group names are used and not
the names.
+
+ The `filter` function will be called before extraction.
+ It can return a changed TarInfo or None to skip the member.
+ String names of common filters are accepted.
"""
- self._check("r")
+ filter_function = self._get_filter_function(filter)
+ tarinfo = self._get_extract_tarinfo(member, filter_function, path)
+ if tarinfo is not None:
+ self._extract_one(tarinfo, path, set_attrs, numeric_owner)
+ def _get_extract_tarinfo(self, member, filter_function, path):
+ """Get filtered TarInfo (or None) from member, which might be a str"""
if isinstance(member, str):
tarinfo = self.getmember(member)
else:
tarinfo = member
+ unfiltered = tarinfo
+ try:
+ tarinfo = filter_function(tarinfo, path)
+ except (OSError, FilterError) as e:
+ self._handle_fatal_error(e)
+ except ExtractError as e:
+ self._handle_nonfatal_error(e)
+ if tarinfo is None:
+ self._dbg(2, "tarfile: Excluded %r" % unfiltered.name)
+ return None
# Prepare the link target for makelink().
if tarinfo.islnk():
+ tarinfo = copy.copy(tarinfo)
tarinfo._link_target = os.path.join(path, tarinfo.linkname)
+ return tarinfo
+
+ def _extract_one(self, tarinfo, path, set_attrs, numeric_owner):
+ """Extract from filtered tarinfo to disk"""
+ self._check("r")
try:
self._extract_member(tarinfo, os.path.join(path, tarinfo.name),
set_attrs=set_attrs,
numeric_owner=numeric_owner)
except OSError as e:
- if self.errorlevel > 0:
- raise
- else:
- if e.filename is None:
- self._dbg(1, "tarfile: %s" % e.strerror)
- else:
- self._dbg(1, "tarfile: %s %r" % (e.strerror, e.filename))
+ self._handle_fatal_error(e)
except ExtractError as e:
- if self.errorlevel > 1:
- raise
+ self._handle_nonfatal_error(e)
+
+ def _handle_nonfatal_error(self, e):
+ """Handle non-fatal error (ExtractError) according to errorlevel"""
+ if self.errorlevel > 1:
+ raise
+ else:
+ self._dbg(1, "tarfile: %s" % e)
+
+ def _handle_fatal_error(self, e):
+ """Handle "fatal" error according to self.errorlevel"""
+ if self.errorlevel > 0:
+ raise
+ elif isinstance(e, OSError):
+ if e.filename is None:
+ self._dbg(1, "tarfile: %s" % e.strerror)
else:
- self._dbg(1, "tarfile: %s" % e)
+ self._dbg(1, "tarfile: %s %r" % (e.strerror, e.filename))
+ else:
+ self._dbg(1, "tarfile: %s %s" % (type(e).__name__, e))
def extractfile(self, member):
"""Extract a member from the archive as a file object. `member' may be
@@ -2189,9 +2429,13 @@ def makedir(self, tarinfo, targetpath):
"""Make a directory called targetpath.
"""
try:
- # Use a safe mode for the directory, the real mode is set
- # later in _extract_member().
- os.mkdir(targetpath, 0o700)
+ if tarinfo.mode is None:
+ # Use the system's default mode
+ os.mkdir(targetpath)
+ else:
+ # Use a safe mode for the directory, the real mode is set
+ # later in _extract_member().
+ os.mkdir(targetpath, 0o700)
except FileExistsError:
pass
@@ -2234,6 +2478,9 @@ def makedev(self, tarinfo, targetpath):
raise ExtractError("special devices not supported by system")
mode = tarinfo.mode
+ if mode is None:
+ # Use mknod's default
+ mode = 0o600
if tarinfo.isblk():
mode |= stat.S_IFBLK
else:
@@ -2255,7 +2502,6 @@ def makelink(self, tarinfo, targetpath):
os.unlink(targetpath)
os.symlink(tarinfo.linkname, targetpath)
else:
- # See extract().
if os.path.exists(tarinfo._link_target):
os.link(tarinfo._link_target, targetpath)
else:
@@ -2280,15 +2526,19 @@ def chown(self, tarinfo, targetpath, numeric_owner):
u = tarinfo.uid
if not numeric_owner:
try:
- if grp:
+ if grp and tarinfo.gname:
g = grp.getgrnam(tarinfo.gname)[2]
except KeyError:
pass
try:
- if pwd:
+ if pwd and tarinfo.uname:
u = pwd.getpwnam(tarinfo.uname)[2]
except KeyError:
pass
+ if g is None:
+ g = -1
+ if u is None:
+ u = -1
try:
if tarinfo.issym() and hasattr(os, "lchown"):
os.lchown(targetpath, u, g)
@@ -2300,6 +2550,8 @@ def chown(self, tarinfo, targetpath, numeric_owner):
def chmod(self, tarinfo, targetpath):
"""Set file permissions of targetpath according to tarinfo.
"""
+ if tarinfo.mode is None:
+ return
try:
os.chmod(targetpath, tarinfo.mode)
except OSError as e:
@@ -2308,10 +2560,13 @@ def chmod(self, tarinfo, targetpath):
def utime(self, tarinfo, targetpath):
"""Set modification time of targetpath according to tarinfo.
"""
+ mtime = tarinfo.mtime
+ if mtime is None:
+ return
if not hasattr(os, 'utime'):
return
try:
- os.utime(targetpath, (tarinfo.mtime, tarinfo.mtime))
+ os.utime(targetpath, (mtime, mtime))
except OSError as e:
raise ExtractError("could not change modification time") from e
@@ -2329,6 +2584,8 @@ def next(self):
# Advance the file pointer.
if self.offset != self.fileobj.tell():
+ if self.offset == 0:
+ return None
self.fileobj.seek(self.offset - 1)
if not self.fileobj.read(1):
raise ReadError("unexpected end of data")
@@ -2387,13 +2644,26 @@ def _getmember(self, name, tarinfo=None, normalize=False):
members = self.getmembers()
# Limit the member search list up to tarinfo.
+ skipping = False
if tarinfo is not None:
- members = members[:members.index(tarinfo)]
+ try:
+ index = members.index(tarinfo)
+ except ValueError:
+ # The given starting point might be a (modified) copy.
+ # We'll later skip members until we find an equivalent.
+ skipping = True
+ else:
+ # Happy fast path
+ members = members[:index]
if normalize:
name = os.path.normpath(name)
for member in reversed(members):
+ if skipping:
+ if tarinfo.offset == member.offset:
+ skipping = False
+ continue
if normalize:
member_name = os.path.normpath(member.name)
else:
@@ -2402,6 +2672,10 @@ def _getmember(self, name, tarinfo=None, normalize=False):
if name == member_name:
return member
+ if skipping:
+ # Starting point was not found
+ raise ValueError(tarinfo)
+
def _load(self):
"""Read through the entire archive file and look for readable
members.
@@ -2494,6 +2768,7 @@ def __exit__(self, type, value, traceback):
#--------------------
# exported functions
#--------------------
+
def is_tarfile(name):
"""Return True if name points to a tar archive that we
are able to handle, else return False.
@@ -2522,6 +2797,10 @@ def main():
parser = argparse.ArgumentParser(description=description)
parser.add_argument('-v', '--verbose', action='store_true', default=False,
help='Verbose output')
+ parser.add_argument('--filter', metavar='',
+ choices=_NAMED_FILTERS,
+ help='Filter for extraction')
+
group = parser.add_mutually_exclusive_group(required=True)
group.add_argument('-l', '--list', metavar='',
help='Show listing of a tarfile')
@@ -2533,8 +2812,12 @@ def main():
help='Create tarfile from sources')
group.add_argument('-t', '--test', metavar='',
help='Test if a tarfile is valid')
+
args = parser.parse_args()
+ if args.filter and args.extract is None:
+ parser.exit(1, '--filter is only valid for extraction\n')
+
if args.test is not None:
src = args.test
if is_tarfile(src):
@@ -2565,7 +2848,7 @@ def main():
if is_tarfile(src):
with TarFile.open(src, 'r:*') as tf:
- tf.extractall(path=curdir)
+ tf.extractall(path=curdir, filter=args.filter)
if args.verbose:
if curdir == '.':
msg = '{!r} file is extracted.'.format(src)
diff --git a/Lib/tempfile.py b/Lib/tempfile.py
index eb870c998c251a..480c17232e9f09 100644
--- a/Lib/tempfile.py
+++ b/Lib/tempfile.py
@@ -203,8 +203,7 @@ def _get_default_tempdir():
fd = _os.open(filename, _bin_openflags, 0o600)
try:
try:
- with _io.open(fd, 'wb', closefd=False) as fp:
- fp.write(b'blat')
+ _os.write(fd, b'blat')
finally:
_os.close(fd)
finally:
@@ -244,6 +243,7 @@ def _get_candidate_names():
def _mkstemp_inner(dir, pre, suf, flags, output_type):
"""Code common to mkstemp, TemporaryFile, and NamedTemporaryFile."""
+ dir = _os.path.abspath(dir)
names = _get_candidate_names()
if output_type is bytes:
names = map(_os.fsencode, names)
@@ -264,7 +264,7 @@ def _mkstemp_inner(dir, pre, suf, flags, output_type):
continue
else:
raise
- return (fd, _os.path.abspath(file))
+ return fd, file
raise FileExistsError(_errno.EEXIST,
"No usable temporary file name found")
@@ -554,15 +554,26 @@ def NamedTemporaryFile(mode='w+b', buffering=-1, encoding=None,
if "b" not in mode:
encoding = _io.text_encoding(encoding)
- (fd, name) = _mkstemp_inner(dir, prefix, suffix, flags, output_type)
+ name = None
+ def opener(*args):
+ nonlocal name
+ fd, name = _mkstemp_inner(dir, prefix, suffix, flags, output_type)
+ return fd
try:
- file = _io.open(fd, mode, buffering=buffering,
- newline=newline, encoding=encoding, errors=errors)
-
- return _TemporaryFileWrapper(file, name, delete)
- except BaseException:
- _os.unlink(name)
- _os.close(fd)
+ file = _io.open(dir, mode, buffering=buffering,
+ newline=newline, encoding=encoding, errors=errors,
+ opener=opener)
+ try:
+ raw = getattr(file, 'buffer', file)
+ raw = getattr(raw, 'raw', raw)
+ raw.name = name
+ return _TemporaryFileWrapper(file, name, delete)
+ except:
+ file.close()
+ raise
+ except:
+ if name is not None and not (_os.name == 'nt' and delete):
+ _os.unlink(name)
raise
if _os.name != 'posix' or _sys.platform == 'cygwin':
@@ -601,9 +612,20 @@ def TemporaryFile(mode='w+b', buffering=-1, encoding=None,
flags = _bin_openflags
if _O_TMPFILE_WORKS:
- try:
+ fd = None
+ def opener(*args):
+ nonlocal fd
flags2 = (flags | _os.O_TMPFILE) & ~_os.O_CREAT
fd = _os.open(dir, flags2, 0o600)
+ return fd
+ try:
+ file = _io.open(dir, mode, buffering=buffering,
+ newline=newline, encoding=encoding,
+ errors=errors, opener=opener)
+ raw = getattr(file, 'buffer', file)
+ raw = getattr(raw, 'raw', raw)
+ raw.name = fd
+ return file
except IsADirectoryError:
# Linux kernel older than 3.11 ignores the O_TMPFILE flag:
# O_TMPFILE is read as O_DIRECTORY. Trying to open a directory
@@ -620,24 +642,25 @@ def TemporaryFile(mode='w+b', buffering=-1, encoding=None,
# fails with NotADirectoryError, because O_TMPFILE is read as
# O_DIRECTORY.
pass
- else:
- try:
- return _io.open(fd, mode, buffering=buffering,
- newline=newline, encoding=encoding,
- errors=errors)
- except:
- _os.close(fd)
- raise
# Fallback to _mkstemp_inner().
- (fd, name) = _mkstemp_inner(dir, prefix, suffix, flags, output_type)
- try:
- _os.unlink(name)
- return _io.open(fd, mode, buffering=buffering,
- newline=newline, encoding=encoding, errors=errors)
- except:
- _os.close(fd)
- raise
+ fd = None
+ def opener(*args):
+ nonlocal fd
+ fd, name = _mkstemp_inner(dir, prefix, suffix, flags, output_type)
+ try:
+ _os.unlink(name)
+ except BaseException as e:
+ _os.close(fd)
+ raise
+ return fd
+ file = _io.open(dir, mode, buffering=buffering,
+ newline=newline, encoding=encoding, errors=errors,
+ opener=opener)
+ raw = getattr(file, 'buffer', file)
+ raw = getattr(raw, 'raw', raw)
+ raw.name = fd
+ return file
class SpooledTemporaryFile(_io.IOBase):
"""Temporary file wrapper, specialized to switch from BytesIO
diff --git a/Lib/test/_test_embed_set_config.py b/Lib/test/_test_embed_set_config.py
index e7b7106e17851d..7ff641b37bf188 100644
--- a/Lib/test/_test_embed_set_config.py
+++ b/Lib/test/_test_embed_set_config.py
@@ -236,10 +236,11 @@ def test_path(self):
module_search_paths=['a', 'b', 'c'])
self.assertEqual(sys.path, ['a', 'b', 'c'])
- # Leave sys.path unchanged if module_search_paths_set=0
+ # sys.path is reset if module_search_paths_set=0
self.set_config(module_search_paths_set=0,
module_search_paths=['new_path'])
- self.assertEqual(sys.path, ['a', 'b', 'c'])
+ self.assertNotEqual(sys.path, ['a', 'b', 'c'])
+ self.assertNotEqual(sys.path, ['new_path'])
def test_argv(self):
self.set_config(parse_argv=0,
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index 67bb17c0ede364..b50a1543205cec 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -5,6 +5,7 @@
import unittest
import unittest.mock
import queue as pyqueue
+import textwrap
import time
import io
import itertools
@@ -2860,6 +2861,11 @@ def test_pool_worker_lifetime_early_close(self):
for (j, res) in enumerate(results):
self.assertEqual(res.get(), sqr(j))
+ def test_pool_maxtasksperchild_invalid(self):
+ for value in [0, -1, 0.5, "12"]:
+ with self.assertRaises(ValueError):
+ multiprocessing.Pool(3, maxtasksperchild=value)
+
def test_worker_finalization_via_atexit_handler_of_multiprocessing(self):
# tests cases against bpo-38744 and bpo-39360
cmd = '''if 1:
@@ -3965,7 +3971,7 @@ def test_shared_memory_recreate(self):
'multiprocessing.shared_memory._make_filename') as mock_make_filename:
NAME_PREFIX = shared_memory._SHM_NAME_PREFIX
- names = ['test01_fn', 'test02_fn']
+ names = [self._new_shm_name('test03_fn'), self._new_shm_name('test04_fn')]
# Prepend NAME_PREFIX which can be '/psm_' or 'wnsm_', necessary
# because some POSIX compliant systems require name to start with /
names = [NAME_PREFIX + name for name in names]
@@ -5432,6 +5438,14 @@ def test_resource_tracker_reused(self):
self.assertTrue(is_resource_tracker_reused)
+ def test_too_long_name_resource(self):
+ # gh-96819: Resource names that will make the length of a write to a pipe
+ # greater than PIPE_BUF are not allowed
+ rtype = "shared_memory"
+ too_long_name_resource = "a" * (512 - len(rtype))
+ with self.assertRaises(ValueError):
+ resource_tracker.register(too_long_name_resource, rtype)
+
class TestSimpleQueue(unittest.TestCase):
@@ -5760,6 +5774,35 @@ def test_namespace(self):
self.run_worker(self._test_namespace, o)
+class TestNamedResource(unittest.TestCase):
+ def test_global_named_resource_spawn(self):
+ #
+ # gh-90549: Check that global named resources in main module
+ # will not leak by a subprocess, in spawn context.
+ #
+ testfn = os_helper.TESTFN
+ self.addCleanup(os_helper.unlink, testfn)
+ with open(testfn, 'w', encoding='utf-8') as f:
+ f.write(textwrap.dedent('''\
+ import multiprocessing as mp
+
+ ctx = mp.get_context('spawn')
+
+ global_resource = ctx.Semaphore()
+
+ def submain(): pass
+
+ if __name__ == '__main__':
+ p = ctx.Process(target=submain)
+ p.start()
+ p.join()
+ '''))
+ rc, out, err = test.support.script_helper.assert_python_ok(testfn)
+ # on error, err = 'UserWarning: resource_tracker: There appear to
+ # be 1 leaked semaphore objects to clean up at shutdown'
+ self.assertEqual(err, b'')
+
+
class MiscTestCase(unittest.TestCase):
def test__all__(self):
# Just make sure names in not_exported are excluded
@@ -5991,3 +6034,15 @@ def tearDownModule():
remote_globs['setUpModule'] = setUpModule
remote_globs['tearDownModule'] = tearDownModule
+
+
+@unittest.skipIf(not hasattr(_multiprocessing, 'SemLock'), 'SemLock not available')
+@unittest.skipIf(sys.platform != "linux", "Linux only")
+class SemLockTests(unittest.TestCase):
+
+ def test_semlock_subclass(self):
+ class SemLock(_multiprocessing.SemLock):
+ pass
+ name = f'test_semlock_subclass-{os.getpid()}'
+ s = SemLock(1, 0, 10, name, False)
+ _multiprocessing.sem_unlink(name)
diff --git a/Lib/test/_test_venv_multiprocessing.py b/Lib/test/_test_venv_multiprocessing.py
new file mode 100644
index 00000000000000..af72e915ba52bb
--- /dev/null
+++ b/Lib/test/_test_venv_multiprocessing.py
@@ -0,0 +1,40 @@
+import multiprocessing
+import random
+import sys
+import time
+
+def fill_queue(queue, code):
+ queue.put(code)
+
+
+def drain_queue(queue, code):
+ if code != queue.get():
+ sys.exit(1)
+
+
+def test_func():
+ code = random.randrange(0, 1000)
+ queue = multiprocessing.Queue()
+ fill_pool = multiprocessing.Process(
+ target=fill_queue,
+ args=(queue, code)
+ )
+ drain_pool = multiprocessing.Process(
+ target=drain_queue,
+ args=(queue, code)
+ )
+ drain_pool.start()
+ fill_pool.start()
+ fill_pool.join()
+ drain_pool.join()
+
+
+def main():
+ test_pool = multiprocessing.Process(target=test_func)
+ test_pool.start()
+ test_pool.join()
+ sys.exit(test_pool.exitcode)
+
+
+if __name__ == "__main__":
+ main()
diff --git a/Lib/test/_testcppext.cpp b/Lib/test/_testcppext.cpp
index dc40f0ee9eb1cb..0e381a78c5ceed 100644
--- a/Lib/test/_testcppext.cpp
+++ b/Lib/test/_testcppext.cpp
@@ -6,6 +6,15 @@
#include "Python.h"
+#if __cplusplus >= 201103
+# define NAME _testcpp11ext
+#else
+# define NAME _testcpp03ext
+#endif
+
+#define _STR(NAME) #NAME
+#define STR(NAME) _STR(NAME)
+
PyDoc_STRVAR(_testcppext_add_doc,
"add(x, y)\n"
"\n"
@@ -16,20 +25,42 @@ _testcppext_add(PyObject *Py_UNUSED(module), PyObject *args)
{
long i, j;
if (!PyArg_ParseTuple(args, "ll:foo", &i, &j)) {
- return nullptr;
+ return _Py_NULL;
}
long res = i + j;
return PyLong_FromLong(res);
}
+// Class to test operator casting an object to PyObject*
+class StrongRef
+{
+public:
+ StrongRef(PyObject *obj) : m_obj(obj) {
+ Py_INCREF(this->m_obj);
+ }
+
+ ~StrongRef() {
+ Py_DECREF(this->m_obj);
+ }
+
+ // Cast to PyObject*: get a borrowed reference
+ inline operator PyObject*() const { return this->m_obj; }
+
+private:
+ PyObject *m_obj; // Strong reference
+};
+
+
static PyObject *
test_api_casts(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
{
PyObject *obj = Py_BuildValue("(ii)", 1, 2);
- if (obj == nullptr) {
- return nullptr;
+ if (obj == _Py_NULL) {
+ return _Py_NULL;
}
+ Py_ssize_t refcnt = Py_REFCNT(obj);
+ assert(refcnt >= 1);
// gh-92138: For backward compatibility, functions of Python C API accepts
// "const PyObject*". Check that using it does not emit C++ compiler
@@ -38,22 +69,138 @@ test_api_casts(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
Py_INCREF(const_obj);
Py_DECREF(const_obj);
PyTypeObject *type = Py_TYPE(const_obj);
- assert(Py_REFCNT(const_obj) >= 1);
-
+ assert(Py_REFCNT(const_obj) == refcnt);
assert(type == &PyTuple_Type);
assert(PyTuple_GET_SIZE(const_obj) == 2);
PyObject *one = PyTuple_GET_ITEM(const_obj, 0);
assert(PyLong_AsLong(one) == 1);
+ // gh-92898: StrongRef doesn't inherit from PyObject but has an operator to
+ // cast to PyObject*.
+ StrongRef strong_ref(obj);
+ assert(Py_TYPE(strong_ref) == &PyTuple_Type);
+ assert(Py_REFCNT(strong_ref) == (refcnt + 1));
+ Py_INCREF(strong_ref);
+ Py_DECREF(strong_ref);
+
+ // gh-93442: Pass 0 as NULL for PyObject*
+ Py_XINCREF(0);
+ Py_XDECREF(0);
+#if _cplusplus >= 201103
+ // Test nullptr passed as PyObject*
+ Py_XINCREF(nullptr);
+ Py_XDECREF(nullptr);
+#endif
+
Py_DECREF(obj);
Py_RETURN_NONE;
}
+static PyObject *
+test_unicode(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
+{
+ PyObject *str = PyUnicode_FromString("abc");
+ if (str == _Py_NULL) {
+ return _Py_NULL;
+ }
+
+ assert(PyUnicode_Check(str));
+ assert(PyUnicode_GET_LENGTH(str) == 3);
+
+ // gh-92800: test PyUnicode_READ()
+ const void* data = PyUnicode_DATA(str);
+ assert(data != _Py_NULL);
+ int kind = PyUnicode_KIND(str);
+ assert(kind == PyUnicode_1BYTE_KIND);
+ assert(PyUnicode_READ(kind, data, 0) == 'a');
+
+ // gh-92800: test PyUnicode_READ() casts
+ const void* const_data = PyUnicode_DATA(str);
+ unsigned int ukind = static_cast(kind);
+ assert(PyUnicode_READ(ukind, const_data, 2) == 'c');
+
+ assert(PyUnicode_READ_CHAR(str, 1) == 'b');
+
+ Py_DECREF(str);
+ Py_RETURN_NONE;
+}
+
+/* Test a `new`-allocated object with a virtual method.
+ * (https://github.com/python/cpython/issues/94731) */
+
+class VirtualPyObject : public PyObject {
+public:
+ VirtualPyObject();
+ virtual ~VirtualPyObject() {
+ delete [] internal_data;
+ --instance_count;
+ }
+ virtual void set_internal_data() {
+ internal_data[0] = 1;
+ }
+ static void dealloc(PyObject* o) {
+ delete static_cast(o);
+ }
+
+ // Number of "living" instances
+ static int instance_count;
+private:
+ // buffer that can get corrupted
+ int* internal_data;
+};
+
+int VirtualPyObject::instance_count = 0;
+
+PyType_Slot VirtualPyObject_Slots[] = {
+ {Py_tp_free, (void*)VirtualPyObject::dealloc},
+ {0, _Py_NULL},
+};
+
+PyType_Spec VirtualPyObject_Spec = {
+ /* .name */ STR(NAME) ".VirtualPyObject",
+ /* .basicsize */ sizeof(VirtualPyObject),
+ /* .itemsize */ 0,
+ /* .flags */ Py_TPFLAGS_DEFAULT,
+ /* .slots */ VirtualPyObject_Slots,
+};
+
+VirtualPyObject::VirtualPyObject() {
+ // Create a temporary type (just so we don't need to store it)
+ PyObject *type = PyType_FromSpec(&VirtualPyObject_Spec);
+ // no good way to signal failure from a C++ constructor, so use assert
+ // for error handling
+ assert(type);
+ assert(PyObject_Init(this, (PyTypeObject *)type));
+ Py_DECREF(type);
+ internal_data = new int[50];
+ ++instance_count;
+}
+
+static PyObject *
+test_virtual_object(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
+{
+ VirtualPyObject* obj = new VirtualPyObject();
+ obj->set_internal_data();
+ Py_DECREF(obj);
+ if (VirtualPyObject::instance_count != 0) {
+ return PyErr_Format(
+ PyExc_AssertionError,
+ "instance_count should be 0, got %d",
+ VirtualPyObject::instance_count);
+ }
+ Py_RETURN_NONE;
+}
+
static PyMethodDef _testcppext_methods[] = {
{"add", _testcppext_add, METH_VARARGS, _testcppext_add_doc},
- {"test_api_casts", test_api_casts, METH_NOARGS, nullptr},
- {nullptr, nullptr, 0, nullptr} /* sentinel */
+ {"test_api_casts", test_api_casts, METH_NOARGS, _Py_NULL},
+ {"test_unicode", test_unicode, METH_NOARGS, _Py_NULL},
+ {"test_virtual_object", test_virtual_object, METH_NOARGS, _Py_NULL},
+ // Note: _testcppext_exec currently runs all test functions directly.
+ // When adding a new one, add a call there.
+
+ {_Py_NULL, _Py_NULL, 0, _Py_NULL} /* sentinel */
};
@@ -63,12 +210,27 @@ _testcppext_exec(PyObject *module)
if (PyModule_AddIntMacro(module, __cplusplus) < 0) {
return -1;
}
+
+ PyObject *result;
+
+ result = PyObject_CallMethod(module, "test_api_casts", "");
+ if (!result) return -1;
+ Py_DECREF(result);
+
+ result = PyObject_CallMethod(module, "test_unicode", "");
+ if (!result) return -1;
+ Py_DECREF(result);
+
+ result = PyObject_CallMethod(module, "test_virtual_object", "");
+ if (!result) return -1;
+ Py_DECREF(result);
+
return 0;
}
static PyModuleDef_Slot _testcppext_slots[] = {
{Py_mod_exec, reinterpret_cast(_testcppext_exec)},
- {0, nullptr}
+ {0, _Py_NULL}
};
@@ -76,18 +238,21 @@ PyDoc_STRVAR(_testcppext_doc, "C++ test extension.");
static struct PyModuleDef _testcppext_module = {
PyModuleDef_HEAD_INIT, // m_base
- "_testcppext", // m_name
+ STR(NAME), // m_name
_testcppext_doc, // m_doc
0, // m_size
_testcppext_methods, // m_methods
_testcppext_slots, // m_slots
- nullptr, // m_traverse
- nullptr, // m_clear
- nullptr, // m_free
+ _Py_NULL, // m_traverse
+ _Py_NULL, // m_clear
+ _Py_NULL, // m_free
};
+#define _FUNC_NAME(NAME) PyInit_ ## NAME
+#define FUNC_NAME(NAME) _FUNC_NAME(NAME)
+
PyMODINIT_FUNC
-PyInit__testcppext(void)
+FUNC_NAME(NAME)(void)
{
return PyModuleDef_Init(&_testcppext_module);
}
diff --git a/Lib/test/audit-tests.py b/Lib/test/audit-tests.py
index ccec9fedc4460d..e7f8a945c1a9af 100644
--- a/Lib/test/audit-tests.py
+++ b/Lib/test/audit-tests.py
@@ -408,6 +408,49 @@ def hook(event, *args):
raise RuntimeError("Expected sqlite3.load_extension to fail")
+def test_sys_getframe():
+ import sys
+
+ def hook(event, args):
+ if event.startswith("sys."):
+ print(event, args[0].f_code.co_name)
+
+ sys.addaudithook(hook)
+ sys._getframe()
+
+
+def test_syslog():
+ import syslog
+
+ def hook(event, args):
+ if event.startswith("syslog."):
+ print(event, *args)
+
+ sys.addaudithook(hook)
+ syslog.openlog('python')
+ syslog.syslog('test')
+ syslog.setlogmask(syslog.LOG_DEBUG)
+ syslog.closelog()
+ # implicit open
+ syslog.syslog('test2')
+ # open with default ident
+ syslog.openlog(logoption=syslog.LOG_NDELAY, facility=syslog.LOG_LOCAL0)
+ sys.argv = None
+ syslog.openlog()
+ syslog.closelog()
+
+
+def test_not_in_gc():
+ import gc
+
+ hook = lambda *a: None
+ sys.addaudithook(hook)
+
+ for o in gc.get_objects():
+ if isinstance(o, list):
+ assert hook not in o
+
+
if __name__ == "__main__":
from test.support import suppress_msvcrt_asserts
diff --git a/Lib/test/clinic.test b/Lib/test/clinic.test
index 9ef3610ba10c01..0abadbe7f3474e 100644
--- a/Lib/test/clinic.test
+++ b/Lib/test/clinic.test
@@ -1740,29 +1740,18 @@ test_str_converter_encoding(PyObject *module, PyObject *const *args, Py_ssize_t
goto exit;
}
return_value = test_str_converter_encoding_impl(module, a, b, c, d, d_length, e, e_length);
+ /* Post parse cleanup for a */
+ PyMem_FREE(a);
+ /* Post parse cleanup for b */
+ PyMem_FREE(b);
+ /* Post parse cleanup for c */
+ PyMem_FREE(c);
+ /* Post parse cleanup for d */
+ PyMem_FREE(d);
+ /* Post parse cleanup for e */
+ PyMem_FREE(e);
exit:
- /* Cleanup for a */
- if (a) {
- PyMem_FREE(a);
- }
- /* Cleanup for b */
- if (b) {
- PyMem_FREE(b);
- }
- /* Cleanup for c */
- if (c) {
- PyMem_FREE(c);
- }
- /* Cleanup for d */
- if (d) {
- PyMem_FREE(d);
- }
- /* Cleanup for e */
- if (e) {
- PyMem_FREE(e);
- }
-
return return_value;
}
@@ -1770,7 +1759,7 @@ static PyObject *
test_str_converter_encoding_impl(PyObject *module, char *a, char *b, char *c,
char *d, Py_ssize_t d_length, char *e,
Py_ssize_t e_length)
-/*[clinic end generated code: output=8acb886a3843f3bc input=eb4c38e1f898f402]*/
+/*[clinic end generated code: output=999c1deecfa15b0a input=eb4c38e1f898f402]*/
/*[clinic input]
@@ -1803,12 +1792,12 @@ static PyObject *
test_Py_UNICODE_converter(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
- const Py_UNICODE *a;
- const Py_UNICODE *b;
- const Py_UNICODE *c;
- const Py_UNICODE *d;
+ const Py_UNICODE *a = NULL;
+ const Py_UNICODE *b = NULL;
+ const Py_UNICODE *c = NULL;
+ const Py_UNICODE *d = NULL;
Py_ssize_t d_length;
- const Py_UNICODE *e;
+ const Py_UNICODE *e = NULL;
Py_ssize_t e_length;
if (!_PyArg_ParseStack(args, nargs, "O&O&O&u#Z#:test_Py_UNICODE_converter",
@@ -1839,7 +1828,7 @@ test_Py_UNICODE_converter_impl(PyObject *module, const Py_UNICODE *a,
const Py_UNICODE *b, const Py_UNICODE *c,
const Py_UNICODE *d, Py_ssize_t d_length,
const Py_UNICODE *e, Py_ssize_t e_length)
-/*[clinic end generated code: output=45e92604de227552 input=064a3b68ad7f04b0]*/
+/*[clinic end generated code: output=9d41b3a38a0f6f2f input=064a3b68ad7f04b0]*/
/*[clinic input]
@@ -3338,8 +3327,11 @@ test_vararg_and_posonly(PyObject *module, PyObject *const *args, Py_ssize_t narg
}
a = args[0];
__clinic_args = PyTuple_New(nargs - 1);
+ if (!__clinic_args) {
+ goto exit;
+ }
for (Py_ssize_t i = 0; i < nargs - 1; ++i) {
- PyTuple_SET_ITEM(__clinic_args, i, args[1 + i]);
+ PyTuple_SET_ITEM(__clinic_args, i, Py_NewRef(args[1 + i]));
}
return_value = test_vararg_and_posonly_impl(module, a, __clinic_args);
@@ -3350,7 +3342,7 @@ exit:
static PyObject *
test_vararg_and_posonly_impl(PyObject *module, PyObject *a, PyObject *args)
-/*[clinic end generated code: output=548bca3a127c22c1 input=08dc2bf7afbf1613]*/
+/*[clinic end generated code: output=79b75dc07decc8d6 input=08dc2bf7afbf1613]*/
/*[clinic input]
test_vararg
@@ -3379,7 +3371,6 @@ test_vararg(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject
static const char * const _keywords[] = {"a", NULL};
static _PyArg_Parser _parser = {NULL, _keywords, "test_vararg", 0};
PyObject *argsbuf[2];
- Py_ssize_t noptargs = 0 + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
PyObject *a;
PyObject *__clinic_args = NULL;
@@ -3398,7 +3389,7 @@ exit:
static PyObject *
test_vararg_impl(PyObject *module, PyObject *a, PyObject *args)
-/*[clinic end generated code: output=a2baf8c1fade41d2 input=81d33815ad1bae6e]*/
+/*[clinic end generated code: output=ce9334333757f6ea input=81d33815ad1bae6e]*/
/*[clinic input]
test_vararg_with_default
@@ -3429,7 +3420,7 @@ test_vararg_with_default(PyObject *module, PyObject *const *args, Py_ssize_t nar
static const char * const _keywords[] = {"a", "b", NULL};
static _PyArg_Parser _parser = {NULL, _keywords, "test_vararg_with_default", 0};
PyObject *argsbuf[3];
- Py_ssize_t noptargs = 0 + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
+ Py_ssize_t noptargs = Py_MIN(nargs, 1) + (kwnames ? PyTuple_GET_SIZE(kwnames) : 0) - 1;
PyObject *a;
PyObject *__clinic_args = NULL;
int b = 0;
@@ -3458,7 +3449,7 @@ exit:
static PyObject *
test_vararg_with_default_impl(PyObject *module, PyObject *a, PyObject *args,
int b)
-/*[clinic end generated code: output=3821d282c29f8616 input=6e110b54acd9b22d]*/
+/*[clinic end generated code: output=32fb19dd6bcf9185 input=6e110b54acd9b22d]*/
/*[clinic input]
test_vararg_with_only_defaults
@@ -3524,3 +3515,44 @@ static PyObject *
test_vararg_with_only_defaults_impl(PyObject *module, PyObject *args, int b,
PyObject *c)
/*[clinic end generated code: output=7e393689e6ce61a3 input=fa56a709a035666e]*/
+
+/*[clinic input]
+test_paramname_module
+
+ module as mod: object
+[clinic start generated code]*/
+
+PyDoc_STRVAR(test_paramname_module__doc__,
+"test_paramname_module($module, /, module)\n"
+"--\n"
+"\n");
+
+#define TEST_PARAMNAME_MODULE_METHODDEF \
+ {"test_paramname_module", _PyCFunction_CAST(test_paramname_module), METH_FASTCALL|METH_KEYWORDS, test_paramname_module__doc__},
+
+static PyObject *
+test_paramname_module_impl(PyObject *module, PyObject *mod);
+
+static PyObject *
+test_paramname_module(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+{
+ PyObject *return_value = NULL;
+ static const char * const _keywords[] = {"module", NULL};
+ static _PyArg_Parser _parser = {NULL, _keywords, "test_paramname_module", 0};
+ PyObject *argsbuf[1];
+ PyObject *mod;
+
+ args = _PyArg_UnpackKeywords(args, nargs, NULL, kwnames, &_parser, 1, 1, 0, argsbuf);
+ if (!args) {
+ goto exit;
+ }
+ mod = args[0];
+ return_value = test_paramname_module_impl(module, mod);
+
+exit:
+ return return_value;
+}
+
+static PyObject *
+test_paramname_module_impl(PyObject *module, PyObject *mod)
+/*[clinic end generated code: output=23379a7ffa65c514 input=afefe259667f13ba]*/
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index 0495362b3f3693..bb67722267dd41 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -1,6 +1,6 @@
"""Test date/time type.
-See http://www.zope.org/Members/fdrake/DateTimeWiki/TestCases
+See https://www.zope.dev/Members/fdrake/DateTimeWiki/TestCases
"""
import io
import itertools
@@ -2515,45 +2515,101 @@ def test_microsecond_rounding(self):
self.assertEqual(t.microsecond, 7812)
def test_timestamp_limits(self):
- # minimum timestamp
- min_dt = self.theclass.min.replace(tzinfo=timezone.utc)
+ with self.subTest("minimum UTC"):
+ min_dt = self.theclass.min.replace(tzinfo=timezone.utc)
+ min_ts = min_dt.timestamp()
+
+ # This test assumes that datetime.min == 0000-01-01T00:00:00.00
+ # If that assumption changes, this value can change as well
+ self.assertEqual(min_ts, -62135596800)
+
+ with self.subTest("maximum UTC"):
+ # Zero out microseconds to avoid rounding issues
+ max_dt = self.theclass.max.replace(tzinfo=timezone.utc,
+ microsecond=0)
+ max_ts = max_dt.timestamp()
+
+ # This test assumes that datetime.max == 9999-12-31T23:59:59.999999
+ # If that assumption changes, this value can change as well
+ self.assertEqual(max_ts, 253402300799.0)
+
+ def test_fromtimestamp_limits(self):
+ try:
+ self.theclass.fromtimestamp(-2**32 - 1)
+ except (OSError, OverflowError):
+ self.skipTest("Test not valid on this platform")
+
+ # XXX: Replace these with datetime.{min,max}.timestamp() when we solve
+ # the issue with gh-91012
+ min_dt = self.theclass.min + timedelta(days=1)
min_ts = min_dt.timestamp()
+
+ max_dt = self.theclass.max.replace(microsecond=0)
+ max_ts = ((self.theclass.max - timedelta(hours=23)).timestamp() +
+ timedelta(hours=22, minutes=59, seconds=59).total_seconds())
+
+ for (test_name, ts, expected) in [
+ ("minimum", min_ts, min_dt),
+ ("maximum", max_ts, max_dt),
+ ]:
+ with self.subTest(test_name, ts=ts, expected=expected):
+ actual = self.theclass.fromtimestamp(ts)
+
+ self.assertEqual(actual, expected)
+
+ # Test error conditions
+ test_cases = [
+ ("Too small by a little", min_ts - timedelta(days=1, hours=12).total_seconds()),
+ ("Too small by a lot", min_ts - timedelta(days=400).total_seconds()),
+ ("Too big by a little", max_ts + timedelta(days=1).total_seconds()),
+ ("Too big by a lot", max_ts + timedelta(days=400).total_seconds()),
+ ]
+
+ for test_name, ts in test_cases:
+ with self.subTest(test_name, ts=ts):
+ with self.assertRaises((ValueError, OverflowError)):
+ # converting a Python int to C time_t can raise a
+ # OverflowError, especially on 32-bit platforms.
+ self.theclass.fromtimestamp(ts)
+
+ def test_utcfromtimestamp_limits(self):
try:
- # date 0001-01-01 00:00:00+00:00: timestamp=-62135596800
- self.assertEqual(self.theclass.fromtimestamp(min_ts, tz=timezone.utc),
- min_dt)
- except (OverflowError, OSError) as exc:
- # the date 0001-01-01 doesn't fit into 32-bit time_t,
- # or platform doesn't support such very old date
- self.skipTest(str(exc))
-
- # maximum timestamp: set seconds to zero to avoid rounding issues
- max_dt = self.theclass.max.replace(tzinfo=timezone.utc,
- second=0, microsecond=0)
+ self.theclass.utcfromtimestamp(-2**32 - 1)
+ except (OSError, OverflowError):
+ self.skipTest("Test not valid on this platform")
+
+ min_dt = self.theclass.min.replace(tzinfo=timezone.utc)
+ min_ts = min_dt.timestamp()
+
+ max_dt = self.theclass.max.replace(microsecond=0, tzinfo=timezone.utc)
max_ts = max_dt.timestamp()
- # date 9999-12-31 23:59:00+00:00: timestamp 253402300740
- self.assertEqual(self.theclass.fromtimestamp(max_ts, tz=timezone.utc),
- max_dt)
-
- # number of seconds greater than 1 year: make sure that the new date
- # is not valid in datetime.datetime limits
- delta = 3600 * 24 * 400
-
- # too small
- ts = min_ts - delta
- # converting a Python int to C time_t can raise a OverflowError,
- # especially on 32-bit platforms.
- with self.assertRaises((ValueError, OverflowError)):
- self.theclass.fromtimestamp(ts)
- with self.assertRaises((ValueError, OverflowError)):
- self.theclass.utcfromtimestamp(ts)
-
- # too big
- ts = max_dt.timestamp() + delta
- with self.assertRaises((ValueError, OverflowError)):
- self.theclass.fromtimestamp(ts)
- with self.assertRaises((ValueError, OverflowError)):
- self.theclass.utcfromtimestamp(ts)
+
+ for (test_name, ts, expected) in [
+ ("minimum", min_ts, min_dt.replace(tzinfo=None)),
+ ("maximum", max_ts, max_dt.replace(tzinfo=None)),
+ ]:
+ with self.subTest(test_name, ts=ts, expected=expected):
+ try:
+ actual = self.theclass.utcfromtimestamp(ts)
+ except (OSError, OverflowError) as exc:
+ self.skipTest(str(exc))
+
+ self.assertEqual(actual, expected)
+
+ # Test error conditions
+ test_cases = [
+ ("Too small by a little", min_ts - 1),
+ ("Too small by a lot", min_ts - timedelta(days=400).total_seconds()),
+ ("Too big by a little", max_ts + 1),
+ ("Too big by a lot", max_ts + timedelta(days=400).total_seconds()),
+ ]
+
+ for test_name, ts in test_cases:
+ with self.subTest(test_name, ts=ts):
+ with self.assertRaises((ValueError, OverflowError)):
+ # converting a Python int to C time_t can raise a
+ # OverflowError, especially on 32-bit platforms.
+ self.theclass.utcfromtimestamp(ts)
def test_insane_fromtimestamp(self):
# It's possible that some platform maps time_t to double,
diff --git a/Lib/test/doctest_lineno.py b/Lib/test/doctest_lineno.py
new file mode 100644
index 00000000000000..729a68aceaa990
--- /dev/null
+++ b/Lib/test/doctest_lineno.py
@@ -0,0 +1,53 @@
+# This module is used in `test_doctest`.
+# It must not have a docstring.
+
+def func_with_docstring():
+ """Some unrelated info."""
+
+
+def func_without_docstring():
+ pass
+
+
+def func_with_doctest():
+ """
+ This function really contains a test case.
+
+ >>> func_with_doctest.__name__
+ 'func_with_doctest'
+ """
+ return 3
+
+
+class ClassWithDocstring:
+ """Some unrelated class information."""
+
+
+class ClassWithoutDocstring:
+ pass
+
+
+class ClassWithDoctest:
+ """This class really has a test case in it.
+
+ >>> ClassWithDoctest.__name__
+ 'ClassWithDoctest'
+ """
+
+
+class MethodWrapper:
+ def method_with_docstring(self):
+ """Method with a docstring."""
+
+ def method_without_docstring(self):
+ pass
+
+ def method_with_doctest(self):
+ """
+ This has a doctest!
+ >>> MethodWrapper.method_with_doctest.__name__
+ 'method_with_doctest'
+ """
+
+# https://github.com/python/cpython/issues/99433
+str_wrapper = object().__str__
diff --git a/Lib/test/inspect_fodder2.py b/Lib/test/inspect_fodder2.py
index e7d4b53ebefcc6..2dc49817087c44 100644
--- a/Lib/test/inspect_fodder2.py
+++ b/Lib/test/inspect_fodder2.py
@@ -259,3 +259,17 @@ def all_markers_with_args_and_kwargs(a, b, /, c, d, *args, e, f, **kwargs):
#line 259
def all_markers_with_defaults(a, b=1, /, c=2, d=3, *, e=4, f=5):
pass
+
+# line 263
+def deco_factory(**kwargs):
+ def deco(f):
+ @wraps(f)
+ def wrapper(*a, **kwd):
+ kwd.update(kwargs)
+ return f(*a, **kwd)
+ return wrapper
+ return deco
+
+@deco_factory(foo=(1 + 2), bar=lambda: 1)
+def complex_decorated(foo=0, bar=lambda: 0):
+ return foo + bar()
diff --git a/Lib/test/libregrtest/cmdline.py b/Lib/test/libregrtest/cmdline.py
index 1ac63af734c412..ebe57920d9185c 100644
--- a/Lib/test/libregrtest/cmdline.py
+++ b/Lib/test/libregrtest/cmdline.py
@@ -1,5 +1,6 @@
import argparse
import os
+import shlex
import sys
from test.support import os_helper
@@ -372,8 +373,11 @@ def _parse_args(args, **kwargs):
parser.error("-s and -f don't go together!")
if ns.use_mp is not None and ns.trace:
parser.error("-T and -j don't go together!")
- if ns.python is not None and ns.use_mp is None:
- parser.error("-p requires -j!")
+ if ns.python is not None:
+ if ns.use_mp is None:
+ parser.error("-p requires -j!")
+ # The "executable" may be two or more parts, e.g. "node python.js"
+ ns.python = shlex.split(ns.python)
if ns.failfast and not (ns.verbose or ns.verbose3):
parser.error("-G/--failfast needs either -v or -W")
if ns.pgo and (ns.verbose or ns.verbose2 or ns.verbose3):
diff --git a/Lib/test/libregrtest/main.py b/Lib/test/libregrtest/main.py
index 0cacccfc0b5e39..0125227bf11755 100644
--- a/Lib/test/libregrtest/main.py
+++ b/Lib/test/libregrtest/main.py
@@ -28,6 +28,19 @@
# Must be smaller than buildbot "1200 seconds without output" limit.
EXIT_TIMEOUT = 120.0
+# gh-90681: When rerunning tests, we might need to rerun the whole
+# class or module suite if some its life-cycle hooks fail.
+# Test level hooks are not affected.
+_TEST_LIFECYCLE_HOOKS = frozenset((
+ 'setUpClass', 'tearDownClass',
+ 'setUpModule', 'tearDownModule',
+))
+
+EXITCODE_BAD_TEST = 2
+EXITCODE_INTERRUPTED = 130
+EXITCODE_ENV_CHANGED = 3
+EXITCODE_NO_TESTS_RAN = 4
+
class Regrtest:
"""Execute a test suite.
@@ -306,13 +319,22 @@ def list_cases(self):
printlist(self.skipped, file=sys.stderr)
def rerun_failed_tests(self):
+ self.log()
+
+ if self.ns.python:
+ # Temp patch for https://github.com/python/cpython/issues/94052
+ self.log(
+ "Re-running failed tests is not supported with --python "
+ "host runner option."
+ )
+ return
+
self.ns.verbose = True
self.ns.failfast = False
self.ns.verbose3 = False
self.first_result = self.get_tests_result()
- self.log()
self.log("Re-running failed tests in verbose mode")
rerun_list = list(self.need_rerun)
self.need_rerun.clear()
@@ -322,8 +344,12 @@ def rerun_failed_tests(self):
errors = result.errors or []
failures = result.failures or []
- error_names = [test_full_name.split(" ")[0] for (test_full_name, *_) in errors]
- failure_names = [test_full_name.split(" ")[0] for (test_full_name, *_) in failures]
+ error_names = [
+ self.normalize_test_name(test_full_name, is_error=True)
+ for (test_full_name, *_) in errors]
+ failure_names = [
+ self.normalize_test_name(test_full_name)
+ for (test_full_name, *_) in failures]
self.ns.verbose = True
orig_match_tests = self.ns.match_tests
if errors or failures:
@@ -349,6 +375,21 @@ def rerun_failed_tests(self):
self.display_result()
+ def normalize_test_name(self, test_full_name, *, is_error=False):
+ short_name = test_full_name.split(" ")[0]
+ if is_error and short_name in _TEST_LIFECYCLE_HOOKS:
+ # This means that we have a failure in a life-cycle hook,
+ # we need to rerun the whole module or class suite.
+ # Basically the error looks like this:
+ # ERROR: setUpClass (test.test_reg_ex.RegTest)
+ # or
+ # ERROR: setUpModule (test.test_reg_ex)
+ # So, we need to parse the class / module name.
+ lpar = test_full_name.index('(')
+ rpar = test_full_name.index(')')
+ return test_full_name[lpar + 1: rpar].split('.')[-1]
+ return short_name
+
def display_result(self):
# If running the test suite for PGO then no one cares about results.
if self.ns.pgo:
@@ -600,6 +641,16 @@ def save_xml_result(self):
for s in ET.tostringlist(root):
f.write(s)
+ def fix_umask(self):
+ if support.is_emscripten:
+ # Emscripten has default umask 0o777, which breaks some tests.
+ # see https://github.com/emscripten-core/emscripten/issues/17269
+ old_mask = os.umask(0)
+ if old_mask == 0o777:
+ os.umask(0o027)
+ else:
+ os.umask(old_mask)
+
def set_temp_dir(self):
if self.ns.tempdir:
self.tmp_dir = self.ns.tempdir
@@ -628,11 +679,16 @@ def create_temp_dir(self):
# Define a writable temp dir that will be used as cwd while running
# the tests. The name of the dir includes the pid to allow parallel
# testing (see the -j option).
- pid = os.getpid()
+ # Emscripten and WASI have stubbed getpid(), Emscripten has only
+ # milisecond clock resolution. Use randint() instead.
+ if sys.platform in {"emscripten", "wasi"}:
+ nounce = random.randint(0, 1_000_000)
+ else:
+ nounce = os.getpid()
if self.worker_test_name is not None:
- test_cwd = 'test_python_worker_{}'.format(pid)
+ test_cwd = 'test_python_worker_{}'.format(nounce)
else:
- test_cwd = 'test_python_{}'.format(pid)
+ test_cwd = 'test_python_{}'.format(nounce)
test_cwd += os_helper.FS_NONASCII
test_cwd = os.path.join(self.tmp_dir, test_cwd)
return test_cwd
@@ -655,6 +711,8 @@ def main(self, tests=None, **kwargs):
self.set_temp_dir()
+ self.fix_umask()
+
if self.ns.cleanup:
self.cleanup()
sys.exit(0)
diff --git a/Lib/test/libregrtest/runtest_mp.py b/Lib/test/libregrtest/runtest_mp.py
index 39fab5566a089a..c6a4dae2df86a9 100644
--- a/Lib/test/libregrtest/runtest_mp.py
+++ b/Lib/test/libregrtest/runtest_mp.py
@@ -2,14 +2,14 @@
import json
import os
import queue
-import shlex
import signal
import subprocess
import sys
+import tempfile
import threading
import time
import traceback
-from typing import NamedTuple, NoReturn, Literal, Any
+from typing import NamedTuple, NoReturn, Literal, Any, TextIO
from test import support
from test.support import os_helper
@@ -21,6 +21,9 @@
from test.libregrtest.setup import setup_tests
from test.libregrtest.utils import format_duration, print_warning
+if sys.platform == 'win32':
+ import locale
+
# Display the running tests if nothing happened last N seconds
PROGRESS_UPDATE = 30.0 # seconds
@@ -52,13 +55,12 @@ def parse_worker_args(worker_args) -> tuple[Namespace, str]:
return (ns, test_name)
-def run_test_in_subprocess(testname: str, ns: Namespace) -> subprocess.Popen:
+def run_test_in_subprocess(testname: str, ns: Namespace, stdout_fh: TextIO) -> subprocess.Popen:
ns_dict = vars(ns)
worker_args = (ns_dict, testname)
worker_args = json.dumps(worker_args)
if ns.python is not None:
- # The "executable" may be two or more parts, e.g. "node python.js"
- executable = shlex.split(ns.python)
+ executable = ns.python
else:
executable = [sys.executable]
cmd = [*executable, *support.args_from_interpreter_flags(),
@@ -69,18 +71,17 @@ def run_test_in_subprocess(testname: str, ns: Namespace) -> subprocess.Popen:
# Running the child from the same working directory as regrtest's original
# invocation ensures that TEMPDIR for the child is the same when
# sysconfig.is_python_build() is true. See issue 15300.
- kw = {}
+ kw = dict(
+ stdout=stdout_fh,
+ # bpo-45410: Write stderr into stdout to keep messages order
+ stderr=stdout_fh,
+ text=True,
+ close_fds=(os.name != 'nt'),
+ cwd=os_helper.SAVEDCWD,
+ )
if USE_PROCESS_GROUP:
kw['start_new_session'] = True
- return subprocess.Popen(cmd,
- stdout=subprocess.PIPE,
- # bpo-45410: Write stderr into stdout to keep
- # messages order
- stderr=subprocess.STDOUT,
- universal_newlines=True,
- close_fds=(os.name != 'nt'),
- cwd=os_helper.SAVEDCWD,
- **kw)
+ return subprocess.Popen(cmd, **kw)
def run_tests_worker(ns: Namespace, test_name: str) -> NoReturn:
@@ -206,12 +207,12 @@ def mp_result_error(
test_result.duration_sec = time.monotonic() - self.start_time
return MultiprocessResult(test_result, stdout, err_msg)
- def _run_process(self, test_name: str) -> tuple[int, str, str]:
+ def _run_process(self, test_name: str, stdout_fh: TextIO) -> int:
self.start_time = time.monotonic()
self.current_test_name = test_name
try:
- popen = run_test_in_subprocess(test_name, self.ns)
+ popen = run_test_in_subprocess(test_name, self.ns, stdout_fh)
self._killed = False
self._popen = popen
@@ -228,10 +229,10 @@ def _run_process(self, test_name: str) -> tuple[int, str, str]:
raise ExitThread
try:
- # bpo-45410: stderr is written into stdout
- stdout, _ = popen.communicate(timeout=self.timeout)
- retcode = popen.returncode
+ # gh-94026: stdout+stderr are written to tempfile
+ retcode = popen.wait(timeout=self.timeout)
assert retcode is not None
+ return retcode
except subprocess.TimeoutExpired:
if self._stopped:
# kill() has been called: communicate() fails on reading
@@ -246,17 +247,12 @@ def _run_process(self, test_name: str) -> tuple[int, str, str]:
# bpo-38207: Don't attempt to call communicate() again: on it
# can hang until all child processes using stdout
# pipes completes.
- stdout = ''
except OSError:
if self._stopped:
# kill() has been called: communicate() fails
# on reading closed stdout
raise ExitThread
raise
- else:
- stdout = stdout.strip()
-
- return (retcode, stdout)
except:
self._kill()
raise
@@ -266,7 +262,22 @@ def _run_process(self, test_name: str) -> tuple[int, str, str]:
self.current_test_name = None
def _runtest(self, test_name: str) -> MultiprocessResult:
- retcode, stdout = self._run_process(test_name)
+ if sys.platform == 'win32':
+ # gh-95027: When stdout is not a TTY, Python uses the ANSI code
+ # page for the sys.stdout encoding. If the main process runs in a
+ # terminal, sys.stdout uses WindowsConsoleIO with UTF-8 encoding.
+ encoding = locale.getencoding()
+ else:
+ encoding = sys.stdout.encoding
+ # gh-94026: Write stdout+stderr to a tempfile as workaround for
+ # non-blocking pipes on Emscripten with NodeJS.
+ with tempfile.TemporaryFile('w+', encoding=encoding) as stdout_fh:
+ # gh-93353: Check for leaked temporary files in the parent process,
+ # since the deletion of temporary files can happen late during
+ # Python finalization: too late for libregrtest.
+ retcode = self._run_process(test_name, stdout_fh)
+ stdout_fh.seek(0)
+ stdout = stdout_fh.read().strip()
if retcode is None:
return self.mp_result_error(Timeout(test_name), stdout)
@@ -313,9 +324,6 @@ def run(self) -> None:
def _wait_completed(self) -> None:
popen = self._popen
- # stdout must be closed to ensure that communicate() does not hang
- popen.stdout.close()
-
try:
popen.wait(JOIN_TIMEOUT)
except (subprocess.TimeoutExpired, OSError) as exc:
diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py
index cfc1b82d2785cb..c097d6d597aa05 100644
--- a/Lib/test/libregrtest/setup.py
+++ b/Lib/test/libregrtest/setup.py
@@ -157,4 +157,3 @@ def _adjust_resource_limits():
except (ValueError, OSError) as err:
print(f"Unable to raise RLIMIT_NOFILE from {fd_limit} to "
f"{new_fd_limit}: {err}.")
-
diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py
index d0ea7d0e55e7d5..6e87370c2065ba 100644
--- a/Lib/test/pickletester.py
+++ b/Lib/test/pickletester.py
@@ -1,3 +1,4 @@
+import builtins
import collections
import copyreg
import dbm
@@ -11,6 +12,7 @@
import struct
import sys
import threading
+import types
import unittest
import weakref
from textwrap import dedent
@@ -1980,6 +1982,33 @@ def test_singleton_types(self):
u = self.loads(s)
self.assertIs(type(singleton), u)
+ def test_builtin_types(self):
+ for t in builtins.__dict__.values():
+ if isinstance(t, type) and not issubclass(t, BaseException):
+ for proto in protocols:
+ s = self.dumps(t, proto)
+ self.assertIs(self.loads(s), t)
+
+ def test_builtin_exceptions(self):
+ for t in builtins.__dict__.values():
+ if isinstance(t, type) and issubclass(t, BaseException):
+ for proto in protocols:
+ s = self.dumps(t, proto)
+ u = self.loads(s)
+ if proto <= 2 and issubclass(t, OSError) and t is not BlockingIOError:
+ self.assertIs(u, OSError)
+ elif proto <= 2 and issubclass(t, ImportError):
+ self.assertIs(u, ImportError)
+ else:
+ self.assertIs(u, t)
+
+ def test_builtin_functions(self):
+ for t in builtins.__dict__.values():
+ if isinstance(t, types.BuiltinFunctionType):
+ for proto in protocols:
+ s = self.dumps(t, proto)
+ self.assertIs(self.loads(s), t)
+
# Tests for protocol 2
def test_proto(self):
@@ -2776,6 +2805,15 @@ def pie(self):
unpickled = self.loads(self.dumps(method, proto))
self.assertEqual(method(obj), unpickled(obj))
+ descriptors = (
+ PyMethodsTest.__dict__['cheese'], # static method descriptor
+ PyMethodsTest.__dict__['wine'], # class method descriptor
+ )
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+ for descr in descriptors:
+ with self.subTest(proto=proto, descr=descr):
+ self.assertRaises(TypeError, self.dumps, descr, proto)
+
def test_c_methods(self):
global Subclass
class Subclass(tuple):
@@ -2811,6 +2849,15 @@ class Nested(str):
unpickled = self.loads(self.dumps(method, proto))
self.assertEqual(method(*args), unpickled(*args))
+ descriptors = (
+ bytearray.__dict__['maketrans'], # built-in static method descriptor
+ dict.__dict__['fromkeys'], # built-in class method descriptor
+ )
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+ for descr in descriptors:
+ with self.subTest(proto=proto, descr=descr):
+ self.assertRaises(TypeError, self.dumps, descr, proto)
+
def test_compat_pickle(self):
tests = [
(range(1, 7), '__builtin__', 'xrange'),
@@ -3035,6 +3082,67 @@ def check_array(arr):
# 2-D, non-contiguous
check_array(arr[::2])
+ def test_evil_class_mutating_dict(self):
+ # https://github.com/python/cpython/issues/92930
+ from random import getrandbits
+
+ global Bad
+ class Bad:
+ def __eq__(self, other):
+ return ENABLED
+ def __hash__(self):
+ return 42
+ def __reduce__(self):
+ if getrandbits(6) == 0:
+ collection.clear()
+ return (Bad, ())
+
+ for proto in protocols:
+ for _ in range(20):
+ ENABLED = False
+ collection = {Bad(): Bad() for _ in range(20)}
+ for bad in collection:
+ bad.bad = bad
+ bad.collection = collection
+ ENABLED = True
+ try:
+ data = self.dumps(collection, proto)
+ self.loads(data)
+ except RuntimeError as e:
+ expected = "changed size during iteration"
+ self.assertIn(expected, str(e))
+
+ def test_evil_pickler_mutating_collection(self):
+ # https://github.com/python/cpython/issues/92930
+ if not hasattr(self, "pickler"):
+ raise self.skipTest(f"{type(self)} has no associated pickler type")
+
+ global Clearer
+ class Clearer:
+ pass
+
+ def check(collection):
+ class EvilPickler(self.pickler):
+ def persistent_id(self, obj):
+ if isinstance(obj, Clearer):
+ collection.clear()
+ return None
+ pickler = EvilPickler(io.BytesIO(), proto)
+ try:
+ pickler.dump(collection)
+ except RuntimeError as e:
+ expected = "changed size during iteration"
+ self.assertIn(expected, str(e))
+
+ for proto in protocols:
+ check([Clearer()])
+ check([Clearer(), Clearer()])
+ check({Clearer()})
+ check({Clearer(), Clearer()})
+ check({Clearer(): 1})
+ check({Clearer(): 1, Clearer(): 2})
+ check({1: Clearer(), 2: Clearer()})
+
class BigmemPickleTests:
diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py
index 28549a645b0f57..61fd734d4c605d 100644
--- a/Lib/test/pythoninfo.py
+++ b/Lib/test/pythoninfo.py
@@ -10,6 +10,9 @@
import warnings
+MS_WINDOWS = (sys.platform == 'win32')
+
+
def normalize_text(text):
if text is None:
return None
@@ -127,13 +130,21 @@ def collect_sys(info_add):
encoding = '%s/%s' % (encoding, errors)
info_add('sys.%s.encoding' % name, encoding)
- # Were we compiled --with-pydebug or with #define Py_DEBUG?
+ # Were we compiled --with-pydebug?
Py_DEBUG = hasattr(sys, 'gettotalrefcount')
if Py_DEBUG:
text = 'Yes (sys.gettotalrefcount() present)'
else:
text = 'No (sys.gettotalrefcount() missing)'
- info_add('Py_DEBUG', text)
+ info_add('build.Py_DEBUG', text)
+
+ # Were we compiled --with-trace-refs?
+ Py_TRACE_REFS = hasattr(sys, 'getobjects')
+ if Py_TRACE_REFS:
+ text = 'Yes (sys.getobjects() present)'
+ else:
+ text = 'No (sys.getobjects() missing)'
+ info_add('build.Py_TRACE_REFS', text)
def collect_platform(info_add):
@@ -455,6 +466,11 @@ def collect_datetime(info_add):
def collect_sysconfig(info_add):
+ # On Windows, sysconfig is not reliable to get macros used
+ # to build Python
+ if MS_WINDOWS:
+ return
+
import sysconfig
for name in (
@@ -488,6 +504,28 @@ def collect_sysconfig(info_add):
value = normalize_text(value)
info_add('sysconfig[%s]' % name, value)
+ PY_CFLAGS = sysconfig.get_config_var('PY_CFLAGS')
+ NDEBUG = (PY_CFLAGS and '-DNDEBUG' in PY_CFLAGS)
+ if NDEBUG:
+ text = 'ignore assertions (macro defined)'
+ else:
+ text= 'build assertions (macro not defined)'
+ info_add('build.NDEBUG',text)
+
+ for name in (
+ 'WITH_DOC_STRINGS',
+ 'WITH_DTRACE',
+ 'WITH_FREELISTS',
+ 'WITH_PYMALLOC',
+ 'WITH_VALGRIND',
+ ):
+ value = sysconfig.get_config_var(name)
+ if value:
+ text = 'Yes'
+ else:
+ text = 'No'
+ info_add(f'build.{name}', text)
+
def collect_ssl(info_add):
import os
@@ -543,10 +581,19 @@ def format_attr(attr, value):
def collect_socket(info_add):
- import socket
+ try:
+ import socket
+ except ImportError:
+ return
- hostname = socket.gethostname()
- info_add('socket.hostname', hostname)
+ try:
+ hostname = socket.gethostname()
+ except (OSError, AttributeError):
+ # WASI SDK 16.0 does not have gethostname(2).
+ if sys.platform != "wasi":
+ raise
+ else:
+ info_add('socket.hostname', hostname)
def collect_sqlite(info_add):
@@ -596,7 +643,6 @@ def collect_testcapi(info_add):
return
call_func(info_add, 'pymem.allocator', _testcapi, 'pymem_getallocatorsname')
- copy_attr(info_add, 'pymem.with_pymalloc', _testcapi, 'WITH_PYMALLOC')
def collect_resource(info_add):
@@ -638,6 +684,13 @@ def collect_test_support(info_add):
call_func(info_add, 'test_support._is_gui_available', support, '_is_gui_available')
call_func(info_add, 'test_support.python_is_optimized', support, 'python_is_optimized')
+ info_add('test_support.check_sanitizer(address=True)',
+ support.check_sanitizer(address=True))
+ info_add('test_support.check_sanitizer(memory=True)',
+ support.check_sanitizer(memory=True))
+ info_add('test_support.check_sanitizer(ub=True)',
+ support.check_sanitizer(ub=True))
+
def collect_cc(info_add):
import subprocess
diff --git a/Lib/test/setup_testcppext.py b/Lib/test/setup_testcppext.py
new file mode 100644
index 00000000000000..c6b68104d1333c
--- /dev/null
+++ b/Lib/test/setup_testcppext.py
@@ -0,0 +1,48 @@
+# gh-91321: Build a basic C++ test extension to check that the Python C API is
+# compatible with C++ and does not emit C++ compiler warnings.
+import sys
+from test import support
+
+from setuptools import setup, Extension
+
+
+MS_WINDOWS = (sys.platform == 'win32')
+
+
+SOURCE = support.findfile('_testcppext.cpp')
+if not MS_WINDOWS:
+ # C++ compiler flags for GCC and clang
+ CPPFLAGS = [
+ # gh-91321: The purpose of _testcppext extension is to check that building
+ # a C++ extension using the Python C API does not emit C++ compiler
+ # warnings
+ '-Werror',
+ ]
+else:
+ # Don't pass any compiler flag to MSVC
+ CPPFLAGS = []
+
+
+def main():
+ cppflags = list(CPPFLAGS)
+ if '-std=c++03' in sys.argv:
+ sys.argv.remove('-std=c++03')
+ std = 'c++03'
+ name = '_testcpp03ext'
+ else:
+ # Python currently targets C++11
+ std = 'c++11'
+ name = '_testcpp11ext'
+
+ cppflags = [*CPPFLAGS, f'-std={std}']
+
+ cpp_ext = Extension(
+ name,
+ sources=[SOURCE],
+ language='c++',
+ extra_compile_args=cppflags)
+ setup(name='internal' + name, version='0.0', ext_modules=[cpp_ext])
+
+
+if __name__ == "__main__":
+ main()
diff --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py
index 0d4c7ecf4a04f2..d69edd7bf458da 100644
--- a/Lib/test/string_tests.py
+++ b/Lib/test/string_tests.py
@@ -469,6 +469,11 @@ def test_split(self):
self.checkraises(ValueError, 'hello', 'split', '', 0)
def test_rsplit(self):
+ # without arg
+ self.checkequal(['a', 'b', 'c', 'd'], 'a b c d', 'rsplit')
+ self.checkequal(['a', 'b', 'c', 'd'], 'a b c d', 'rsplit')
+ self.checkequal([], '', 'rsplit')
+
# by a char
self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'rsplit', '|')
self.checkequal(['a|b|c', 'd'], 'a|b|c|d', 'rsplit', '|', 1)
@@ -522,6 +527,9 @@ def test_rsplit(self):
# with keyword args
self.checkequal(['a', 'b', 'c', 'd'], 'a|b|c|d', 'rsplit', sep='|')
+ self.checkequal(['a', 'b', 'c', 'd'], 'a b c d', 'rsplit', sep=None)
+ self.checkequal(['a b c', 'd'],
+ 'a b c d', 'rsplit', sep=None, maxsplit=1)
self.checkequal(['a|b|c', 'd'],
'a|b|c|d', 'rsplit', '|', maxsplit=1)
self.checkequal(['a|b|c', 'd'],
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 3b2f33979db9a8..98be9cdd0e1652 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -199,6 +199,11 @@ def get_original_stdout():
def _force_run(path, func, *args):
try:
return func(*args)
+ except FileNotFoundError as err:
+ # chmod() won't fix a missing file.
+ if verbose >= 2:
+ print('%s: %s' % (err.__class__.__name__, err))
+ raise
except OSError as err:
if verbose >= 2:
print('%s: %s' % (err.__class__.__name__, err))
@@ -299,6 +304,8 @@ def requires(resource, msg=None):
if msg is None:
msg = "Use of the %r resource not enabled" % resource
raise ResourceDenied(msg)
+ if resource in {"network", "urlfetch"} and not has_socket_support:
+ raise ResourceDenied("No socket support")
if resource == 'gui' and not _is_gui_available():
raise ResourceDenied(_is_gui_available.reason)
@@ -521,7 +528,7 @@ def requires_subprocess():
"""Used for subprocess, os.spawn calls, fd inheritance"""
return unittest.skipUnless(has_subprocess_support, "requires subprocess support")
-# Emscripten's socket emulation has limitation. WASI doesn't have sockets yet.
+# Emscripten's socket emulation and WASI sockets have limitations.
has_socket_support = not is_emscripten and not is_wasi
def requires_working_socket(*, module=False):
@@ -1090,7 +1097,7 @@ def _run_suite(suite):
if junit_xml_list is not None:
junit_xml_list.append(result.get_xml_element())
- if not result.testsRun and not result.skipped:
+ if not result.testsRun and not result.skipped and not result.errors:
raise TestDidNotRun
if not result.wasSuccessful():
if len(result.errors) == 1 and not result.failures:
@@ -1491,7 +1498,7 @@ def _platform_specific(self):
self._env = {k.upper(): os.getenv(k) for k in os.environ}
self._env["PYTHONHOME"] = os.path.dirname(self.real)
- if sysconfig.is_python_build(True):
+ if sysconfig.is_python_build():
self._env["PYTHONPATH"] = STDLIB_DIR
else:
def _platform_specific(self):
@@ -1766,6 +1773,16 @@ def cleanup():
setattr(object_to_patch, attr_name, new_value)
+@contextlib.contextmanager
+def patch_list(orig):
+ """Like unittest.mock.patch.dict, but for lists."""
+ try:
+ saved = orig[:]
+ yield
+ finally:
+ orig[:] = saved
+
+
def run_in_subinterp(code):
"""
Run code in a subinterpreter. Raise unittest.SkipTest if the tracemalloc
@@ -2061,7 +2078,7 @@ def wait_process(pid, *, exitcode, timeout=None):
Raise an AssertionError if the process exit code is not equal to exitcode.
- If the process runs longer than timeout seconds (SHORT_TIMEOUT by default),
+ If the process runs longer than timeout seconds (LONG_TIMEOUT by default),
kill the process (if signal.SIGKILL is available) and raise an
AssertionError. The timeout feature is not available on Windows.
"""
@@ -2069,7 +2086,7 @@ def wait_process(pid, *, exitcode, timeout=None):
import signal
if timeout is None:
- timeout = SHORT_TIMEOUT
+ timeout = LONG_TIMEOUT
t0 = time.monotonic()
sleep = 0.001
max_sleep = 0.1
@@ -2080,7 +2097,7 @@ def wait_process(pid, *, exitcode, timeout=None):
# process is still running
dt = time.monotonic() - t0
- if dt > SHORT_TIMEOUT:
+ if dt > timeout:
try:
os.kill(pid, signal.SIGKILL)
os.waitpid(pid, 0)
@@ -2189,3 +2206,31 @@ def clear_ignored_deprecations(*tokens: object) -> None:
if warnings.filters != new_filters:
warnings.filters[:] = new_filters
warnings._filters_mutated()
+
+
+# Skip a test if venv with pip is known to not work.
+def requires_venv_with_pip():
+ # ensurepip requires zlib to open ZIP archives (.whl binary wheel packages)
+ try:
+ import zlib
+ except ImportError:
+ return unittest.skipIf(True, "venv: ensurepip requires zlib")
+
+ # bpo-26610: pip/pep425tags.py requires ctypes.
+ # gh-92820: setuptools/windows_support.py uses ctypes (setuptools 58.1).
+ try:
+ import ctypes
+ except ImportError:
+ ctypes = None
+ return unittest.skipUnless(ctypes, 'venv: pip requires ctypes')
+
+
+@contextlib.contextmanager
+def adjust_int_max_str_digits(max_digits):
+ """Temporarily change the integer string conversion length limit."""
+ current = sys.get_int_max_str_digits()
+ try:
+ sys.set_int_max_str_digits(max_digits)
+ yield
+ finally:
+ sys.set_int_max_str_digits(current)
diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py
index eee37ef0d5a713..f599cc752196e1 100644
--- a/Lib/test/support/os_helper.py
+++ b/Lib/test/support/os_helper.py
@@ -50,7 +50,7 @@
% (TESTFN_UNENCODABLE, sys.getfilesystemencoding()))
TESTFN_UNENCODABLE = None
# macOS and Emscripten deny unencodable filenames (invalid utf-8)
-elif sys.platform not in {'darwin', 'emscripten'}:
+elif sys.platform not in {'darwin', 'emscripten', 'wasi'}:
try:
# ascii and utf-8 cannot encode the byte 0xff
b'\xff'.decode(sys.getfilesystemencoding())
@@ -171,9 +171,13 @@ def can_symlink():
global _can_symlink
if _can_symlink is not None:
return _can_symlink
- symlink_path = TESTFN + "can_symlink"
+ # WASI / wasmtime prevents symlinks with absolute paths, see man
+ # openat2(2) RESOLVE_BENEATH. Almost all symlink tests use absolute
+ # paths. Skip symlink tests on WASI for now.
+ src = os.path.abspath(TESTFN)
+ symlink_path = src + "can_symlink"
try:
- os.symlink(TESTFN, symlink_path)
+ os.symlink(src, symlink_path)
can = True
except (OSError, NotImplementedError, AttributeError):
can = False
@@ -233,6 +237,84 @@ def skip_unless_xattr(test):
return test if ok else unittest.skip(msg)(test)
+_can_chmod = None
+
+def can_chmod():
+ global _can_chmod
+ if _can_chmod is not None:
+ return _can_chmod
+ if not hasattr(os, "chown"):
+ _can_chmod = False
+ return _can_chmod
+ try:
+ with open(TESTFN, "wb") as f:
+ try:
+ os.chmod(TESTFN, 0o777)
+ mode1 = os.stat(TESTFN).st_mode
+ os.chmod(TESTFN, 0o666)
+ mode2 = os.stat(TESTFN).st_mode
+ except OSError as e:
+ can = False
+ else:
+ can = stat.S_IMODE(mode1) != stat.S_IMODE(mode2)
+ finally:
+ unlink(TESTFN)
+ _can_chmod = can
+ return can
+
+
+def skip_unless_working_chmod(test):
+ """Skip tests that require working os.chmod()
+
+ WASI SDK 15.0 cannot change file mode bits.
+ """
+ ok = can_chmod()
+ msg = "requires working os.chmod()"
+ return test if ok else unittest.skip(msg)(test)
+
+
+# Check whether the current effective user has the capability to override
+# DAC (discretionary access control). Typically user root is able to
+# bypass file read, write, and execute permission checks. The capability
+# is independent of the effective user. See capabilities(7).
+_can_dac_override = None
+
+def can_dac_override():
+ global _can_dac_override
+
+ if not can_chmod():
+ _can_dac_override = False
+ if _can_dac_override is not None:
+ return _can_dac_override
+
+ try:
+ with open(TESTFN, "wb") as f:
+ os.chmod(TESTFN, 0o400)
+ try:
+ with open(TESTFN, "wb"):
+ pass
+ except OSError:
+ _can_dac_override = False
+ else:
+ _can_dac_override = True
+ finally:
+ unlink(TESTFN)
+
+ return _can_dac_override
+
+
+def skip_if_dac_override(test):
+ ok = not can_dac_override()
+ msg = "incompatible with CAP_DAC_OVERRIDE"
+ return test if ok else unittest.skip(msg)(test)
+
+
+def skip_unless_dac_override(test):
+ ok = can_dac_override()
+ msg = "requires CAP_DAC_OVERRIDE"
+ return test if ok else unittest.skip(msg)(test)
+
+
def unlink(filename):
try:
_unlink(filename)
@@ -459,7 +541,10 @@ def create_empty_file(filename):
def open_dir_fd(path):
"""Open a file descriptor to a directory."""
assert os.path.isdir(path)
- dir_fd = os.open(path, os.O_RDONLY)
+ flags = os.O_RDONLY
+ if hasattr(os, "O_DIRECTORY"):
+ flags |= os.O_DIRECTORY
+ dir_fd = os.open(path, flags)
try:
yield dir_fd
finally:
@@ -568,6 +653,11 @@ def temp_umask(umask):
yield
finally:
os.umask(oldmask)
+else:
+ @contextlib.contextmanager
+ def temp_umask(umask):
+ """no-op on platforms without umask()"""
+ yield
class EnvironmentVarGuard(collections.abc.MutableMapping):
diff --git a/Lib/test/support/socket_helper.py b/Lib/test/support/socket_helper.py
index 754af181ec922e..50e1d4d56c9b20 100644
--- a/Lib/test/support/socket_helper.py
+++ b/Lib/test/support/socket_helper.py
@@ -11,6 +11,9 @@
HOSTv4 = "127.0.0.1"
HOSTv6 = "::1"
+# WASI SDK 15.0 does not provide gethostname, stub raises OSError ENOTSUP.
+has_gethostname = not support.is_wasi
+
def find_unused_port(family=socket.AF_INET, socktype=socket.SOCK_STREAM):
"""Returns an unused port that should be suitable for binding. This is
@@ -58,7 +61,7 @@ def find_unused_port(family=socket.AF_INET, socktype=socket.SOCK_STREAM):
http://bugs.python.org/issue2550 for more info. The following site also
has a very thorough description about the implications of both REUSEADDR
and EXCLUSIVEADDRUSE on Windows:
- http://msdn2.microsoft.com/en-us/library/ms740621(VS.85).aspx)
+ https://learn.microsoft.com/windows/win32/winsock/using-so-reuseaddr-and-so-exclusiveaddruse
XXX: although this approach is a vast improvement on previous attempts to
elicit unused ports, it rests heavily on the assumption that the ephemeral
diff --git a/Lib/test/support/warnings_helper.py b/Lib/test/support/warnings_helper.py
index 28e96f88b24441..c1bf0562300678 100644
--- a/Lib/test/support/warnings_helper.py
+++ b/Lib/test/support/warnings_helper.py
@@ -44,7 +44,7 @@ def check_syntax_warning(testcase, statement, errtext='',
def ignore_warnings(*, category):
- """Decorator to suppress deprecation warnings.
+ """Decorator to suppress warnings.
Use of context managers to hide warnings make diffs
more noisy and tools like 'git blame' less useful.
diff --git a/Lib/test/test__locale.py b/Lib/test/test__locale.py
index b3bc54cd551048..0947464bb8c04e 100644
--- a/Lib/test/test__locale.py
+++ b/Lib/test/test__locale.py
@@ -109,7 +109,8 @@ def numeric_tester(self, calc_type, calc_value, data_type, used_locale):
@unittest.skipUnless(nl_langinfo, "nl_langinfo is not available")
@unittest.skipIf(
- support.is_emscripten, "musl libc issue on Emscripten, bpo-46390"
+ support.is_emscripten or support.is_wasi,
+ "musl libc issue on Emscripten, bpo-46390"
)
def test_lc_numeric_nl_langinfo(self):
# Test nl_langinfo against known values
@@ -128,7 +129,8 @@ def test_lc_numeric_nl_langinfo(self):
self.skipTest('no suitable locales')
@unittest.skipIf(
- support.is_emscripten, "musl libc issue on Emscripten, bpo-46390"
+ support.is_emscripten or support.is_wasi,
+ "musl libc issue on Emscripten, bpo-46390"
)
def test_lc_numeric_localeconv(self):
# Test localeconv against known values
diff --git a/Lib/test/test__osx_support.py b/Lib/test/test__osx_support.py
index 907ae27d529b50..4a14cb352138ef 100644
--- a/Lib/test/test__osx_support.py
+++ b/Lib/test/test__osx_support.py
@@ -19,8 +19,7 @@ def setUp(self):
self.maxDiff = None
self.prog_name = 'bogus_program_xxxx'
self.temp_path_dir = os.path.abspath(os.getcwd())
- self.env = os_helper.EnvironmentVarGuard()
- self.addCleanup(self.env.__exit__)
+ self.env = self.enterContext(os_helper.EnvironmentVarGuard())
for cv in ('CFLAGS', 'LDFLAGS', 'CPPFLAGS',
'BASECFLAGS', 'BLDSHARED', 'LDSHARED', 'CC',
'CXX', 'PY_CFLAGS', 'PY_LDFLAGS', 'PY_CPPFLAGS',
diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index 8509deb93f1e23..6322ebbb8405ee 100644
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -1,5 +1,7 @@
# Author: Steven J. Bethard .
+import contextlib
+import functools
import inspect
import io
import operator
@@ -35,17 +37,46 @@ def getvalue(self):
return self.buffer.raw.getvalue().decode('utf-8')
+class StdStreamTest(unittest.TestCase):
+
+ def test_skip_invalid_stderr(self):
+ parser = argparse.ArgumentParser()
+ with (
+ contextlib.redirect_stderr(None),
+ mock.patch('argparse._sys.exit')
+ ):
+ parser.exit(status=0, message='foo')
+
+ def test_skip_invalid_stdout(self):
+ parser = argparse.ArgumentParser()
+ for func in (
+ parser.print_usage,
+ parser.print_help,
+ functools.partial(parser.parse_args, ['-h'])
+ ):
+ with (
+ self.subTest(func=func),
+ contextlib.redirect_stdout(None),
+ # argparse uses stderr as a fallback
+ StdIOBuffer() as mocked_stderr,
+ contextlib.redirect_stderr(mocked_stderr),
+ mock.patch('argparse._sys.exit'),
+ ):
+ func()
+ self.assertRegex(mocked_stderr.getvalue(), r'usage:')
+
+
class TestCase(unittest.TestCase):
def setUp(self):
# The tests assume that line wrapping occurs at 80 columns, but this
# behaviour can be overridden by setting the COLUMNS environment
# variable. To ensure that this width is used, set COLUMNS to 80.
- env = os_helper.EnvironmentVarGuard()
+ env = self.enterContext(os_helper.EnvironmentVarGuard())
env['COLUMNS'] = '80'
- self.addCleanup(env.__exit__)
+@os_helper.skip_unless_working_chmod
class TempDirMixin(object):
def setUp(self):
@@ -296,7 +327,7 @@ class TestOptionalsSingleDashCombined(ParserTestCase):
Sig('-z'),
]
failures = ['a', '--foo', '-xa', '-x --foo', '-x -z', '-z -x',
- '-yx', '-yz a', '-yyyx', '-yyyza', '-xyza']
+ '-yx', '-yz a', '-yyyx', '-yyyza', '-xyza', '-x=']
successes = [
('', NS(x=False, yyy=None, z=None)),
('-x', NS(x=True, yyy=None, z=None)),
@@ -1723,8 +1754,7 @@ def __eq__(self, other):
return self.name == other.name
-@unittest.skipIf(hasattr(os, 'geteuid') and os.geteuid() == 0,
- "non-root user required")
+@os_helper.skip_if_dac_override
class TestFileTypeW(TempDirMixin, ParserTestCase):
"""Test the FileType option/argument type for writing files"""
@@ -1746,8 +1776,8 @@ def setUp(self):
('-x - -', NS(x=eq_stdout, spam=eq_stdout)),
]
-@unittest.skipIf(hasattr(os, 'geteuid') and os.geteuid() == 0,
- "non-root user required")
+
+@os_helper.skip_if_dac_override
class TestFileTypeX(TempDirMixin, ParserTestCase):
"""Test the FileType option/argument type for writing new files only"""
@@ -1767,8 +1797,7 @@ def setUp(self):
]
-@unittest.skipIf(hasattr(os, 'geteuid') and os.geteuid() == 0,
- "non-root user required")
+@os_helper.skip_if_dac_override
class TestFileTypeWB(TempDirMixin, ParserTestCase):
"""Test the FileType option/argument type for writing binary files"""
@@ -1785,8 +1814,7 @@ class TestFileTypeWB(TempDirMixin, ParserTestCase):
]
-@unittest.skipIf(hasattr(os, 'geteuid') and os.geteuid() == 0,
- "non-root user required")
+@os_helper.skip_if_dac_override
class TestFileTypeXB(TestFileTypeX):
"Test the FileType option/argument type for writing new binary files only"
@@ -3428,9 +3456,8 @@ class TestShortColumns(HelpTestCase):
but we don't want any exceptions thrown in such cases. Only ugly representation.
'''
def setUp(self):
- env = os_helper.EnvironmentVarGuard()
+ env = self.enterContext(os_helper.EnvironmentVarGuard())
env.set("COLUMNS", '15')
- self.addCleanup(env.__exit__)
parser_signature = TestHelpBiggerOptionals.parser_signature
argument_signatures = TestHelpBiggerOptionals.argument_signatures
@@ -3757,6 +3784,28 @@ class TestHelpUsage(HelpTestCase):
version = ''
+class TestHelpUsageWithParentheses(HelpTestCase):
+ parser_signature = Sig(prog='PROG')
+ argument_signatures = [
+ Sig('positional', metavar='(example) positional'),
+ Sig('-p', '--optional', metavar='{1 (option A), 2 (option B)}'),
+ ]
+
+ usage = '''\
+ usage: PROG [-h] [-p {1 (option A), 2 (option B)}] (example) positional
+ '''
+ help = usage + '''\
+
+ positional arguments:
+ (example) positional
+
+ options:
+ -h, --help show this help message and exit
+ -p {1 (option A), 2 (option B)}, --optional {1 (option A), 2 (option B)}
+ '''
+ version = ''
+
+
class TestHelpOnlyUserGroups(HelpTestCase):
"""Test basic usage messages"""
diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 03d9b310f161b9..f7221955e3e042 100644
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -336,6 +336,41 @@ def test_ast_validation(self):
tree = ast.parse(snippet)
compile(tree, '', 'exec')
+ def test_invalid_position_information(self):
+ invalid_linenos = [
+ (10, 1), (-10, -11), (10, -11), (-5, -2), (-5, 1)
+ ]
+
+ for lineno, end_lineno in invalid_linenos:
+ with self.subTest(f"Check invalid linenos {lineno}:{end_lineno}"):
+ snippet = "a = 1"
+ tree = ast.parse(snippet)
+ tree.body[0].lineno = lineno
+ tree.body[0].end_lineno = end_lineno
+ with self.assertRaises(ValueError):
+ compile(tree, '', 'exec')
+
+ invalid_col_offsets = [
+ (10, 1), (-10, -11), (10, -11), (-5, -2), (-5, 1)
+ ]
+ for col_offset, end_col_offset in invalid_col_offsets:
+ with self.subTest(f"Check invalid col_offset {col_offset}:{end_col_offset}"):
+ snippet = "a = 1"
+ tree = ast.parse(snippet)
+ tree.body[0].col_offset = col_offset
+ tree.body[0].end_col_offset = end_col_offset
+ with self.assertRaises(ValueError):
+ compile(tree, '', 'exec')
+
+ def test_compilation_of_ast_nodes_with_default_end_position_values(self):
+ tree = ast.Module(body=[
+ ast.Import(names=[ast.alias(name='builtins', lineno=1, col_offset=0)], lineno=1, col_offset=0),
+ ast.Import(names=[ast.alias(name='traceback', lineno=0, col_offset=0)], lineno=0, col_offset=1)
+ ], type_ignores=[])
+
+ # Check that compilation doesn't crash. Note: this may crash explicitly only on debug mode.
+ compile(tree, "", "exec")
+
def test_slice(self):
slc = ast.parse("x[::]").body[0].value.slice
self.assertIsNone(slc.upper)
@@ -372,6 +407,24 @@ def test_alias(self):
self.assertEqual(alias.col_offset, 16)
self.assertEqual(alias.end_col_offset, 17)
+ im = ast.parse("from bar import y as z").body[0]
+ alias = im.names[0]
+ self.assertEqual(alias.name, "y")
+ self.assertEqual(alias.asname, "z")
+ self.assertEqual(alias.lineno, 1)
+ self.assertEqual(alias.end_lineno, 1)
+ self.assertEqual(alias.col_offset, 16)
+ self.assertEqual(alias.end_col_offset, 22)
+
+ im = ast.parse("import bar as foo").body[0]
+ alias = im.names[0]
+ self.assertEqual(alias.name, "bar")
+ self.assertEqual(alias.asname, "foo")
+ self.assertEqual(alias.lineno, 1)
+ self.assertEqual(alias.end_lineno, 1)
+ self.assertEqual(alias.col_offset, 7)
+ self.assertEqual(alias.end_col_offset, 17)
+
def test_base_classes(self):
self.assertTrue(issubclass(ast.For, ast.stmt))
self.assertTrue(issubclass(ast.Name, ast.expr))
@@ -703,11 +756,48 @@ def test_ast_asdl_signature(self):
expressions[0] = f"expr = {ast.expr.__subclasses__()[0].__doc__}"
self.assertCountEqual(ast.expr.__doc__.split("\n"), expressions)
- def test_issue40614_feature_version(self):
+ def test_positional_only_feature_version(self):
+ ast.parse('def foo(x, /): ...', feature_version=(3, 8))
+ ast.parse('def bar(x=1, /): ...', feature_version=(3, 8))
+ with self.assertRaises(SyntaxError):
+ ast.parse('def foo(x, /): ...', feature_version=(3, 7))
+ with self.assertRaises(SyntaxError):
+ ast.parse('def bar(x=1, /): ...', feature_version=(3, 7))
+
+ ast.parse('lambda x, /: ...', feature_version=(3, 8))
+ ast.parse('lambda x=1, /: ...', feature_version=(3, 8))
+ with self.assertRaises(SyntaxError):
+ ast.parse('lambda x, /: ...', feature_version=(3, 7))
+ with self.assertRaises(SyntaxError):
+ ast.parse('lambda x=1, /: ...', feature_version=(3, 7))
+
+ def test_parenthesized_with_feature_version(self):
+ ast.parse('with (CtxManager() as example): ...', feature_version=(3, 10))
+ # While advertised as a feature in Python 3.10, this was allowed starting 3.9
+ ast.parse('with (CtxManager() as example): ...', feature_version=(3, 9))
+ with self.assertRaises(SyntaxError):
+ ast.parse('with (CtxManager() as example): ...', feature_version=(3, 8))
+ ast.parse('with CtxManager() as example: ...', feature_version=(3, 8))
+
+ def test_debug_f_string_feature_version(self):
ast.parse('f"{x=}"', feature_version=(3, 8))
with self.assertRaises(SyntaxError):
ast.parse('f"{x=}"', feature_version=(3, 7))
+ def test_assignment_expression_feature_version(self):
+ ast.parse('(x := 0)', feature_version=(3, 8))
+ with self.assertRaises(SyntaxError):
+ ast.parse('(x := 0)', feature_version=(3, 7))
+
+ def test_exception_groups_feature_version(self):
+ code = dedent('''
+ try: ...
+ except* Exception: ...
+ ''')
+ ast.parse(code)
+ with self.assertRaises(SyntaxError):
+ ast.parse(code, feature_version=(3, 10))
+
def test_constant_as_name(self):
for constant in "True", "False", "None":
expr = ast.Expression(ast.Name(constant, ast.Load()))
@@ -745,6 +835,32 @@ def next(self):
return self
enum._test_simple_enum(_Precedence, ast._Precedence)
+ @support.cpython_only
+ def test_ast_recursion_limit(self):
+ fail_depth = sys.getrecursionlimit() * 3
+ crash_depth = sys.getrecursionlimit() * 300
+ success_depth = int(fail_depth * 0.75)
+
+ def check_limit(prefix, repeated):
+ expect_ok = prefix + repeated * success_depth
+ ast.parse(expect_ok)
+ for depth in (fail_depth, crash_depth):
+ broken = prefix + repeated * depth
+ details = "Compiling ({!r} + {!r} * {})".format(
+ prefix, repeated, depth)
+ with self.assertRaises(RecursionError, msg=details):
+ with support.infinite_recursion():
+ ast.parse(broken)
+
+ check_limit("a", "()")
+ check_limit("a", ".b")
+ check_limit("a", "[0]")
+ check_limit("a", "*a")
+
+ def test_null_bytes(self):
+ with self.assertRaises(SyntaxError,
+ msg="source code string cannot contain null bytes"):
+ ast.parse("a\0b")
class ASTHelpers_Test(unittest.TestCase):
maxDiff = None
@@ -933,6 +1049,18 @@ def test_increment_lineno(self):
self.assertEqual(ast.increment_lineno(src).lineno, 2)
self.assertIsNone(ast.increment_lineno(src).end_lineno)
+ def test_increment_lineno_on_module(self):
+ src = ast.parse(dedent("""\
+ a = 1
+ b = 2 # type: ignore
+ c = 3
+ d = 4 # type: ignore@tag
+ """), type_comments=True)
+ ast.increment_lineno(src, n=5)
+ self.assertEqual(src.type_ignores[0].lineno, 7)
+ self.assertEqual(src.type_ignores[1].lineno, 9)
+ self.assertEqual(src.type_ignores[1].tag, '@tag')
+
def test_iter_fields(self):
node = ast.parse('foo()', mode='eval')
d = dict(ast.iter_fields(node.body))
@@ -1046,6 +1174,14 @@ def test_literal_eval(self):
self.assertRaises(ValueError, ast.literal_eval, '+True')
self.assertRaises(ValueError, ast.literal_eval, '2+3')
+ def test_literal_eval_str_int_limit(self):
+ with support.adjust_int_max_str_digits(4000):
+ ast.literal_eval('3'*4000) # no error
+ with self.assertRaises(SyntaxError) as err_ctx:
+ ast.literal_eval('3'*4001)
+ self.assertIn('Exceeds the limit ', str(err_ctx.exception))
+ self.assertIn(' Consider hexadecimal ', str(err_ctx.exception))
+
def test_literal_eval_complex(self):
# Issue #4907
self.assertEqual(ast.literal_eval('6j'), 6j)
@@ -1654,6 +1790,12 @@ def test_stdlib_validates(self):
kwd_attrs=[],
kwd_patterns=[ast.MatchStar()]
),
+ ast.MatchClass(
+ constant_true, # invalid name
+ patterns=[],
+ kwd_attrs=['True'],
+ kwd_patterns=[pattern_1]
+ ),
ast.MatchSequence(
[
ast.MatchStar("True")
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index c6671bd0ad3d85..6ba602dd619fba 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -40,7 +40,6 @@ def mock_socket_module():
m_socket.socket = mock.MagicMock()
m_socket.socket.return_value = test_utils.mock_nonblocking_socket()
- m_socket.getaddrinfo._is_coroutine = False
return m_socket
@@ -747,7 +746,7 @@ async def coro():
def test_env_var_debug(self):
code = '\n'.join((
'import asyncio',
- 'loop = asyncio.get_event_loop()',
+ 'loop = asyncio.new_event_loop()',
'print(loop.get_debug())'))
# Test with -E to not fail if the unit test was run with
@@ -1286,9 +1285,7 @@ def _test_create_connection_ip_addr(self, m_socket, allow_inet_pton):
sock = m_socket.socket.return_value
self.loop._add_reader = mock.Mock()
- self.loop._add_reader._is_coroutine = False
self.loop._add_writer = mock.Mock()
- self.loop._add_writer._is_coroutine = False
coro = self.loop.create_connection(asyncio.Protocol, '1.2.3.4', 80)
t, p = self.loop.run_until_complete(coro)
@@ -1330,9 +1327,7 @@ def test_create_connection_ipv6_scope(self, m_socket):
sock.family = socket.AF_INET6
self.loop._add_reader = mock.Mock()
- self.loop._add_reader._is_coroutine = False
self.loop._add_writer = mock.Mock()
- self.loop._add_writer._is_coroutine = False
coro = self.loop.create_connection(asyncio.Protocol, 'fe80::1%1', 80)
t, p = self.loop.run_until_complete(coro)
@@ -1359,9 +1354,7 @@ def test_create_connection_service_name(self, m_socket):
sock = m_socket.socket.return_value
self.loop._add_reader = mock.Mock()
- self.loop._add_reader._is_coroutine = False
self.loop._add_writer = mock.Mock()
- self.loop._add_writer._is_coroutine = False
for service, port in ('http', 80), (b'http', 80):
coro = self.loop.create_connection(asyncio.Protocol,
@@ -1590,7 +1583,6 @@ class Err(OSError):
m_socket.getaddrinfo.return_value = [
(2, 1, 6, '', ('127.0.0.1', 10100))]
- m_socket.getaddrinfo._is_coroutine = False
m_sock = m_socket.socket.return_value = mock.Mock()
m_sock.bind.side_effect = Err
@@ -1601,7 +1593,6 @@ class Err(OSError):
@patch_socket
def test_create_datagram_endpoint_no_addrinfo(self, m_socket):
m_socket.getaddrinfo.return_value = []
- m_socket.getaddrinfo._is_coroutine = False
coro = self.loop.create_datagram_endpoint(
MyDatagramProto, local_addr=('localhost', 0))
@@ -1835,7 +1826,6 @@ def getaddrinfo(*args, **kw):
m_socket.getaddrinfo = getaddrinfo
m_socket.socket.return_value.bind = bind = mock.Mock()
self.loop._add_reader = mock.Mock()
- self.loop._add_reader._is_coroutine = False
reuseport_supported = hasattr(socket, 'SO_REUSEPORT')
coro = self.loop.create_datagram_endpoint(
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 05d9107b28e2ae..5728d25254f369 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -671,6 +671,47 @@ def test_create_connection_local_addr(self):
self.assertEqual(port, expected)
tr.close()
+ def test_create_connection_local_addr_skip_different_family(self):
+ # See https://github.com/python/cpython/issues/86508
+ port1 = socket_helper.find_unused_port()
+ port2 = socket_helper.find_unused_port()
+ getaddrinfo_orig = self.loop.getaddrinfo
+
+ async def getaddrinfo(host, port, *args, **kwargs):
+ if port == port2:
+ return [(socket.AF_INET6, socket.SOCK_STREAM, 0, '', ('::1', 0, 0, 0)),
+ (socket.AF_INET, socket.SOCK_STREAM, 0, '', ('127.0.0.1', 0))]
+ return await getaddrinfo_orig(host, port, *args, **kwargs)
+
+ self.loop.getaddrinfo = getaddrinfo
+
+ f = self.loop.create_connection(
+ lambda: MyProto(loop=self.loop),
+ 'localhost', port1, local_addr=('localhost', port2))
+
+ with self.assertRaises(OSError):
+ self.loop.run_until_complete(f)
+
+ def test_create_connection_local_addr_nomatch_family(self):
+ # See https://github.com/python/cpython/issues/86508
+ port1 = socket_helper.find_unused_port()
+ port2 = socket_helper.find_unused_port()
+ getaddrinfo_orig = self.loop.getaddrinfo
+
+ async def getaddrinfo(host, port, *args, **kwargs):
+ if port == port2:
+ return [(socket.AF_INET6, socket.SOCK_STREAM, 0, '', ('::1', 0, 0, 0))]
+ return await getaddrinfo_orig(host, port, *args, **kwargs)
+
+ self.loop.getaddrinfo = getaddrinfo
+
+ f = self.loop.create_connection(
+ lambda: MyProto(loop=self.loop),
+ 'localhost', port1, local_addr=('localhost', port2))
+
+ with self.assertRaises(OSError):
+ self.loop.run_until_complete(f)
+
def test_create_connection_local_addr_in_use(self):
with test_utils.run_test_server() as httpd:
f = self.loop.create_connection(
@@ -2547,7 +2588,6 @@ def test_event_loop_policy(self):
def test_get_event_loop(self):
policy = asyncio.DefaultEventLoopPolicy()
self.assertIsNone(policy._local._loop)
-
loop = policy.get_event_loop()
self.assertIsInstance(loop, asyncio.AbstractEventLoop)
@@ -2563,6 +2603,7 @@ def test_get_event_loop_calls_set_event_loop(self):
wraps=policy.set_event_loop) as m_set_event_loop:
loop = policy.get_event_loop()
+ self.addCleanup(loop.close)
# policy._local._loop must be set through .set_event_loop()
# (the unix DefaultEventLoopPolicy needs this call to attach
@@ -2596,7 +2637,8 @@ def test_new_event_loop(self):
def test_set_event_loop(self):
policy = asyncio.DefaultEventLoopPolicy()
- old_loop = policy.get_event_loop()
+ old_loop = policy.new_event_loop()
+ policy.set_event_loop(old_loop)
self.assertRaises(TypeError, policy.set_event_loop, object())
@@ -2709,15 +2751,11 @@ def get_event_loop(self):
asyncio.set_event_loop_policy(Policy())
loop = asyncio.new_event_loop()
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaises(TestError):
- asyncio.get_event_loop()
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaises(TestError):
+ asyncio.get_event_loop()
asyncio.set_event_loop(None)
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaises(TestError):
- asyncio.get_event_loop()
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaises(TestError):
+ asyncio.get_event_loop()
with self.assertRaisesRegex(RuntimeError, 'no running'):
asyncio.get_running_loop()
@@ -2731,16 +2769,11 @@ async def func():
loop.run_until_complete(func())
asyncio.set_event_loop(loop)
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaises(TestError):
- asyncio.get_event_loop()
- self.assertEqual(cm.filename, __file__)
-
+ with self.assertRaises(TestError):
+ asyncio.get_event_loop()
asyncio.set_event_loop(None)
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaises(TestError):
- asyncio.get_event_loop()
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaises(TestError):
+ asyncio.get_event_loop()
finally:
asyncio.set_event_loop_policy(old_policy)
@@ -2759,15 +2792,11 @@ def test_get_event_loop_returns_running_loop2(self):
loop = asyncio.new_event_loop()
self.addCleanup(loop.close)
- with self.assertWarns(DeprecationWarning) as cm:
- loop2 = asyncio.get_event_loop()
+ loop2 = asyncio.get_event_loop()
self.addCleanup(loop2.close)
- self.assertEqual(cm.filename, __file__)
asyncio.set_event_loop(None)
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaisesRegex(RuntimeError, 'no current'):
- asyncio.get_event_loop()
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaisesRegex(RuntimeError, 'no current'):
+ asyncio.get_event_loop()
with self.assertRaisesRegex(RuntimeError, 'no running'):
asyncio.get_running_loop()
@@ -2781,15 +2810,11 @@ async def func():
loop.run_until_complete(func())
asyncio.set_event_loop(loop)
- with self.assertWarns(DeprecationWarning) as cm:
- self.assertIs(asyncio.get_event_loop(), loop)
- self.assertEqual(cm.filename, __file__)
+ self.assertIs(asyncio.get_event_loop(), loop)
asyncio.set_event_loop(None)
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaisesRegex(RuntimeError, 'no current'):
- asyncio.get_event_loop()
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaisesRegex(RuntimeError, 'no current'):
+ asyncio.get_event_loop()
finally:
asyncio.set_event_loop_policy(old_policy)
diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py
index f4a46ec90a16fe..c6aad824c78d06 100644
--- a/Lib/test/test_asyncio/test_futures.py
+++ b/Lib/test/test_asyncio/test_futures.py
@@ -145,10 +145,8 @@ def test_initial_state(self):
self.assertTrue(f.cancelled())
def test_constructor_without_loop(self):
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'):
- self._new_future()
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaisesRegex(RuntimeError, 'no current event loop'):
+ self._new_future()
def test_constructor_use_running_loop(self):
async def test():
@@ -158,12 +156,10 @@ async def test():
self.assertIs(f.get_loop(), self.loop)
def test_constructor_use_global_loop(self):
- # Deprecated in 3.10
+ # Deprecated in 3.10, undeprecated in 3.11.1
asyncio.set_event_loop(self.loop)
self.addCleanup(asyncio.set_event_loop, None)
- with self.assertWarns(DeprecationWarning) as cm:
- f = self._new_future()
- self.assertEqual(cm.filename, __file__)
+ f = self._new_future()
self.assertIs(f._loop, self.loop)
self.assertIs(f.get_loop(), self.loop)
@@ -228,22 +224,14 @@ def test_future_cancel_message_getter(self):
self.assertTrue(hasattr(f, '_cancel_message'))
self.assertEqual(f._cancel_message, None)
- with self.assertWarnsRegex(
- DeprecationWarning,
- "Passing 'msg' argument"
- ):
- f.cancel('my message')
+ f.cancel('my message')
with self.assertRaises(asyncio.CancelledError):
self.loop.run_until_complete(f)
self.assertEqual(f._cancel_message, 'my message')
def test_future_cancel_message_setter(self):
f = self._new_future(loop=self.loop)
- with self.assertWarnsRegex(
- DeprecationWarning,
- "Passing 'msg' argument"
- ):
- f.cancel('my message')
+ f.cancel('my message')
f._cancel_message = 'my new message'
self.assertEqual(f._cancel_message, 'my new message')
@@ -507,10 +495,8 @@ def run(arg):
return (arg, threading.get_ident())
ex = concurrent.futures.ThreadPoolExecutor(1)
f1 = ex.submit(run, 'oi')
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaises(RuntimeError):
- asyncio.wrap_future(f1)
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaisesRegex(RuntimeError, 'no current event loop'):
+ asyncio.wrap_future(f1)
ex.shutdown(wait=True)
def test_wrap_future_use_running_loop(self):
@@ -525,16 +511,14 @@ async def test():
ex.shutdown(wait=True)
def test_wrap_future_use_global_loop(self):
- # Deprecated in 3.10
+ # Deprecated in 3.10, undeprecated in 3.11.1
asyncio.set_event_loop(self.loop)
self.addCleanup(asyncio.set_event_loop, None)
def run(arg):
return (arg, threading.get_ident())
ex = concurrent.futures.ThreadPoolExecutor(1)
f1 = ex.submit(run, 'oi')
- with self.assertWarns(DeprecationWarning) as cm:
- f2 = asyncio.wrap_future(f1)
- self.assertEqual(cm.filename, __file__)
+ f2 = asyncio.wrap_future(f1)
self.assertIs(self.loop, f2._loop)
ex.shutdown(wait=True)
@@ -623,6 +607,8 @@ def test_future_iter_throw(self):
Exception, Exception("elephant"), 32)
self.assertRaises(TypeError, fi.throw,
Exception("elephant"), Exception("elephant"))
+ # https://github.com/python/cpython/issues/101326
+ self.assertRaises(ValueError, fi.throw, ValueError, None, None)
self.assertRaises(TypeError, fi.throw, list)
def test_future_del_collect(self):
@@ -832,6 +818,21 @@ def __eq__(self, other):
fut.remove_done_callback(evil())
+ def test_remove_done_callbacks_list_clear(self):
+ # see https://github.com/python/cpython/issues/97592 for details
+
+ fut = self._new_future()
+ fut.add_done_callback(str)
+
+ for _ in range(63):
+ fut.add_done_callback(id)
+
+ class evil:
+ def __eq__(self, other):
+ fut.remove_done_callback(other)
+
+ fut.remove_done_callback(evil())
+
def test_schedule_callbacks_list_mutation_1(self):
# see http://bugs.python.org/issue28963 for details
diff --git a/Lib/test/test_asyncio/test_futures2.py b/Lib/test/test_asyncio/test_futures2.py
index 60b58850369f05..71279b69c7929e 100644
--- a/Lib/test/test_asyncio/test_futures2.py
+++ b/Lib/test/test_asyncio/test_futures2.py
@@ -1,13 +1,42 @@
# IsolatedAsyncioTestCase based tests
import asyncio
+import traceback
import unittest
+from asyncio import tasks
def tearDownModule():
asyncio.set_event_loop_policy(None)
-class FutureTests(unittest.IsolatedAsyncioTestCase):
+class FutureTests:
+
+ async def test_future_traceback(self):
+
+ async def raise_exc():
+ raise TypeError(42)
+
+ future = self.cls(raise_exc())
+
+ for _ in range(5):
+ try:
+ await future
+ except TypeError as e:
+ tb = ''.join(traceback.format_tb(e.__traceback__))
+ self.assertEqual(tb.count("await future"), 1)
+ else:
+ self.fail('TypeError was not raised')
+
+@unittest.skipUnless(hasattr(tasks, '_CTask'),
+ 'requires the C _asyncio module')
+class CFutureTests(FutureTests, unittest.IsolatedAsyncioTestCase):
+ cls = tasks._CTask
+
+class PyFutureTests(FutureTests, unittest.IsolatedAsyncioTestCase):
+ cls = tasks._PyTask
+
+class FutureReprTests(unittest.IsolatedAsyncioTestCase):
+
async def test_recursive_repr_for_pending_tasks(self):
# The call crashes if the guard for recursive call
# in base_futures:_future_repr_info is absent
diff --git a/Lib/test/test_asyncio/test_locks.py b/Lib/test/test_asyncio/test_locks.py
index 415cbe570fde98..c20ec94cd39c4f 100644
--- a/Lib/test/test_asyncio/test_locks.py
+++ b/Lib/test/test_asyncio/test_locks.py
@@ -5,6 +5,7 @@
import re
import asyncio
+import collections
STR_RGX_REPR = (
r'^<(?P.*?) object at (?P.*?)'
@@ -774,6 +775,9 @@ async def test_repr(self):
self.assertTrue('waiters' not in repr(sem))
self.assertTrue(RGX_REPR.match(repr(sem)))
+ if sem._waiters is None:
+ sem._waiters = collections.deque()
+
sem._waiters.append(mock.Mock())
self.assertTrue('waiters:1' in repr(sem))
self.assertTrue(RGX_REPR.match(repr(sem)))
@@ -840,7 +844,7 @@ async def c4(result):
sem.release()
sem.release()
- self.assertEqual(2, sem._value)
+ self.assertEqual(0, sem._value)
await asyncio.sleep(0)
self.assertEqual(0, sem._value)
@@ -853,7 +857,7 @@ async def c4(result):
self.assertTrue(t1.result())
race_tasks = [t2, t3, t4]
done_tasks = [t for t in race_tasks if t.done() and t.result()]
- self.assertTrue(2, len(done_tasks))
+ self.assertEqual(2, len(done_tasks))
# cleanup locked semaphore
sem.release()
@@ -884,6 +888,7 @@ async def test_acquire_cancel_before_awoken(self):
t2.cancel()
sem.release()
+ await asyncio.sleep(0)
await asyncio.sleep(0)
num_done = sum(t.done() for t in [t3, t4])
self.assertEqual(num_done, 1)
@@ -904,9 +909,32 @@ async def test_acquire_hang(self):
t1.cancel()
sem.release()
await asyncio.sleep(0)
+ await asyncio.sleep(0)
self.assertTrue(sem.locked())
self.assertTrue(t2.done())
+ async def test_acquire_no_hang(self):
+
+ sem = asyncio.Semaphore(1)
+
+ async def c1():
+ async with sem:
+ await asyncio.sleep(0)
+ t2.cancel()
+
+ async def c2():
+ async with sem:
+ self.assertFalse(True)
+
+ t1 = asyncio.create_task(c1())
+ t2 = asyncio.create_task(c2())
+
+ r1, r2 = await asyncio.gather(t1, t2, return_exceptions=True)
+ self.assertTrue(r1 is None)
+ self.assertTrue(isinstance(r2, asyncio.CancelledError))
+
+ await asyncio.wait_for(sem.acquire(), timeout=1.0)
+
def test_release_not_acquired(self):
sem = asyncio.BoundedSemaphore()
@@ -945,6 +973,77 @@ async def coro(tag):
result
)
+ async def test_acquire_fifo_order_2(self):
+ sem = asyncio.Semaphore(1)
+ result = []
+
+ async def c1(result):
+ await sem.acquire()
+ result.append(1)
+ return True
+
+ async def c2(result):
+ await sem.acquire()
+ result.append(2)
+ sem.release()
+ await sem.acquire()
+ result.append(4)
+ return True
+
+ async def c3(result):
+ await sem.acquire()
+ result.append(3)
+ return True
+
+ t1 = asyncio.create_task(c1(result))
+ t2 = asyncio.create_task(c2(result))
+ t3 = asyncio.create_task(c3(result))
+
+ await asyncio.sleep(0)
+
+ sem.release()
+ sem.release()
+
+ tasks = [t1, t2, t3]
+ await asyncio.gather(*tasks)
+ self.assertEqual([1, 2, 3, 4], result)
+
+ async def test_acquire_fifo_order_3(self):
+ sem = asyncio.Semaphore(0)
+ result = []
+
+ async def c1(result):
+ await sem.acquire()
+ result.append(1)
+ return True
+
+ async def c2(result):
+ await sem.acquire()
+ result.append(2)
+ return True
+
+ async def c3(result):
+ await sem.acquire()
+ result.append(3)
+ return True
+
+ t1 = asyncio.create_task(c1(result))
+ t2 = asyncio.create_task(c2(result))
+ t3 = asyncio.create_task(c3(result))
+
+ await asyncio.sleep(0)
+
+ t1.cancel()
+
+ await asyncio.sleep(0)
+
+ sem.release()
+ sem.release()
+
+ tasks = [t1, t2, t3]
+ await asyncio.gather(*tasks, return_exceptions=True)
+ self.assertEqual([2, 3], result)
+
class BarrierTests(unittest.IsolatedAsyncioTestCase):
diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py
index 7fca0541ee75a2..44fc7706abee1d 100644
--- a/Lib/test/test_asyncio/test_proactor_events.py
+++ b/Lib/test/test_asyncio/test_proactor_events.py
@@ -290,7 +290,33 @@ def test_force_close_idempotent(self):
tr._closing = True
tr._force_close(None)
test_utils.run_briefly(self.loop)
+ # See https://github.com/python/cpython/issues/89237
+ # `protocol.connection_lost` should be called even if
+ # the transport was closed forcefully otherwise
+ # the resources held by protocol will never be freed
+ # and waiters will never be notified leading to hang.
+ self.assertTrue(self.protocol.connection_lost.called)
+
+ def test_force_close_protocol_connection_lost_once(self):
+ tr = self.socket_transport()
self.assertFalse(self.protocol.connection_lost.called)
+ tr._closing = True
+ # Calling _force_close twice should not call
+ # protocol.connection_lost twice
+ tr._force_close(None)
+ tr._force_close(None)
+ test_utils.run_briefly(self.loop)
+ self.assertEqual(1, self.protocol.connection_lost.call_count)
+
+ def test_close_protocol_connection_lost_once(self):
+ tr = self.socket_transport()
+ self.assertFalse(self.protocol.connection_lost.called)
+ # Calling close twice should not call
+ # protocol.connection_lost twice
+ tr.close()
+ tr.close()
+ test_utils.run_briefly(self.loop)
+ self.assertEqual(1, self.protocol.connection_lost.call_count)
def test_fatal_error_2(self):
tr = self.socket_transport()
@@ -418,6 +444,19 @@ def monkey():
self.assertFalse(tr.is_reading())
+ def test_pause_reading_connection_made(self):
+ tr = self.socket_transport()
+ self.protocol.connection_made.side_effect = lambda _: tr.pause_reading()
+ test_utils.run_briefly(self.loop)
+ self.assertFalse(tr.is_reading())
+ self.loop.assert_no_reader(7)
+
+ tr.resume_reading()
+ self.assertTrue(tr.is_reading())
+
+ tr.close()
+ self.assertFalse(tr.is_reading())
+
def pause_writing_transport(self, high):
tr = self.socket_transport()
diff --git a/Lib/test/test_asyncio/test_runners.py b/Lib/test/test_asyncio/test_runners.py
index 0c2092147842ca..4e3acb97c85d37 100644
--- a/Lib/test/test_asyncio/test_runners.py
+++ b/Lib/test/test_asyncio/test_runners.py
@@ -6,10 +6,9 @@
import signal
import threading
import unittest
-
+from test.test_asyncio import utils as test_utils
from unittest import mock
from unittest.mock import patch
-from test.test_asyncio import utils as test_utils
def tearDownModule():
@@ -45,6 +44,9 @@ class BaseTest(unittest.TestCase):
def new_loop(self):
loop = asyncio.BaseEventLoop()
loop._process_events = mock.Mock()
+ # Mock waking event loop from select
+ loop._write_to_self = mock.Mock()
+ loop._write_to_self.return_value = None
loop._selector = mock.Mock()
loop._selector.select.return_value = ()
loop.shutdown_ag_run = False
@@ -196,6 +198,66 @@ async def main():
self.assertIsNone(spinner.ag_frame)
self.assertFalse(spinner.ag_running)
+ def test_asyncio_run_set_event_loop(self):
+ #See https://github.com/python/cpython/issues/93896
+
+ async def main():
+ await asyncio.sleep(0)
+ return 42
+
+ policy = asyncio.get_event_loop_policy()
+ policy.set_event_loop = mock.Mock()
+ asyncio.run(main())
+ self.assertTrue(policy.set_event_loop.called)
+
+ def test_asyncio_run_without_uncancel(self):
+ # See https://github.com/python/cpython/issues/95097
+ class Task:
+ def __init__(self, loop, coro, **kwargs):
+ self._task = asyncio.Task(coro, loop=loop, **kwargs)
+
+ def cancel(self, *args, **kwargs):
+ return self._task.cancel(*args, **kwargs)
+
+ def add_done_callback(self, *args, **kwargs):
+ return self._task.add_done_callback(*args, **kwargs)
+
+ def remove_done_callback(self, *args, **kwargs):
+ return self._task.remove_done_callback(*args, **kwargs)
+
+ @property
+ def _asyncio_future_blocking(self):
+ return self._task._asyncio_future_blocking
+
+ def result(self, *args, **kwargs):
+ return self._task.result(*args, **kwargs)
+
+ def done(self, *args, **kwargs):
+ return self._task.done(*args, **kwargs)
+
+ def cancelled(self, *args, **kwargs):
+ return self._task.cancelled(*args, **kwargs)
+
+ def exception(self, *args, **kwargs):
+ return self._task.exception(*args, **kwargs)
+
+ def get_loop(self, *args, **kwargs):
+ return self._task.get_loop(*args, **kwargs)
+
+
+ async def main():
+ interrupt_self()
+ await asyncio.Event().wait()
+
+ def new_event_loop():
+ loop = self.new_loop()
+ loop.set_task_factory(Task)
+ return loop
+
+ asyncio.set_event_loop_policy(TestPolicy(new_event_loop))
+ with self.assertRaises(asyncio.CancelledError):
+ asyncio.run(main())
+
class RunnerTests(BaseTest):
@@ -394,6 +456,20 @@ async def coro():
):
runner.run(coro())
+ def test_set_event_loop_called_once(self):
+ # See https://github.com/python/cpython/issues/95736
+ async def coro():
+ pass
+
+ policy = asyncio.get_event_loop_policy()
+ policy.set_event_loop = mock.Mock()
+ runner = asyncio.Runner()
+ runner.run(coro())
+ runner.run(coro())
+
+ self.assertEqual(1, policy.set_event_loop.call_count)
+ runner.close()
+
if __name__ == '__main__':
unittest.main()
diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
index d9d30fc25b513b..fcab26278235e0 100644
--- a/Lib/test/test_asyncio/test_selector_events.py
+++ b/Lib/test/test_asyncio/test_selector_events.py
@@ -61,7 +61,6 @@ def setUp(self):
def test_make_socket_transport(self):
m = mock.Mock()
self.loop.add_reader = mock.Mock()
- self.loop.add_reader._is_coroutine = False
transport = self.loop._make_socket_transport(m, asyncio.Protocol())
self.assertIsInstance(transport, _SelectorSocketTransport)
@@ -535,6 +534,22 @@ def test_pause_resume_reading(self):
self.assertFalse(tr.is_reading())
self.loop.assert_no_reader(7)
+ def test_pause_reading_connection_made(self):
+ tr = self.socket_transport()
+ self.protocol.connection_made.side_effect = lambda _: tr.pause_reading()
+ test_utils.run_briefly(self.loop)
+ self.assertFalse(tr.is_reading())
+ self.loop.assert_no_reader(7)
+
+ tr.resume_reading()
+ self.assertTrue(tr.is_reading())
+ self.loop.assert_reader(7, tr._read_ready)
+
+ tr.close()
+ self.assertFalse(tr.is_reading())
+ self.loop.assert_no_reader(7)
+
+
def test_read_eof_received_error(self):
transport = self.socket_transport()
transport.close = mock.Mock()
diff --git a/Lib/test/test_asyncio/test_sendfile.py b/Lib/test/test_asyncio/test_sendfile.py
index a10504b1c4130e..0198da21d77028 100644
--- a/Lib/test/test_asyncio/test_sendfile.py
+++ b/Lib/test/test_asyncio/test_sendfile.py
@@ -1,6 +1,7 @@
"""Tests for sendfile functionality."""
import asyncio
+import errno
import os
import socket
import sys
@@ -484,8 +485,17 @@ def sendfile_native(transp, file, offset, count):
srv_proto, cli_proto = self.prepare_sendfile(close_after=1024)
with self.assertRaises(ConnectionError):
- self.run_loop(
- self.loop.sendfile(cli_proto.transport, self.file))
+ try:
+ self.run_loop(
+ self.loop.sendfile(cli_proto.transport, self.file))
+ except OSError as e:
+ # macOS may raise OSError of EPROTOTYPE when writing to a
+ # socket that is in the process of closing down.
+ if e.errno == errno.EPROTOTYPE and sys.platform == "darwin":
+ raise ConnectionError
+ else:
+ raise
+
self.run_loop(srv_proto.done)
self.assertTrue(1024 <= srv_proto.nbytes < len(self.DATA),
diff --git a/Lib/test/test_asyncio/test_ssl.py b/Lib/test/test_asyncio/test_ssl.py
index 9ba6ba04b32b8e..aaf3c37101f52a 100644
--- a/Lib/test/test_asyncio/test_ssl.py
+++ b/Lib/test/test_asyncio/test_ssl.py
@@ -5,6 +5,7 @@
import logging
import select
import socket
+import sys
import tempfile
import threading
import time
@@ -20,6 +21,10 @@
from test.test_asyncio import utils as test_utils
+MACOS = (sys.platform == 'darwin')
+BUF_MULTIPLIER = 1024 if not MACOS else 64
+
+
def tearDownModule():
asyncio.set_event_loop_policy(None)
@@ -58,6 +63,16 @@ def connection_lost(self, exc):
self.done.set_result(None)
+class MessageOutFilter(logging.Filter):
+ def __init__(self, msg):
+ self.msg = msg
+
+ def filter(self, record):
+ if self.msg in record.msg:
+ return False
+ return True
+
+
@unittest.skipIf(ssl is None, 'No ssl module')
class TestSSL(test_utils.TestCase):
@@ -82,7 +97,7 @@ def tearDown(self):
def tcp_server(self, server_prog, *,
family=socket.AF_INET,
addr=None,
- timeout=5,
+ timeout=support.SHORT_TIMEOUT,
backlog=1,
max_clients=10):
@@ -113,7 +128,7 @@ def tcp_server(self, server_prog, *,
def tcp_client(self, client_prog,
family=socket.AF_INET,
- timeout=10):
+ timeout=support.SHORT_TIMEOUT):
sock = socket.socket(family, socket.SOCK_STREAM)
@@ -149,7 +164,7 @@ def _create_client_ssl_context(self, *, disable_verify=True):
def _silence_eof_received_warning(self):
# TODO This warning has to be fixed in asyncio.
logger = logging.getLogger('asyncio')
- filter = logging.Filter('has no effect when using ssl')
+ filter = MessageOutFilter('has no effect when using ssl')
logger.addFilter(filter)
try:
yield
@@ -181,8 +196,8 @@ def test_create_server_ssl_1(self):
TOTAL_CNT = 25 # total number of clients that test will create
TIMEOUT = support.LONG_TIMEOUT # timeout for this test
- A_DATA = b'A' * 1024 * 1024
- B_DATA = b'B' * 1024 * 1024
+ A_DATA = b'A' * 1024 * BUF_MULTIPLIER
+ B_DATA = b'B' * 1024 * BUF_MULTIPLIER
sslctx = self._create_server_ssl_context(
test_utils.ONLYCERT, test_utils.ONLYKEY
@@ -238,7 +253,7 @@ def prog(sock):
async def start_server():
extras = {}
- extras = dict(ssl_handshake_timeout=40.0)
+ extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT)
srv = await asyncio.start_server(
handle_client,
@@ -277,8 +292,8 @@ def test_create_connection_ssl_1(self):
CNT = 0
TOTAL_CNT = 25
- A_DATA = b'A' * 1024 * 1024
- B_DATA = b'B' * 1024 * 1024
+ A_DATA = b'A' * 1024 * BUF_MULTIPLIER
+ B_DATA = b'B' * 1024 * BUF_MULTIPLIER
sslctx = self._create_server_ssl_context(
test_utils.ONLYCERT,
@@ -303,7 +318,7 @@ def server(sock):
async def client(addr):
extras = {}
- extras = dict(ssl_handshake_timeout=40.0)
+ extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT)
reader, writer = await asyncio.open_connection(
*addr,
@@ -428,7 +443,7 @@ async def client(addr):
*addr,
ssl=client_sslctx,
server_hostname='',
- ssl_handshake_timeout=1.0)
+ ssl_handshake_timeout=support.SHORT_TIMEOUT)
writer.close()
await self.wait_closed(writer)
@@ -590,7 +605,7 @@ def client():
extras = {}
if server_ssl:
- extras = dict(ssl_handshake_timeout=10.0)
+ extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT)
f = loop.create_task(
loop.connect_accepted_socket(
@@ -718,7 +733,8 @@ async def client(addr):
with self.tcp_server(serve, timeout=self.TIMEOUT) as srv:
self.loop.run_until_complete(
- asyncio.wait_for(client(srv.addr), timeout=10))
+ asyncio.wait_for(client(srv.addr),
+ timeout=support.SHORT_TIMEOUT))
def test_create_connection_memory_leak(self):
HELLO_MSG = b'1' * self.PAYLOAD_SIZE
@@ -776,7 +792,8 @@ async def client(addr):
with self.tcp_server(serve, timeout=self.TIMEOUT) as srv:
self.loop.run_until_complete(
- asyncio.wait_for(client(srv.addr), timeout=10))
+ asyncio.wait_for(client(srv.addr),
+ timeout=support.SHORT_TIMEOUT))
# No garbage is left for SSL client from loop.create_connection, even
# if user stores the SSLTransport in corresponding protocol instance
@@ -936,7 +953,8 @@ async def client(addr):
with self.tcp_server(serve, timeout=self.TIMEOUT) as srv:
self.loop.run_until_complete(
- asyncio.wait_for(client(srv.addr), timeout=10))
+ asyncio.wait_for(client(srv.addr),
+ timeout=support.SHORT_TIMEOUT))
def test_start_tls_server_1(self):
HELLO_MSG = b'1' * self.PAYLOAD_SIZE
@@ -1021,8 +1039,8 @@ def test_create_server_ssl_over_ssl(self):
TOTAL_CNT = 25 # total number of clients that test will create
TIMEOUT = support.LONG_TIMEOUT # timeout for this test
- A_DATA = b'A' * 1024 * 1024
- B_DATA = b'B' * 1024 * 1024
+ A_DATA = b'A' * 1024 * BUF_MULTIPLIER
+ B_DATA = b'B' * 1024 * BUF_MULTIPLIER
sslctx_1 = self._create_server_ssl_context(
test_utils.ONLYCERT, test_utils.ONLYKEY)
@@ -1165,7 +1183,7 @@ def test_shutdown_cleanly(self):
CNT = 0
TOTAL_CNT = 25
- A_DATA = b'A' * 1024 * 1024
+ A_DATA = b'A' * 1024 * BUF_MULTIPLIER
sslctx = self._create_server_ssl_context(
test_utils.ONLYCERT, test_utils.ONLYKEY)
@@ -1186,7 +1204,7 @@ def server(sock):
async def client(addr):
extras = {}
- extras = dict(ssl_handshake_timeout=10.0)
+ extras = dict(ssl_handshake_timeout=support.SHORT_TIMEOUT)
reader, writer = await asyncio.open_connection(
*addr,
@@ -1671,7 +1689,7 @@ def stop(self):
def run(self):
try:
with self._sock:
- self._sock.setblocking(0)
+ self._sock.setblocking(False)
self._run()
finally:
self._s1.close()
diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py
index 098a0da344d0fb..95fc7a159baee8 100644
--- a/Lib/test/test_asyncio/test_streams.py
+++ b/Lib/test/test_asyncio/test_streams.py
@@ -810,10 +810,8 @@ def test_read_all_from_pipe_reader(self):
self.assertEqual(data, b'data')
def test_streamreader_constructor_without_loop(self):
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'):
- asyncio.StreamReader()
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaisesRegex(RuntimeError, 'no current event loop'):
+ asyncio.StreamReader()
def test_streamreader_constructor_use_running_loop(self):
# asyncio issue #184: Ensure that StreamReaderProtocol constructor
@@ -827,21 +825,17 @@ async def test():
def test_streamreader_constructor_use_global_loop(self):
# asyncio issue #184: Ensure that StreamReaderProtocol constructor
# retrieves the current loop if the loop parameter is not set
- # Deprecated in 3.10
+ # Deprecated in 3.10, undeprecated in 3.11.1
self.addCleanup(asyncio.set_event_loop, None)
asyncio.set_event_loop(self.loop)
- with self.assertWarns(DeprecationWarning) as cm:
- reader = asyncio.StreamReader()
- self.assertEqual(cm.filename, __file__)
+ reader = asyncio.StreamReader()
self.assertIs(reader._loop, self.loop)
def test_streamreaderprotocol_constructor_without_loop(self):
reader = mock.Mock()
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'):
- asyncio.StreamReaderProtocol(reader)
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaisesRegex(RuntimeError, 'no current event loop'):
+ asyncio.StreamReaderProtocol(reader)
def test_streamreaderprotocol_constructor_use_running_loop(self):
# asyncio issue #184: Ensure that StreamReaderProtocol constructor
@@ -855,15 +849,32 @@ async def test():
def test_streamreaderprotocol_constructor_use_global_loop(self):
# asyncio issue #184: Ensure that StreamReaderProtocol constructor
# retrieves the current loop if the loop parameter is not set
- # Deprecated in 3.10
+ # Deprecated in 3.10, undeprecated in 3.11.1
self.addCleanup(asyncio.set_event_loop, None)
asyncio.set_event_loop(self.loop)
reader = mock.Mock()
- with self.assertWarns(DeprecationWarning) as cm:
- protocol = asyncio.StreamReaderProtocol(reader)
- self.assertEqual(cm.filename, __file__)
+ protocol = asyncio.StreamReaderProtocol(reader)
self.assertIs(protocol._loop, self.loop)
+ def test_multiple_drain(self):
+ # See https://github.com/python/cpython/issues/74116
+ drained = 0
+
+ async def drainer(stream):
+ nonlocal drained
+ await stream._drain_helper()
+ drained += 1
+
+ async def main():
+ loop = asyncio.get_running_loop()
+ stream = asyncio.streams.FlowControlMixin(loop)
+ stream.pause_writing()
+ loop.call_later(0.1, stream.resume_writing)
+ await asyncio.gather(*[drainer(stream) for _ in range(10)])
+ self.assertEqual(drained, 10)
+
+ self.loop.run_until_complete(main())
+
def test_drain_raises(self):
# See http://bugs.python.org/issue25441
diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py
index 09a5c390b36299..bea2314a528663 100644
--- a/Lib/test/test_asyncio/test_subprocess.py
+++ b/Lib/test/test_asyncio/test_subprocess.py
@@ -1,4 +1,5 @@
import os
+import shutil
import signal
import sys
import unittest
@@ -50,8 +51,6 @@ def setUp(self):
def create_transport(self, waiter=None):
protocol = mock.Mock()
- protocol.connection_made._is_coroutine = False
- protocol.process_exited._is_coroutine = False
transport = TestSubprocessTransport(
self.loop, protocol, ['test'], False,
None, None, None, 0, waiter=waiter)
@@ -184,6 +183,33 @@ def test_kill(self):
else:
self.assertEqual(-signal.SIGKILL, returncode)
+ def test_kill_issue43884(self):
+ if sys.platform == 'win32':
+ blocking_shell_command = f'{sys.executable} -c "import time; time.sleep(2)"'
+ else:
+ blocking_shell_command = 'sleep 1; sleep 1'
+ creationflags = 0
+ if sys.platform == 'win32':
+ from subprocess import CREATE_NEW_PROCESS_GROUP
+ # On windows create a new process group so that killing process
+ # kills the process and all its children.
+ creationflags = CREATE_NEW_PROCESS_GROUP
+ proc = self.loop.run_until_complete(
+ asyncio.create_subprocess_shell(blocking_shell_command, stdout=asyncio.subprocess.PIPE,
+ creationflags=creationflags)
+ )
+ self.loop.run_until_complete(asyncio.sleep(1))
+ if sys.platform == 'win32':
+ proc.send_signal(signal.CTRL_BREAK_EVENT)
+ # On windows it is an alias of terminate which sets the return code
+ proc.kill()
+ returncode = self.loop.run_until_complete(proc.wait())
+ if sys.platform == 'win32':
+ self.assertIsInstance(returncode, int)
+ # expect 1 but sometimes get 0
+ else:
+ self.assertEqual(-signal.SIGKILL, returncode)
+
def test_terminate(self):
args = PROGRAM_BLOCKED
proc = self.loop.run_until_complete(
@@ -404,6 +430,26 @@ async def empty_error():
self.assertEqual(output, None)
self.assertEqual(exitcode, 0)
+ @unittest.skipIf(sys.platform != 'linux', "Don't have /dev/stdin")
+ def test_devstdin_input(self):
+
+ async def devstdin_input(message):
+ code = 'file = open("/dev/stdin"); data = file.read(); print(len(data))'
+ proc = await asyncio.create_subprocess_exec(
+ sys.executable, '-c', code,
+ stdin=asyncio.subprocess.PIPE,
+ stdout=asyncio.subprocess.PIPE,
+ stderr=asyncio.subprocess.PIPE,
+ close_fds=False,
+ )
+ stdout, stderr = await proc.communicate(message)
+ exitcode = await proc.wait()
+ return (stdout, exitcode)
+
+ output, exitcode = self.loop.run_until_complete(devstdin_input(b'abc'))
+ self.assertEqual(output.rstrip(), b'3')
+ self.assertEqual(exitcode, 0)
+
def test_cancel_process_wait(self):
# Issue #23140: cancel Process.wait()
@@ -638,6 +684,23 @@ async def execute():
self.assertIsNone(self.loop.run_until_complete(execute()))
+ def test_subprocess_communicate_stdout(self):
+ # See https://github.com/python/cpython/issues/100133
+ async def get_command_stdout(cmd, *args):
+ proc = await asyncio.create_subprocess_exec(
+ cmd, *args, stdout=asyncio.subprocess.PIPE,
+ )
+ stdout, _ = await proc.communicate()
+ return stdout.decode().strip()
+
+ async def main():
+ outputs = [f'foo{i}' for i in range(10)]
+ res = await asyncio.gather(*[get_command_stdout(sys.executable, '-c',
+ f'print({out!r})') for out in outputs])
+ self.assertEqual(res, outputs)
+
+ self.loop.run_until_complete(main())
+
if sys.platform != 'win32':
# Unix
@@ -702,34 +765,40 @@ class SubprocessPidfdWatcherTests(SubprocessWatcherMixin,
test_utils.TestCase):
Watcher = unix_events.PidfdChildWatcher
-else:
- # Windows
- class SubprocessProactorTests(SubprocessMixin, test_utils.TestCase):
-
- def setUp(self):
- super().setUp()
- self.loop = asyncio.ProactorEventLoop()
- self.set_event_loop(self.loop)
-
-class GenericWatcherTests:
+ class GenericWatcherTests(test_utils.TestCase):
- def test_create_subprocess_fails_with_inactive_watcher(self):
+ def test_create_subprocess_fails_with_inactive_watcher(self):
+ watcher = mock.create_autospec(
+ asyncio.AbstractChildWatcher,
+ **{"__enter__.return_value.is_active.return_value": False}
+ )
- async def execute():
- watcher = mock.create_authspec(asyncio.AbstractChildWatcher)
- watcher.is_active.return_value = False
- asyncio.set_child_watcher(watcher)
+ async def execute():
+ asyncio.set_child_watcher(watcher)
- with self.assertRaises(RuntimeError):
- await subprocess.create_subprocess_exec(
- os_helper.FakePath(sys.executable), '-c', 'pass')
+ with self.assertRaises(RuntimeError):
+ await subprocess.create_subprocess_exec(
+ os_helper.FakePath(sys.executable), '-c', 'pass')
- watcher.add_child_handler.assert_not_called()
+ watcher.add_child_handler.assert_not_called()
- self.assertIsNone(self.loop.run_until_complete(execute()))
+ with asyncio.Runner(loop_factory=asyncio.new_event_loop) as runner:
+ self.assertIsNone(runner.run(execute()))
+ self.assertListEqual(watcher.mock_calls, [
+ mock.call.__enter__(),
+ mock.call.__enter__().is_active(),
+ mock.call.__exit__(RuntimeError, mock.ANY, mock.ANY),
+ ])
+else:
+ # Windows
+ class SubprocessProactorTests(SubprocessMixin, test_utils.TestCase):
+ def setUp(self):
+ super().setUp()
+ self.loop = asyncio.ProactorEventLoop()
+ self.set_event_loop(self.loop)
if __name__ == '__main__':
diff --git a/Lib/test/test_asyncio/test_taskgroups.py b/Lib/test/test_asyncio/test_taskgroups.py
index 69369a6100a8fd..6a0231f2859a62 100644
--- a/Lib/test/test_asyncio/test_taskgroups.py
+++ b/Lib/test/test_asyncio/test_taskgroups.py
@@ -1,9 +1,10 @@
-# Adapted with permission from the EdgeDB project.
+# Adapted with permission from the EdgeDB project;
+# license: PSFL.
import asyncio
import contextvars
-
+import contextlib
from asyncio import taskgroups
import unittest
@@ -122,10 +123,8 @@ async def runner():
self.assertTrue(t2.cancelled())
async def test_cancel_children_on_child_error(self):
- """
- When a child task raises an error, the rest of the children
- are cancelled and the errors are gathered into an EG.
- """
+ # When a child task raises an error, the rest of the children
+ # are cancelled and the errors are gathered into an EG.
NUM = 0
t2_cancel = False
@@ -231,29 +230,29 @@ async def runner():
self.assertEqual(NUM, 15)
- async def test_cancellation_in_body(self):
+ async def test_taskgroup_08(self):
async def foo():
- await asyncio.sleep(0.1)
- 1 / 0
+ try:
+ await asyncio.sleep(10)
+ finally:
+ 1 / 0
async def runner():
async with taskgroups.TaskGroup() as g:
for _ in range(5):
g.create_task(foo())
- try:
- await asyncio.sleep(10)
- except asyncio.CancelledError:
- raise
+ await asyncio.sleep(10)
r = asyncio.create_task(runner())
await asyncio.sleep(0.1)
self.assertFalse(r.done())
r.cancel()
- with self.assertRaises(asyncio.CancelledError) as cm:
+ with self.assertRaises(ExceptionGroup) as cm:
await r
+ self.assertEqual(get_error_types(cm.exception), {ZeroDivisionError})
async def test_taskgroup_09(self):
@@ -317,8 +316,10 @@ async def runner():
async def test_taskgroup_11(self):
async def foo():
- await asyncio.sleep(0.1)
- 1 / 0
+ try:
+ await asyncio.sleep(10)
+ finally:
+ 1 / 0
async def runner():
async with taskgroups.TaskGroup():
@@ -326,24 +327,26 @@ async def runner():
for _ in range(5):
g2.create_task(foo())
- try:
- await asyncio.sleep(10)
- except asyncio.CancelledError:
- raise
+ await asyncio.sleep(10)
r = asyncio.create_task(runner())
await asyncio.sleep(0.1)
self.assertFalse(r.done())
r.cancel()
- with self.assertRaises(asyncio.CancelledError):
+ with self.assertRaises(ExceptionGroup) as cm:
await r
+ self.assertEqual(get_error_types(cm.exception), {ExceptionGroup})
+ self.assertEqual(get_error_types(cm.exception.exceptions[0]), {ZeroDivisionError})
+
async def test_taskgroup_12(self):
async def foo():
- await asyncio.sleep(0.1)
- 1 / 0
+ try:
+ await asyncio.sleep(10)
+ finally:
+ 1 / 0
async def runner():
async with taskgroups.TaskGroup() as g1:
@@ -353,19 +356,19 @@ async def runner():
for _ in range(5):
g2.create_task(foo())
- try:
- await asyncio.sleep(10)
- except asyncio.CancelledError:
- raise
+ await asyncio.sleep(10)
r = asyncio.create_task(runner())
await asyncio.sleep(0.1)
self.assertFalse(r.done())
r.cancel()
- with self.assertRaises(asyncio.CancelledError):
+ with self.assertRaises(ExceptionGroup) as cm:
await r
+ self.assertEqual(get_error_types(cm.exception), {ExceptionGroup})
+ self.assertEqual(get_error_types(cm.exception.exceptions[0]), {ZeroDivisionError})
+
async def test_taskgroup_13(self):
async def crash_after(t):
@@ -425,8 +428,9 @@ async def runner():
self.assertFalse(r.done())
r.cancel()
- with self.assertRaises(asyncio.CancelledError):
+ with self.assertRaises(ExceptionGroup) as cm:
await r
+ self.assertEqual(get_error_types(cm.exception), {ZeroDivisionError})
async def test_taskgroup_16(self):
@@ -452,8 +456,9 @@ async def runner():
self.assertFalse(r.done())
r.cancel()
- with self.assertRaises(asyncio.CancelledError):
+ with self.assertRaises(ExceptionGroup) as cm:
await r
+ self.assertEqual(get_error_types(cm.exception), {ZeroDivisionError})
async def test_taskgroup_17(self):
NUM = 0
@@ -722,6 +727,58 @@ async def coro(val):
await t2
self.assertEqual(2, ctx.get(cvar))
+ async def test_taskgroup_no_create_task_after_failure(self):
+ async def coro1():
+ await asyncio.sleep(0.001)
+ 1 / 0
+ async def coro2(g):
+ try:
+ await asyncio.sleep(1)
+ except asyncio.CancelledError:
+ with self.assertRaises(RuntimeError):
+ g.create_task(c1 := coro1())
+ # We still have to await c1 to avoid a warning
+ with self.assertRaises(ZeroDivisionError):
+ await c1
+
+ with self.assertRaises(ExceptionGroup) as cm:
+ async with taskgroups.TaskGroup() as g:
+ g.create_task(coro1())
+ g.create_task(coro2(g))
+
+ self.assertEqual(get_error_types(cm.exception), {ZeroDivisionError})
+
+ async def test_taskgroup_context_manager_exit_raises(self):
+ # See https://github.com/python/cpython/issues/95289
+ class CustomException(Exception):
+ pass
+
+ async def raise_exc():
+ raise CustomException
+
+ @contextlib.asynccontextmanager
+ async def database():
+ try:
+ yield
+ finally:
+ raise CustomException
+
+ async def main():
+ task = asyncio.current_task()
+ try:
+ async with taskgroups.TaskGroup() as tg:
+ async with database():
+ tg.create_task(raise_exc())
+ await asyncio.sleep(1)
+ except* CustomException as err:
+ self.assertEqual(task.cancelling(), 0)
+ self.assertEqual(len(err.exceptions), 2)
+
+ else:
+ self.fail('CustomException not raised')
+
+ await asyncio.create_task(main())
+
if __name__ == "__main__":
unittest.main()
diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py
index 6458859db2d127..9900e307a477bd 100644
--- a/Lib/test/test_asyncio/test_tasks.py
+++ b/Lib/test/test_asyncio/test_tasks.py
@@ -113,11 +113,7 @@ async def coro():
self.assertTrue(hasattr(t, '_cancel_message'))
self.assertEqual(t._cancel_message, None)
- with self.assertWarnsRegex(
- DeprecationWarning,
- "Passing 'msg' argument"
- ):
- t.cancel('my message')
+ t.cancel('my message')
self.assertEqual(t._cancel_message, 'my message')
with self.assertRaises(asyncio.CancelledError) as cm:
@@ -129,11 +125,7 @@ def test_task_cancel_message_setter(self):
async def coro():
pass
t = self.new_task(self.loop, coro())
- with self.assertWarnsRegex(
- DeprecationWarning,
- "Passing 'msg' argument"
- ):
- t.cancel('my message')
+ t.cancel('my message')
t._cancel_message = 'my new message'
self.assertEqual(t._cancel_message, 'my new message')
@@ -208,10 +200,8 @@ async def notmuch():
a = notmuch()
self.addCleanup(a.close)
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'):
- asyncio.ensure_future(a)
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaisesRegex(RuntimeError, 'no current event loop'):
+ asyncio.ensure_future(a)
async def test():
return asyncio.ensure_future(notmuch())
@@ -221,12 +211,10 @@ async def test():
self.assertTrue(t.done())
self.assertEqual(t.result(), 'ok')
- # Deprecated in 3.10
+ # Deprecated in 3.10, undeprecated in 3.11.1
asyncio.set_event_loop(self.loop)
self.addCleanup(asyncio.set_event_loop, None)
- with self.assertWarns(DeprecationWarning) as cm:
- t = asyncio.ensure_future(notmuch())
- self.assertEqual(cm.filename, __file__)
+ t = asyncio.ensure_future(notmuch())
self.assertIs(t._loop, self.loop)
self.loop.run_until_complete(t)
self.assertTrue(t.done())
@@ -525,7 +513,7 @@ async def task():
finally:
loop.close()
- def test_uncancel(self):
+ def test_uncancel_basic(self):
loop = asyncio.new_event_loop()
async def task():
@@ -538,14 +526,137 @@ async def task():
try:
t = self.new_task(loop, task())
loop.run_until_complete(asyncio.sleep(0.01))
- self.assertTrue(t.cancel()) # Cancel first sleep
+
+ # Cancel first sleep
+ self.assertTrue(t.cancel())
self.assertIn(" cancelling ", repr(t))
+ self.assertEqual(t.cancelling(), 1)
+ self.assertFalse(t.cancelled()) # Task is still not complete
loop.run_until_complete(asyncio.sleep(0.01))
- self.assertNotIn(" cancelling ", repr(t)) # after .uncancel()
- self.assertTrue(t.cancel()) # Cancel second sleep
+ # after .uncancel()
+ self.assertNotIn(" cancelling ", repr(t))
+ self.assertEqual(t.cancelling(), 0)
+ self.assertFalse(t.cancelled()) # Task is still not complete
+
+ # Cancel second sleep
+ self.assertTrue(t.cancel())
+ self.assertEqual(t.cancelling(), 1)
+ self.assertFalse(t.cancelled()) # Task is still not complete
with self.assertRaises(asyncio.CancelledError):
loop.run_until_complete(t)
+ self.assertTrue(t.cancelled()) # Finally, task complete
+ self.assertTrue(t.done())
+
+ # uncancel is no longer effective after the task is complete
+ t.uncancel()
+ self.assertTrue(t.cancelled())
+ self.assertTrue(t.done())
+ finally:
+ loop.close()
+
+ def test_uncancel_structured_blocks(self):
+ # This test recreates the following high-level structure using uncancel()::
+ #
+ # async def make_request_with_timeout():
+ # try:
+ # async with asyncio.timeout(1):
+ # # Structured block affected by the timeout:
+ # await make_request()
+ # await make_another_request()
+ # except TimeoutError:
+ # pass # There was a timeout
+ # # Outer code not affected by the timeout:
+ # await unrelated_code()
+
+ loop = asyncio.new_event_loop()
+
+ async def make_request_with_timeout(*, sleep: float, timeout: float):
+ task = asyncio.current_task()
+ loop = task.get_loop()
+
+ timed_out = False
+ structured_block_finished = False
+ outer_code_reached = False
+
+ def on_timeout():
+ nonlocal timed_out
+ timed_out = True
+ task.cancel()
+
+ timeout_handle = loop.call_later(timeout, on_timeout)
+ try:
+ try:
+ # Structured block affected by the timeout
+ await asyncio.sleep(sleep)
+ structured_block_finished = True
+ finally:
+ timeout_handle.cancel()
+ if (
+ timed_out
+ and task.uncancel() == 0
+ and sys.exc_info()[0] is asyncio.CancelledError
+ ):
+ # Note the five rules that are needed here to satisfy proper
+ # uncancellation:
+ #
+ # 1. handle uncancellation in a `finally:` block to allow for
+ # plain returns;
+ # 2. our `timed_out` flag is set, meaning that it was our event
+ # that triggered the need to uncancel the task, regardless of
+ # what exception is raised;
+ # 3. we can call `uncancel()` because *we* called `cancel()`
+ # before;
+ # 4. we call `uncancel()` but we only continue converting the
+ # CancelledError to TimeoutError if `uncancel()` caused the
+ # cancellation request count go down to 0. We need to look
+ # at the counter vs having a simple boolean flag because our
+ # code might have been nested (think multiple timeouts). See
+ # commit 7fce1063b6e5a366f8504e039a8ccdd6944625cd for
+ # details.
+ # 5. we only convert CancelledError to TimeoutError; for other
+ # exceptions raised due to the cancellation (like
+ # a ConnectionLostError from a database client), simply
+ # propagate them.
+ #
+ # Those checks need to take place in this exact order to make
+ # sure the `cancelling()` counter always stays in sync.
+ #
+ # Additionally, the original stimulus to `cancel()` the task
+ # needs to be unscheduled to avoid re-cancelling the task later.
+ # Here we do it by cancelling `timeout_handle` in the `finally:`
+ # block.
+ raise TimeoutError
+ except TimeoutError:
+ self.assertTrue(timed_out)
+
+ # Outer code not affected by the timeout:
+ outer_code_reached = True
+ await asyncio.sleep(0)
+ return timed_out, structured_block_finished, outer_code_reached
+
+ try:
+ # Test which timed out.
+ t1 = self.new_task(loop, make_request_with_timeout(sleep=10.0, timeout=0.1))
+ timed_out, structured_block_finished, outer_code_reached = (
+ loop.run_until_complete(t1)
+ )
+ self.assertTrue(timed_out)
+ self.assertFalse(structured_block_finished) # it was cancelled
+ self.assertTrue(outer_code_reached) # task got uncancelled after leaving
+ # the structured block and continued until
+ # completion
+ self.assertEqual(t1.cancelling(), 0) # no pending cancellation of the outer task
+
+ # Test which did not time out.
+ t2 = self.new_task(loop, make_request_with_timeout(sleep=0, timeout=10.0))
+ timed_out, structured_block_finished, outer_code_reached = (
+ loop.run_until_complete(t2)
+ )
+ self.assertFalse(timed_out)
+ self.assertTrue(structured_block_finished)
+ self.assertTrue(outer_code_reached)
+ self.assertEqual(t2.cancelling(), 0)
finally:
loop.close()
@@ -590,14 +701,7 @@ async def sleep():
async def coro():
task = self.new_task(loop, sleep())
await asyncio.sleep(0)
- if cancel_args not in ((), (None,)):
- with self.assertWarnsRegex(
- DeprecationWarning,
- "Passing 'msg' argument"
- ):
- task.cancel(*cancel_args)
- else:
- task.cancel(*cancel_args)
+ task.cancel(*cancel_args)
done, pending = await asyncio.wait([task])
task.result()
@@ -631,14 +735,7 @@ async def sleep():
async def coro():
task = self.new_task(loop, sleep())
await asyncio.sleep(0)
- if cancel_args not in ((), (None,)):
- with self.assertWarnsRegex(
- DeprecationWarning,
- "Passing 'msg' argument"
- ):
- task.cancel(*cancel_args)
- else:
- task.cancel(*cancel_args)
+ task.cancel(*cancel_args)
done, pending = await asyncio.wait([task])
task.exception()
@@ -661,17 +758,10 @@ async def sleep():
fut.set_result(None)
await asyncio.sleep(10)
- def cancel(task, msg):
- with self.assertWarnsRegex(
- DeprecationWarning,
- "Passing 'msg' argument"
- ):
- task.cancel(msg)
-
async def coro():
inner_task = self.new_task(loop, sleep())
await fut
- loop.call_soon(cancel, inner_task, 'msg')
+ loop.call_soon(inner_task.cancel, 'msg')
try:
await inner_task
except asyncio.CancelledError as ex:
@@ -697,11 +787,7 @@ async def sleep():
async def coro():
task = self.new_task(loop, sleep())
# We deliberately leave out the sleep here.
- with self.assertWarnsRegex(
- DeprecationWarning,
- "Passing 'msg' argument"
- ):
- task.cancel('my message')
+ task.cancel('my message')
done, pending = await asyncio.wait([task])
task.exception()
@@ -1446,10 +1532,8 @@ async def coro():
self.addCleanup(a.close)
futs = asyncio.as_completed([a])
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'):
- list(futs)
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaisesRegex(RuntimeError, 'no current event loop'):
+ list(futs)
def test_as_completed_coroutine_use_running_loop(self):
loop = self.new_test_loop()
@@ -1653,6 +1737,7 @@ async def fn2():
self.assertTrue(asyncio.iscoroutinefunction(fn2))
self.assertFalse(asyncio.iscoroutinefunction(mock.Mock()))
+ self.assertTrue(asyncio.iscoroutinefunction(mock.AsyncMock()))
def test_coroutine_non_gen_function(self):
async def func():
@@ -1878,10 +1963,8 @@ async def coro():
inner = coro()
self.addCleanup(inner.close)
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaisesRegex(RuntimeError, 'There is no current event loop'):
- asyncio.shield(inner)
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaisesRegex(RuntimeError, 'no current event loop'):
+ asyncio.shield(inner)
def test_shield_coroutine_use_running_loop(self):
async def coro():
@@ -1895,15 +1978,13 @@ async def test():
self.assertEqual(res, 42)
def test_shield_coroutine_use_global_loop(self):
- # Deprecated in 3.10
+ # Deprecated in 3.10, undeprecated in 3.11.1
async def coro():
return 42
asyncio.set_event_loop(self.loop)
self.addCleanup(asyncio.set_event_loop, None)
- with self.assertWarns(DeprecationWarning) as cm:
- outer = asyncio.shield(coro())
- self.assertEqual(cm.filename, __file__)
+ outer = asyncio.shield(coro())
self.assertEqual(outer._loop, self.loop)
res = self.loop.run_until_complete(outer)
self.assertEqual(res, 42)
@@ -2062,14 +2143,7 @@ async def test():
async def main():
qwe = self.new_task(loop, test())
await asyncio.sleep(0.2)
- if cancel_args not in ((), (None,)):
- with self.assertWarnsRegex(
- DeprecationWarning,
- "Passing 'msg' argument"
- ):
- qwe.cancel(*cancel_args)
- else:
- qwe.cancel(*cancel_args)
+ qwe.cancel(*cancel_args)
await qwe
try:
@@ -2383,13 +2457,7 @@ def add_done_callback(self, *args, **kwargs):
return super().add_done_callback(*args, **kwargs)
class Task(CommonFuture, BaseTask):
- def __init__(self, *args, **kwargs):
- self._check_future_called = 0
- super().__init__(*args, **kwargs)
-
- def _check_future(self, future):
- self._check_future_called += 1
- return super()._check_future(future)
+ pass
class Future(CommonFuture, BaseFuture):
pass
@@ -2415,8 +2483,6 @@ async def func():
dict(fut.calls),
{'add_done_callback': 1})
- self.assertEqual(1, task._check_future_called)
-
# Add patched Task & Future back to the test case
cls.Task = Task
cls.Future = Future
@@ -2744,7 +2810,7 @@ def test_current_task_no_running_loop(self):
self.assertIsNone(asyncio.current_task(loop=self.loop))
def test_current_task_no_running_loop_implicit(self):
- with self.assertRaises(RuntimeError):
+ with self.assertRaisesRegex(RuntimeError, 'no running event loop'):
asyncio.current_task()
def test_current_task_with_implicit_loop(self):
@@ -2908,10 +2974,8 @@ def _gather(self, *args, **kwargs):
return asyncio.gather(*args, **kwargs)
def test_constructor_empty_sequence_without_loop(self):
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaises(RuntimeError):
- asyncio.gather()
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaisesRegex(RuntimeError, 'no current event loop'):
+ asyncio.gather()
def test_constructor_empty_sequence_use_running_loop(self):
async def gather():
@@ -2924,12 +2988,10 @@ async def gather():
self.assertEqual(fut.result(), [])
def test_constructor_empty_sequence_use_global_loop(self):
- # Deprecated in 3.10
+ # Deprecated in 3.10, undeprecated in 3.11.1
asyncio.set_event_loop(self.one_loop)
self.addCleanup(asyncio.set_event_loop, None)
- with self.assertWarns(DeprecationWarning) as cm:
- fut = asyncio.gather()
- self.assertEqual(cm.filename, __file__)
+ fut = asyncio.gather()
self.assertIsInstance(fut, asyncio.Future)
self.assertIs(fut._loop, self.one_loop)
self._run_loop(self.one_loop)
@@ -3017,10 +3079,8 @@ async def coro():
self.addCleanup(gen1.close)
gen2 = coro()
self.addCleanup(gen2.close)
- with self.assertWarns(DeprecationWarning) as cm:
- with self.assertRaises(RuntimeError):
- asyncio.gather(gen1, gen2)
- self.assertEqual(cm.filename, __file__)
+ with self.assertRaisesRegex(RuntimeError, 'no current event loop'):
+ asyncio.gather(gen1, gen2)
def test_constructor_use_running_loop(self):
async def coro():
@@ -3034,16 +3094,14 @@ async def gather():
self.one_loop.run_until_complete(fut)
def test_constructor_use_global_loop(self):
- # Deprecated in 3.10
+ # Deprecated in 3.10, undeprecated in 3.11.1
async def coro():
return 'abc'
asyncio.set_event_loop(self.other_loop)
self.addCleanup(asyncio.set_event_loop, None)
gen1 = coro()
gen2 = coro()
- with self.assertWarns(DeprecationWarning) as cm:
- fut = asyncio.gather(gen1, gen2)
- self.assertEqual(cm.filename, __file__)
+ fut = asyncio.gather(gen1, gen2)
self.assertIs(fut._loop, self.other_loop)
self.other_loop.run_until_complete(fut)
diff --git a/Lib/test/test_asyncio/test_timeouts.py b/Lib/test/test_asyncio/test_timeouts.py
index ef1ab0acb390d2..cc8feb8d0c1afb 100644
--- a/Lib/test/test_asyncio/test_timeouts.py
+++ b/Lib/test/test_asyncio/test_timeouts.py
@@ -106,6 +106,30 @@ async def test_timeout_zero(self):
self.assertLess(t1-t0, 2)
self.assertTrue(t0 <= cm.when() <= t1)
+ async def test_timeout_zero_sleep_zero(self):
+ loop = asyncio.get_running_loop()
+ t0 = loop.time()
+ with self.assertRaises(TimeoutError):
+ async with asyncio.timeout(0) as cm:
+ await asyncio.sleep(0)
+ t1 = loop.time()
+ self.assertTrue(cm.expired())
+ # 2 sec for slow CI boxes
+ self.assertLess(t1-t0, 2)
+ self.assertTrue(t0 <= cm.when() <= t1)
+
+ async def test_timeout_in_the_past_sleep_zero(self):
+ loop = asyncio.get_running_loop()
+ t0 = loop.time()
+ with self.assertRaises(TimeoutError):
+ async with asyncio.timeout(-11) as cm:
+ await asyncio.sleep(0)
+ t1 = loop.time()
+ self.assertTrue(cm.expired())
+ # 2 sec for slow CI boxes
+ self.assertLess(t1-t0, 2)
+ self.assertTrue(t0 >= cm.when() <= t1)
+
async def test_foreign_exception_passed(self):
with self.assertRaises(KeyError):
async with asyncio.timeout(0.01) as cm:
@@ -224,6 +248,36 @@ async def test_nested_timeout_in_finally(self):
async with asyncio.timeout(0.01):
await asyncio.sleep(10)
+ async def test_timeout_after_cancellation(self):
+ try:
+ asyncio.current_task().cancel()
+ await asyncio.sleep(1) # work which will be cancelled
+ except asyncio.CancelledError:
+ pass
+ finally:
+ with self.assertRaises(TimeoutError):
+ async with asyncio.timeout(0.0):
+ await asyncio.sleep(1) # some cleanup
+
+ async def test_cancel_in_timeout_after_cancellation(self):
+ try:
+ asyncio.current_task().cancel()
+ await asyncio.sleep(1) # work which will be cancelled
+ except asyncio.CancelledError:
+ pass
+ finally:
+ with self.assertRaises(asyncio.CancelledError):
+ async with asyncio.timeout(1.0):
+ asyncio.current_task().cancel()
+ await asyncio.sleep(2) # some cleanup
+
+ async def test_timeout_exception_cause (self):
+ with self.assertRaises(asyncio.TimeoutError) as exc:
+ async with asyncio.timeout(0):
+ await asyncio.sleep(1)
+ cause = exc.exception.__cause__
+ assert isinstance(cause, asyncio.CancelledError)
+
if __name__ == '__main__':
unittest.main()
diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
index 2f68459d30cd48..01c1214c7f7cc2 100644
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -1530,7 +1530,7 @@ def test_sigchld_child_reaped_elsewhere(self, m_waitpid):
self.watcher._sig_chld()
if isinstance(self.watcher, asyncio.FastChildWatcher):
- # here the FastChildWatche enters a deadlock
+ # here the FastChildWatcher enters a deadlock
# (there is no way to prevent it)
self.assertFalse(callback.called)
else:
@@ -1740,7 +1740,8 @@ def f():
def test_child_watcher_replace_mainloop_existing(self):
policy = self.create_policy()
- loop = policy.get_event_loop()
+ loop = policy.new_event_loop()
+ policy.set_event_loop(loop)
# Explicitly setup SafeChildWatcher,
# default ThreadedChildWatcher has no _loop property
diff --git a/Lib/test/test_asyncio/test_windows_events.py b/Lib/test/test_asyncio/test_windows_events.py
index 6b4f65c3376f5d..a36119a8004f9d 100644
--- a/Lib/test/test_asyncio/test_windows_events.py
+++ b/Lib/test/test_asyncio/test_windows_events.py
@@ -239,6 +239,57 @@ def test_read_self_pipe_restart(self):
self.close_loop(self.loop)
self.assertFalse(self.loop.call_exception_handler.called)
+ def test_address_argument_type_error(self):
+ # Regression test for https://github.com/python/cpython/issues/98793
+ proactor = self.loop._proactor
+ sock = socket.socket(type=socket.SOCK_DGRAM)
+ bad_address = None
+ with self.assertRaises(TypeError):
+ proactor.connect(sock, bad_address)
+ with self.assertRaises(TypeError):
+ proactor.sendto(sock, b'abc', addr=bad_address)
+ sock.close()
+
+ def test_client_pipe_stat(self):
+ res = self.loop.run_until_complete(self._test_client_pipe_stat())
+ self.assertEqual(res, 'done')
+
+ async def _test_client_pipe_stat(self):
+ # Regression test for https://github.com/python/cpython/issues/100573
+ ADDRESS = r'\\.\pipe\test_client_pipe_stat-%s' % os.getpid()
+
+ async def probe():
+ # See https://github.com/python/cpython/pull/100959#discussion_r1068533658
+ h = _overlapped.ConnectPipe(ADDRESS)
+ try:
+ _winapi.CloseHandle(_overlapped.ConnectPipe(ADDRESS))
+ except OSError as e:
+ if e.winerror != _overlapped.ERROR_PIPE_BUSY:
+ raise
+ finally:
+ _winapi.CloseHandle(h)
+
+ with self.assertRaises(FileNotFoundError):
+ await probe()
+
+ [server] = await self.loop.start_serving_pipe(asyncio.Protocol, ADDRESS)
+ self.assertIsInstance(server, windows_events.PipeServer)
+
+ errors = []
+ self.loop.set_exception_handler(lambda _, data: errors.append(data))
+
+ for i in range(5):
+ await self.loop.create_task(probe())
+
+ self.assertEqual(len(errors), 0, errors)
+
+ server.close()
+
+ with self.assertRaises(FileNotFoundError):
+ await probe()
+
+ return "done"
+
class WinPolicyTests(test_utils.TestCase):
diff --git a/Lib/test/test_atexit.py b/Lib/test/test_atexit.py
index e0feef7c653606..7ac063cfc78d3a 100644
--- a/Lib/test/test_atexit.py
+++ b/Lib/test/test_atexit.py
@@ -82,6 +82,7 @@ def f():
self.assertEqual(ret, 0)
self.assertEqual(atexit._ncallbacks(), n)
+ @unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
def test_callback_on_subinterpreter_teardown(self):
# This tests if a callback is called on
# subinterpreter teardown.
diff --git a/Lib/test/test_audit.py b/Lib/test/test_audit.py
index 0fa2d74835cba6..75e96f069d8c27 100644
--- a/Lib/test/test_audit.py
+++ b/Lib/test/test_audit.py
@@ -16,11 +16,12 @@
class AuditTest(unittest.TestCase):
+ maxDiff = None
@support.requires_subprocess()
def do_test(self, *args):
with subprocess.Popen(
- [sys.executable, "-Xutf8", AUDIT_TESTS_PY, *args],
+ [sys.executable, "-X utf8", AUDIT_TESTS_PY, *args],
encoding="utf-8",
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
@@ -35,7 +36,7 @@ def do_test(self, *args):
def run_python(self, *args):
events = []
with subprocess.Popen(
- [sys.executable, "-Xutf8", AUDIT_TESTS_PY, *args],
+ [sys.executable, "-X utf8", AUDIT_TESTS_PY, *args],
encoding="utf-8",
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
@@ -155,10 +156,7 @@ def test_http(self):
def test_sqlite3(self):
- try:
- import sqlite3
- except ImportError:
- return
+ sqlite3 = import_helper.import_module("sqlite3")
returncode, events, stderr = self.run_python("test_sqlite3")
if returncode:
self.fail(stderr)
@@ -176,5 +174,46 @@ def test_sqlite3(self):
self.assertEqual(actual, expected)
+ def test_sys_getframe(self):
+ returncode, events, stderr = self.run_python("test_sys_getframe")
+ if returncode:
+ self.fail(stderr)
+
+ if support.verbose:
+ print(*events, sep='\n')
+ actual = [(ev[0], ev[2]) for ev in events]
+ expected = [("sys._getframe", "test_sys_getframe")]
+
+ self.assertEqual(actual, expected)
+
+ def test_syslog(self):
+ syslog = import_helper.import_module("syslog")
+
+ returncode, events, stderr = self.run_python("test_syslog")
+ if returncode:
+ self.fail(stderr)
+
+ if support.verbose:
+ print('Events:', *events, sep='\n ')
+
+ self.assertSequenceEqual(
+ events,
+ [('syslog.openlog', ' ', f'python 0 {syslog.LOG_USER}'),
+ ('syslog.syslog', ' ', f'{syslog.LOG_INFO} test'),
+ ('syslog.setlogmask', ' ', f'{syslog.LOG_DEBUG}'),
+ ('syslog.closelog', '', ''),
+ ('syslog.syslog', ' ', f'{syslog.LOG_INFO} test2'),
+ ('syslog.openlog', ' ', f'audit-tests.py 0 {syslog.LOG_USER}'),
+ ('syslog.openlog', ' ', f'audit-tests.py {syslog.LOG_NDELAY} {syslog.LOG_LOCAL0}'),
+ ('syslog.openlog', ' ', f'None 0 {syslog.LOG_USER}'),
+ ('syslog.closelog', '', '')]
+ )
+
+ def test_not_in_gc(self):
+ returncode, _, stderr = self.run_python("test_not_in_gc")
+ if returncode:
+ self.fail(stderr)
+
+
if __name__ == "__main__":
unittest.main()
diff --git a/Lib/test/test_baseexception.py b/Lib/test/test_baseexception.py
index 0061b3fa8e6555..4c3cf0b964ae56 100644
--- a/Lib/test/test_baseexception.py
+++ b/Lib/test/test_baseexception.py
@@ -114,6 +114,31 @@ def test_interface_no_arg(self):
[repr(exc), exc.__class__.__name__ + '()'])
self.interface_test_driver(results)
+ def test_setstate_refcount_no_crash(self):
+ # gh-97591: Acquire strong reference before calling tp_hash slot
+ # in PyObject_SetAttr.
+ import gc
+ d = {}
+ class HashThisKeyWillClearTheDict(str):
+ def __hash__(self) -> int:
+ d.clear()
+ return super().__hash__()
+ class Value(str):
+ pass
+ exc = Exception()
+
+ d[HashThisKeyWillClearTheDict()] = Value() # refcount of Value() is 1 now
+
+ # Exception.__setstate__ should aquire a strong reference of key and
+ # value in the dict. Otherwise, Value()'s refcount would go below
+ # zero in the tp_hash call in PyObject_SetAttr(), and it would cause
+ # crash in GC.
+ exc.__setstate__(d) # __hash__() is called again here, clearing the dict.
+
+ # This GC would crash if the refcount of Value() goes below zero.
+ gc.collect()
+
+
class UsageTests(unittest.TestCase):
"""Test usage of exceptions"""
diff --git a/Lib/test/test_bdb.py b/Lib/test/test_bdb.py
index 6ec59531fa88f0..c2df18cdbe1e71 100644
--- a/Lib/test/test_bdb.py
+++ b/Lib/test/test_bdb.py
@@ -59,6 +59,7 @@
from itertools import islice, repeat
from test.support import import_helper
from test.support import os_helper
+from test.support import patch_list
class BdbException(Exception): pass
@@ -713,9 +714,18 @@ def test_until_in_caller_frame(self):
with TracerRun(self) as tracer:
tracer.runcall(tfunc_main)
+ @patch_list(sys.meta_path)
def test_skip(self):
# Check that tracing is skipped over the import statement in
# 'tfunc_import()'.
+
+ # Remove all but the standard importers.
+ sys.meta_path[:] = (
+ item
+ for item in sys.meta_path
+ if item.__module__.startswith('_frozen_importlib')
+ )
+
code = """
def main():
lno = 3
@@ -1193,5 +1203,12 @@ def main():
tracer.runcall(tfunc_import)
+class TestRegressions(unittest.TestCase):
+ def test_format_stack_entry_no_lineno(self):
+ # See gh-101517
+ self.assertIn('Warning: lineno is None',
+ Bdb().format_stack_entry((sys._getframe(), None)))
+
+
if __name__ == "__main__":
unittest.main()
diff --git a/Lib/test/test_bigmem.py b/Lib/test/test_bigmem.py
index 859f1539e20b80..c9ab1c1de9e186 100644
--- a/Lib/test/test_bigmem.py
+++ b/Lib/test/test_bigmem.py
@@ -1248,6 +1248,15 @@ def test_sort(self, size):
self.assertEqual(l[-10:], [5] * 10)
+class DictTest(unittest.TestCase):
+
+ @bigmemtest(size=357913941, memuse=160)
+ def test_dict(self, size):
+ # https://github.com/python/cpython/issues/102701
+ d = dict.fromkeys(range(size))
+ d[size] = 1
+
+
if __name__ == '__main__':
if len(sys.argv) > 1:
support.set_memlimit(sys.argv[1])
diff --git a/Lib/test/test_bisect.py b/Lib/test/test_bisect.py
index 20f8b9d7c0aa87..ba108221ebf454 100644
--- a/Lib/test/test_bisect.py
+++ b/Lib/test/test_bisect.py
@@ -257,6 +257,12 @@ def test_insort(self):
target
)
+ def test_insort_keynotNone(self):
+ x = []
+ y = {"a": 2, "b": 1}
+ for f in (self.module.insort_left, self.module.insort_right):
+ self.assertRaises(TypeError, f, x, y, key = "b")
+
class TestBisectPython(TestBisect, unittest.TestCase):
module = py_bisect
diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py
index 4b32aad2419f4a..b711ffb9a3ecd5 100644
--- a/Lib/test/test_bool.py
+++ b/Lib/test/test_bool.py
@@ -40,6 +40,12 @@ def test_float(self):
self.assertEqual(float(True), 1.0)
self.assertIsNot(float(True), True)
+ def test_complex(self):
+ self.assertEqual(complex(False), 0j)
+ self.assertEqual(complex(False), False)
+ self.assertEqual(complex(True), 1+0j)
+ self.assertEqual(complex(True), True)
+
def test_math(self):
self.assertEqual(+False, 0)
self.assertIsNot(+False, False)
@@ -369,6 +375,13 @@ def f(x):
f(x)
self.assertGreaterEqual(x.count, 1)
+ def test_bool_new(self):
+ self.assertIs(bool.__new__(bool), False)
+ self.assertIs(bool.__new__(bool, 1), True)
+ self.assertIs(bool.__new__(bool, 0), False)
+ self.assertIs(bool.__new__(bool, False), False)
+ self.assertIs(bool.__new__(bool, True), True)
+
if __name__ == "__main__":
unittest.main()
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index ba7a7e20d7dcda..9078c409cc44b2 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -159,7 +159,7 @@ def test_import(self):
__import__('string')
__import__(name='sys')
__import__(name='time', level=0)
- self.assertRaises(ImportError, __import__, 'spamspam')
+ self.assertRaises(ModuleNotFoundError, __import__, 'spamspam')
self.assertRaises(TypeError, __import__, 1, 2, 3, 4)
self.assertRaises(ValueError, __import__, '')
self.assertRaises(TypeError, __import__, 'sys', name='sys')
@@ -334,11 +334,10 @@ def test_compile(self):
self.assertRaises(TypeError, compile)
self.assertRaises(ValueError, compile, 'print(42)\n', '', 'badmode')
self.assertRaises(ValueError, compile, 'print(42)\n', '', 'single', 0xff)
- self.assertRaises(ValueError, compile, chr(0), 'f', 'exec')
self.assertRaises(TypeError, compile, 'pass', '?', 'exec',
mode='eval', source='0', filename='tmp')
compile('print("\xe5")\n', '', 'exec')
- self.assertRaises(ValueError, compile, chr(0), 'f', 'exec')
+ self.assertRaises(SyntaxError, compile, chr(0), 'f', 'exec')
self.assertRaises(ValueError, compile, str('a = 1'), 'f', 'bad')
# test the optimize argument
@@ -393,7 +392,10 @@ def test_compile_top_level_await_no_coro(self):
msg=f"source={source} mode={mode}")
- @unittest.skipIf(support.is_emscripten, "socket.accept is broken")
+ @unittest.skipIf(
+ support.is_emscripten or support.is_wasi,
+ "socket.accept is broken"
+ )
def test_compile_top_level_await(self):
"""Test whether code some top level await can be compiled.
@@ -734,11 +736,7 @@ def test_exec_globals(self):
self.assertRaises(TypeError,
exec, code, {'__builtins__': 123})
- # no __build_class__ function
- code = compile("class A: pass", "", "exec")
- self.assertRaisesRegex(NameError, "__build_class__ not found",
- exec, code, {'__builtins__': {}})
-
+ def test_exec_globals_frozen(self):
class frozendict_error(Exception):
pass
@@ -755,12 +753,51 @@ def __setitem__(self, key, value):
self.assertRaises(frozendict_error,
exec, code, {'__builtins__': frozen_builtins})
+ # no __build_class__ function
+ code = compile("class A: pass", "", "exec")
+ self.assertRaisesRegex(NameError, "__build_class__ not found",
+ exec, code, {'__builtins__': {}})
+ # __build_class__ in a custom __builtins__
+ exec(code, {'__builtins__': frozen_builtins})
+ self.assertRaisesRegex(NameError, "__build_class__ not found",
+ exec, code, {'__builtins__': frozendict()})
+
# read-only globals
namespace = frozendict({})
code = compile("x=1", "test", "exec")
self.assertRaises(frozendict_error,
exec, code, namespace)
+ def test_exec_globals_error_on_get(self):
+ # custom `globals` or `builtins` can raise errors on item access
+ class setonlyerror(Exception):
+ pass
+
+ class setonlydict(dict):
+ def __getitem__(self, key):
+ raise setonlyerror
+
+ # globals' `__getitem__` raises
+ code = compile("globalname", "test", "exec")
+ self.assertRaises(setonlyerror,
+ exec, code, setonlydict({'globalname': 1}))
+
+ # builtins' `__getitem__` raises
+ code = compile("superglobal", "test", "exec")
+ self.assertRaises(setonlyerror, exec, code,
+ {'__builtins__': setonlydict({'superglobal': 1})})
+
+ def test_exec_globals_dict_subclass(self):
+ class customdict(dict): # this one should not do anything fancy
+ pass
+
+ code = compile("superglobal", "test", "exec")
+ # works correctly
+ exec(code, {'__builtins__': customdict({'superglobal': 1})})
+ # custom builtins dict subclass is missing key
+ self.assertRaisesRegex(NameError, "name 'superglobal' is not defined",
+ exec, code, {'__builtins__': customdict()})
+
def test_exec_redirected(self):
savestdout = sys.stdout
sys.stdout = None # Whatever that cannot flush()
@@ -881,6 +918,16 @@ def test_filter_pickle(self):
f2 = filter(filter_char, "abcdeabcde")
self.check_iter_pickle(f1, list(f2), proto)
+ def test_filter_dealloc(self):
+ # Tests recursive deallocation of nested filter objects using the
+ # thrashcan mechanism. See gh-102356 for more details.
+ max_iters = 1000000
+ i = filter(bool, range(max_iters))
+ for _ in range(max_iters):
+ i = filter(bool, i)
+ del i
+ gc.collect()
+
def test_getattr(self):
self.assertTrue(getattr(sys, 'stdout') is sys.stdout)
self.assertRaises(TypeError, getattr)
@@ -2338,7 +2385,7 @@ def test_type_name(self):
self.assertEqual(A.__module__, __name__)
with self.assertRaises(ValueError):
type('A\x00B', (), {})
- with self.assertRaises(ValueError):
+ with self.assertRaises(UnicodeEncodeError):
type('A\udcdcB', (), {})
with self.assertRaises(TypeError):
type(b'A', (), {})
@@ -2355,7 +2402,7 @@ def test_type_name(self):
with self.assertRaises(ValueError):
A.__name__ = 'A\x00B'
self.assertEqual(A.__name__, 'C')
- with self.assertRaises(ValueError):
+ with self.assertRaises(UnicodeEncodeError):
A.__name__ = 'A\udcdcB'
self.assertEqual(A.__name__, 'C')
with self.assertRaises(TypeError):
diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py
index b457ff6ca849c5..53ba1ad6f5911f 100644
--- a/Lib/test/test_bytes.py
+++ b/Lib/test/test_bytes.py
@@ -715,6 +715,24 @@ def test_mod(self):
self.assertEqual(b, b'hello,\x00world!')
self.assertIs(type(b), self.type2test)
+ def check(fmt, vals, result):
+ b = self.type2test(fmt)
+ b = b % vals
+ self.assertEqual(b, result)
+ self.assertIs(type(b), self.type2test)
+
+ # A set of tests adapted from test_unicode:UnicodeTest.test_formatting
+ check(b'...%(foo)b...', {b'foo':b"abc"}, b'...abc...')
+ check(b'...%(f(o)o)b...', {b'f(o)o':b"abc", b'foo':b'bar'}, b'...abc...')
+ check(b'...%(foo)b...', {b'foo':b"abc",b'def':123}, b'...abc...')
+ check(b'%*b', (5, b'abc',), b' abc')
+ check(b'%*b', (-5, b'abc',), b'abc ')
+ check(b'%*.*b', (5, 2, b'abc',), b' ab')
+ check(b'%*.*b', (5, 3, b'abc',), b' abc')
+ check(b'%i %*.*b', (10, 5, 3, b'abc',), b'10 abc')
+ check(b'%i%b %*.*b', (10, b'3', 5, 3, b'abc',), b'103 abc')
+ check(b'%c', b'a', b'a')
+
def test_imod(self):
b = self.type2test(b'hello, %b!')
orig = b
@@ -1710,6 +1728,23 @@ def test_repeat_after_setslice(self):
self.assertEqual(b1, b)
self.assertEqual(b3, b'xcxcxc')
+ def test_mutating_index(self):
+ class Boom:
+ def __index__(self):
+ b.clear()
+ return 0
+
+ with self.subTest("tp_as_mapping"):
+ b = bytearray(b'Now you see me...')
+ with self.assertRaises(IndexError):
+ b[0] = Boom()
+
+ with self.subTest("tp_as_sequence"):
+ _testcapi = import_helper.import_module('_testcapi')
+ b = bytearray(b'Now you see me...')
+ with self.assertRaises(IndexError):
+ _testcapi.sequence_setitem(b, 0, Boom())
+
class AssortedBytesTest(unittest.TestCase):
#
diff --git a/Lib/test/test_calendar.py b/Lib/test/test_calendar.py
index f76cbc9472a6e8..ccfbeede0be949 100644
--- a/Lib/test/test_calendar.py
+++ b/Lib/test/test_calendar.py
@@ -564,6 +564,23 @@ def test_locale_calendars(self):
new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10)
self.assertEqual(old_october, new_october)
+ def test_locale_calendar_formatweekday(self):
+ try:
+ # formatweekday uses different day names based on the available width.
+ cal = calendar.LocaleTextCalendar(locale='en_US')
+ # For really short widths, the abbreviated name is truncated.
+ self.assertEqual(cal.formatweekday(0, 1), "M")
+ self.assertEqual(cal.formatweekday(0, 2), "Mo")
+ # For short widths, a centered, abbreviated name is used.
+ self.assertEqual(cal.formatweekday(0, 3), "Mon")
+ self.assertEqual(cal.formatweekday(0, 5), " Mon ")
+ self.assertEqual(cal.formatweekday(0, 8), " Mon ")
+ # For long widths, the full day name is used.
+ self.assertEqual(cal.formatweekday(0, 9), " Monday ")
+ self.assertEqual(cal.formatweekday(0, 10), " Monday ")
+ except locale.Error:
+ raise unittest.SkipTest('cannot set the en_US locale')
+
def test_locale_html_calendar_custom_css_class_month_name(self):
try:
cal = calendar.LocaleHTMLCalendar(locale='')
diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
index 6936f093e3db19..0974002a93b6e1 100644
--- a/Lib/test/test_call.py
+++ b/Lib/test/test_call.py
@@ -11,6 +11,14 @@
import contextlib
+class BadStr(str):
+ def __eq__(self, other):
+ return True
+ def __hash__(self):
+ # Guaranteed different hash
+ return str.__hash__(self) ^ 3
+
+
class FunctionCalls(unittest.TestCase):
def test_kwargs_order(self):
@@ -26,6 +34,18 @@ def fn(**kw):
self.assertIsInstance(res, dict)
self.assertEqual(list(res.items()), expected)
+ def test_frames_are_popped_after_failed_calls(self):
+ # GH-93252: stuff blows up if we don't pop the new frame after
+ # recovering from failed calls:
+ def f():
+ pass
+ for _ in range(1000):
+ try:
+ f(None)
+ except TypeError:
+ pass
+ # BOOM!
+
@cpython_only
class CFunctionCallsErrorMessages(unittest.TestCase):
@@ -133,6 +153,18 @@ def test_varargs17_kw(self):
self.assertRaisesRegex(TypeError, msg,
print, 0, sep=1, end=2, file=3, flush=4, foo=5)
+ def test_varargs18_kw(self):
+ # _PyArg_UnpackKeywordsWithVararg()
+ msg = r"invalid keyword argument for print\(\)$"
+ with self.assertRaisesRegex(TypeError, msg):
+ print(0, 1, **{BadStr('foo'): ','})
+
+ def test_varargs19_kw(self):
+ # _PyArg_UnpackKeywords()
+ msg = r"invalid keyword argument for round\(\)$"
+ with self.assertRaisesRegex(TypeError, msg):
+ round(1.75, **{BadStr('foo'): 1})
+
def test_oldargs0_1(self):
msg = r"keys\(\) takes no arguments \(1 given\)"
self.assertRaisesRegex(TypeError, msg, {}.keys, 0)
@@ -526,7 +558,7 @@ def __index__(self):
self.kwargs.clear()
gc.collect()
return 0
- x = IntWithDict(dont_inherit=IntWithDict())
+ x = IntWithDict(optimize=IntWithDict())
# We test the argument handling of "compile" here, the compilation
# itself is not relevant. When we pass flags=x below, x.__index__() is
# called, which changes the keywords dict.
diff --git a/Lib/test/test_capi/__init__.py b/Lib/test/test_capi/__init__.py
new file mode 100644
index 00000000000000..4b16ecc31156a5
--- /dev/null
+++ b/Lib/test/test_capi/__init__.py
@@ -0,0 +1,5 @@
+import os
+from test.support import load_package_tests
+
+def load_tests(*args):
+ return load_package_tests(os.path.dirname(__file__), *args)
diff --git a/Lib/test/test_capi/__main__.py b/Lib/test/test_capi/__main__.py
new file mode 100644
index 00000000000000..05d01775ddf43c
--- /dev/null
+++ b/Lib/test/test_capi/__main__.py
@@ -0,0 +1,3 @@
+import unittest
+
+unittest.main('test.test_capi')
diff --git a/Lib/test/test_capi/test_eval_code_ex.py b/Lib/test/test_capi/test_eval_code_ex.py
new file mode 100644
index 00000000000000..2d28e5289eff94
--- /dev/null
+++ b/Lib/test/test_capi/test_eval_code_ex.py
@@ -0,0 +1,56 @@
+import unittest
+
+from test.support import import_helper
+
+
+# Skip this test if the _testcapi module isn't available.
+_testcapi = import_helper.import_module('_testcapi')
+
+
+class PyEval_EvalCodeExTests(unittest.TestCase):
+
+ def test_simple(self):
+ def f():
+ return a
+
+ self.assertEqual(_testcapi.eval_code_ex(f.__code__, dict(a=1)), 1)
+
+ # Need to force the compiler to use LOAD_NAME
+ # def test_custom_locals(self):
+ # def f():
+ # return
+
+ def test_with_args(self):
+ def f(a, b, c):
+ return a
+
+ self.assertEqual(_testcapi.eval_code_ex(f.__code__, {}, {}, (1, 2, 3)), 1)
+
+ def test_with_kwargs(self):
+ def f(a, b, c):
+ return a
+
+ self.assertEqual(_testcapi.eval_code_ex(f.__code__, {}, {}, (), dict(a=1, b=2, c=3)), 1)
+
+ def test_with_default(self):
+ def f(a):
+ return a
+
+ self.assertEqual(_testcapi.eval_code_ex(f.__code__, {}, {}, (), {}, (1,)), 1)
+
+ def test_with_kwarg_default(self):
+ def f(*, a):
+ return a
+
+ self.assertEqual(_testcapi.eval_code_ex(f.__code__, {}, {}, (), {}, (), dict(a=1)), 1)
+
+ def test_with_closure(self):
+ a = 1
+ def f():
+ return a
+
+ self.assertEqual(_testcapi.eval_code_ex(f.__code__, {}, {}, (), {}, (), {}, f.__closure__), 1)
+
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_capi/test_getargs.py
similarity index 94%
rename from Lib/test/test_getargs2.py
rename to Lib/test/test_capi/test_getargs.py
index e0db9e40e650b6..552fa213524723 100644
--- a/Lib/test/test_getargs2.py
+++ b/Lib/test/test_capi/test_getargs.py
@@ -2,6 +2,7 @@
import math
import string
import sys
+import warnings
from test import support
from test.support import import_helper
from test.support import warnings_helper
@@ -746,6 +747,33 @@ def test_surrogate_keyword(self):
"'\udc80' is an invalid keyword argument for this function"):
getargs_keyword_only(1, 2, **{'\uDC80': 10})
+ def test_weird_str_subclass(self):
+ class BadStr(str):
+ def __eq__(self, other):
+ return True
+ def __hash__(self):
+ # Guaranteed different hash
+ return str.__hash__(self) ^ 3
+ with self.assertRaisesRegex(TypeError,
+ "invalid keyword argument for this function"):
+ getargs_keyword_only(1, 2, **{BadStr("keyword_only"): 3})
+ with self.assertRaisesRegex(TypeError,
+ "invalid keyword argument for this function"):
+ getargs_keyword_only(1, 2, **{BadStr("monster"): 666})
+
+ def test_weird_str_subclass2(self):
+ class BadStr(str):
+ def __eq__(self, other):
+ return False
+ def __hash__(self):
+ return str.__hash__(self)
+ with self.assertRaisesRegex(TypeError,
+ "invalid keyword argument for this function"):
+ getargs_keyword_only(1, 2, **{BadStr("keyword_only"): 3})
+ with self.assertRaisesRegex(TypeError,
+ "invalid keyword argument for this function"):
+ getargs_keyword_only(1, 2, **{BadStr("monster"): 666})
+
class PositionalOnlyAndKeywords_TestCase(unittest.TestCase):
from _testcapi import getargs_positional_only_and_keywords as getargs
@@ -877,9 +905,19 @@ def test_s_hash(self):
def test_s_hash_int(self):
# "s#" without PY_SSIZE_T_CLEAN defined.
from _testcapi import getargs_s_hash_int
- self.assertRaises(SystemError, getargs_s_hash_int, "abc")
- self.assertRaises(SystemError, getargs_s_hash_int, x=42)
- # getargs_s_hash_int() don't raise SystemError because skipitem() is not called.
+ from _testcapi import getargs_s_hash_int2
+ buf = bytearray([1, 2])
+ self.assertRaises(SystemError, getargs_s_hash_int, buf, "abc")
+ self.assertRaises(SystemError, getargs_s_hash_int, buf, x=42)
+ self.assertRaises(SystemError, getargs_s_hash_int, buf, x="abc")
+ self.assertRaises(SystemError, getargs_s_hash_int2, buf, ("abc",))
+ self.assertRaises(SystemError, getargs_s_hash_int2, buf, x=42)
+ self.assertRaises(SystemError, getargs_s_hash_int2, buf, x="abc")
+ buf.append(3) # still mutable -- not locked by a buffer export
+ # getargs_s_hash_int(buf) may not raise SystemError because skipitem()
+ # is not called. But it is an implementation detail.
+ # getargs_s_hash_int(buf)
+ # getargs_s_hash_int2(buf)
def test_z(self):
from _testcapi import getargs_z
@@ -999,6 +1037,9 @@ def test_u(self):
self.assertRaises(TypeError, getargs_u, memoryview(b'memoryview'))
with self.assertWarns(DeprecationWarning):
self.assertRaises(TypeError, getargs_u, None)
+ with warnings.catch_warnings():
+ warnings.simplefilter('error', DeprecationWarning)
+ self.assertRaises(DeprecationWarning, getargs_u, 'abc\xe9')
@support.requires_legacy_unicode_capi
def test_u_hash(self):
@@ -1015,6 +1056,9 @@ def test_u_hash(self):
self.assertRaises(TypeError, getargs_u_hash, memoryview(b'memoryview'))
with self.assertWarns(DeprecationWarning):
self.assertRaises(TypeError, getargs_u_hash, None)
+ with warnings.catch_warnings():
+ warnings.simplefilter('error', DeprecationWarning)
+ self.assertRaises(DeprecationWarning, getargs_u_hash, 'abc\xe9')
@support.requires_legacy_unicode_capi
def test_Z(self):
@@ -1031,6 +1075,9 @@ def test_Z(self):
self.assertRaises(TypeError, getargs_Z, memoryview(b'memoryview'))
with self.assertWarns(DeprecationWarning):
self.assertIsNone(getargs_Z(None))
+ with warnings.catch_warnings():
+ warnings.simplefilter('error', DeprecationWarning)
+ self.assertRaises(DeprecationWarning, getargs_Z, 'abc\xe9')
@support.requires_legacy_unicode_capi
def test_Z_hash(self):
@@ -1047,6 +1094,13 @@ def test_Z_hash(self):
self.assertRaises(TypeError, getargs_Z_hash, memoryview(b'memoryview'))
with self.assertWarns(DeprecationWarning):
self.assertIsNone(getargs_Z_hash(None))
+ with warnings.catch_warnings():
+ warnings.simplefilter('error', DeprecationWarning)
+ self.assertRaises(DeprecationWarning, getargs_Z_hash, 'abc\xe9')
+
+ def test_gh_99240_clear_args(self):
+ from _testcapi import gh_99240_clear_args
+ self.assertRaises(TypeError, gh_99240_clear_args, 'a', '\0b')
class Object_TestCase(unittest.TestCase):
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi/test_misc.py
similarity index 82%
rename from Lib/test/test_capi.py
rename to Lib/test/test_capi/test_misc.py
index 6d75895589328c..3e36fbde8c66d1 100644
--- a/Lib/test/test_capi.py
+++ b/Lib/test/test_capi/test_misc.py
@@ -133,14 +133,43 @@ def test_exc_info(self):
else:
self.assertTrue(False)
+ def test_set_object(self):
+ # new exception as obj is not an exception
+ with self.assertRaises(ValueError) as e:
+ _testcapi.exc_set_object(ValueError, 42)
+ self.assertEqual(e.exception.args, (42,))
+
+ # wraps the exception because unrelated types
+ with self.assertRaises(ValueError) as e:
+ _testcapi.exc_set_object(ValueError, TypeError(1,2,3))
+ wrapped = e.exception.args[0]
+ self.assertIsInstance(wrapped, TypeError)
+ self.assertEqual(wrapped.args, (1, 2, 3))
+
+ # is superclass, so does not wrap
+ with self.assertRaises(PermissionError) as e:
+ _testcapi.exc_set_object(OSError, PermissionError(24))
+ self.assertEqual(e.exception.args, (24,))
+
+ class Meta(type):
+ def __subclasscheck__(cls, sub):
+ 1/0
+
+ class Broken(Exception, metaclass=Meta):
+ pass
+
+ with self.assertRaises(ZeroDivisionError) as e:
+ _testcapi.exc_set_object(Broken, Broken())
+
@unittest.skipUnless(_posixsubprocess, '_posixsubprocess required for this test.')
def test_seq_bytes_to_charp_array(self):
# Issue #15732: crash in _PySequence_BytesToCharpArray()
class Z(object):
def __len__(self):
return 1
- self.assertRaises(TypeError, _posixsubprocess.fork_exec,
- 1,Z(),3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
+ with self.assertRaisesRegex(TypeError, 'indexing'):
+ _posixsubprocess.fork_exec(
+ 1,Z(),True,(1, 2),5,6,7,8,9,10,11,12,13,14,True,True,17,False,19,20,21,22,False)
# Issue #15736: overflow in _PySequence_BytesToCharpArray()
class Z(object):
def __len__(self):
@@ -148,7 +177,7 @@ def __len__(self):
def __getitem__(self, i):
return b'x'
self.assertRaises(MemoryError, _posixsubprocess.fork_exec,
- 1,Z(),3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
+ 1,Z(),True,(1, 2),5,6,7,8,9,10,11,12,13,14,True,True,17,False,19,20,21,22,False)
@unittest.skipUnless(_posixsubprocess, '_posixsubprocess required for this test.')
def test_subprocess_fork_exec(self):
@@ -158,7 +187,7 @@ def __len__(self):
# Issue #15738: crash in subprocess_fork_exec()
self.assertRaises(TypeError, _posixsubprocess.fork_exec,
- Z(),[b'1'],3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
+ Z(),[b'1'],True,(1, 2),5,6,7,8,9,10,11,12,13,14,True,True,17,False,19,20,21,22,False)
@unittest.skipIf(MISSING_C_DOCSTRINGS,
"Signature information for builtins requires docstrings")
@@ -403,6 +432,98 @@ def items(self):
self.assertRaises(TypeError, _testcapi.get_mapping_values, bad_mapping)
self.assertRaises(TypeError, _testcapi.get_mapping_items, bad_mapping)
+ def test_mapping_has_key(self):
+ dct = {'a': 1}
+ self.assertTrue(_testcapi.mapping_has_key(dct, 'a'))
+ self.assertFalse(_testcapi.mapping_has_key(dct, 'b'))
+
+ class SubDict(dict):
+ pass
+
+ dct2 = SubDict({'a': 1})
+ self.assertTrue(_testcapi.mapping_has_key(dct2, 'a'))
+ self.assertFalse(_testcapi.mapping_has_key(dct2, 'b'))
+
+ def test_sequence_set_slice(self):
+ # Correct case:
+ data = [1, 2, 3, 4, 5]
+ data_copy = data.copy()
+
+ _testcapi.sequence_set_slice(data, 1, 3, [8, 9])
+ data_copy[1:3] = [8, 9]
+ self.assertEqual(data, data_copy)
+ self.assertEqual(data, [1, 8, 9, 4, 5])
+
+ # Custom class:
+ class Custom:
+ def __setitem__(self, index, value):
+ self.index = index
+ self.value = value
+
+ c = Custom()
+ _testcapi.sequence_set_slice(c, 0, 5, 'abc')
+ self.assertEqual(c.index, slice(0, 5))
+ self.assertEqual(c.value, 'abc')
+
+ # Immutable sequences must raise:
+ bad_seq1 = (1, 2, 3, 4)
+ with self.assertRaises(TypeError):
+ _testcapi.sequence_set_slice(bad_seq1, 1, 3, (8, 9))
+ self.assertEqual(bad_seq1, (1, 2, 3, 4))
+
+ bad_seq2 = 'abcd'
+ with self.assertRaises(TypeError):
+ _testcapi.sequence_set_slice(bad_seq2, 1, 3, 'xy')
+ self.assertEqual(bad_seq2, 'abcd')
+
+ # Not a sequence:
+ with self.assertRaises(TypeError):
+ _testcapi.sequence_set_slice(None, 1, 3, 'xy')
+
+ mapping = {1: 'a', 2: 'b', 3: 'c'}
+ with self.assertRaises(TypeError):
+ _testcapi.sequence_set_slice(mapping, 1, 3, 'xy')
+ self.assertEqual(mapping, {1: 'a', 2: 'b', 3: 'c'})
+
+ def test_sequence_del_slice(self):
+ # Correct case:
+ data = [1, 2, 3, 4, 5]
+ data_copy = data.copy()
+
+ _testcapi.sequence_del_slice(data, 1, 3)
+ del data_copy[1:3]
+ self.assertEqual(data, data_copy)
+ self.assertEqual(data, [1, 4, 5])
+
+ # Custom class:
+ class Custom:
+ def __delitem__(self, index):
+ self.index = index
+
+ c = Custom()
+ _testcapi.sequence_del_slice(c, 0, 5)
+ self.assertEqual(c.index, slice(0, 5))
+
+ # Immutable sequences must raise:
+ bad_seq1 = (1, 2, 3, 4)
+ with self.assertRaises(TypeError):
+ _testcapi.sequence_del_slice(bad_seq1, 1, 3)
+ self.assertEqual(bad_seq1, (1, 2, 3, 4))
+
+ bad_seq2 = 'abcd'
+ with self.assertRaises(TypeError):
+ _testcapi.sequence_del_slice(bad_seq2, 1, 3)
+ self.assertEqual(bad_seq2, 'abcd')
+
+ # Not a sequence:
+ with self.assertRaises(TypeError):
+ _testcapi.sequence_del_slice(None, 1, 3)
+
+ mapping = {1: 'a', 2: 'b', 3: 'c'}
+ with self.assertRaises(TypeError):
+ _testcapi.sequence_del_slice(mapping, 1, 3)
+ self.assertEqual(mapping, {1: 'a', 2: 'b', 3: 'c'})
+
@unittest.skipUnless(hasattr(_testcapi, 'negative_refcount'),
'need _testcapi.negative_refcount')
def test_negative_refcount(self):
@@ -608,6 +729,25 @@ def test_heaptype_with_setattro(self):
del obj.value
self.assertEqual(obj.pvalue, 0)
+ def test_multiple_inheritance_ctypes_with_weakref_or_dict(self):
+
+ class Both1(_testcapi.HeapCTypeWithWeakref, _testcapi.HeapCTypeWithDict):
+ pass
+ class Both2(_testcapi.HeapCTypeWithDict, _testcapi.HeapCTypeWithWeakref):
+ pass
+
+ for cls in (_testcapi.HeapCTypeWithDict, _testcapi.HeapCTypeWithDict2,
+ _testcapi.HeapCTypeWithWeakref, _testcapi.HeapCTypeWithWeakref2):
+ for cls2 in (_testcapi.HeapCTypeWithDict, _testcapi.HeapCTypeWithDict2,
+ _testcapi.HeapCTypeWithWeakref, _testcapi.HeapCTypeWithWeakref2):
+ if cls is not cls2:
+ class S(cls, cls2):
+ pass
+ class B1(Both1, cls):
+ pass
+ class B2(Both1, cls):
+ pass
+
def test_pynumber_tobase(self):
from _testcapi import pynumber_tobase
self.assertEqual(pynumber_tobase(123, 2), '0b1111011')
@@ -705,6 +845,71 @@ def test_export_symbols(self):
with self.subTest(name=name):
self.assertTrue(hasattr(ctypes.pythonapi, name))
+ def test_eval_get_func_name(self):
+ def function_example(): ...
+
+ class A:
+ def method_example(self): ...
+
+ self.assertEqual(_testcapi.eval_get_func_name(function_example),
+ "function_example")
+ self.assertEqual(_testcapi.eval_get_func_name(A.method_example),
+ "method_example")
+ self.assertEqual(_testcapi.eval_get_func_name(A().method_example),
+ "method_example")
+ self.assertEqual(_testcapi.eval_get_func_name(sum), "sum") # c function
+ self.assertEqual(_testcapi.eval_get_func_name(A), "type")
+
+ def test_eval_get_func_desc(self):
+ def function_example(): ...
+
+ class A:
+ def method_example(self): ...
+
+ self.assertEqual(_testcapi.eval_get_func_desc(function_example),
+ "()")
+ self.assertEqual(_testcapi.eval_get_func_desc(A.method_example),
+ "()")
+ self.assertEqual(_testcapi.eval_get_func_desc(A().method_example),
+ "()")
+ self.assertEqual(_testcapi.eval_get_func_desc(sum), "()") # c function
+ self.assertEqual(_testcapi.eval_get_func_desc(A), " object")
+
+ def test_function_get_code(self):
+ import types
+
+ def some():
+ pass
+
+ code = _testcapi.function_get_code(some)
+ self.assertIsInstance(code, types.CodeType)
+ self.assertEqual(code, some.__code__)
+
+ with self.assertRaises(SystemError):
+ _testcapi.function_get_code(None) # not a function
+
+ def test_function_get_globals(self):
+ def some():
+ pass
+
+ globals_ = _testcapi.function_get_globals(some)
+ self.assertIsInstance(globals_, dict)
+ self.assertEqual(globals_, some.__globals__)
+
+ with self.assertRaises(SystemError):
+ _testcapi.function_get_globals(None) # not a function
+
+ def test_function_get_module(self):
+ def some():
+ pass
+
+ module = _testcapi.function_get_module(some)
+ self.assertIsInstance(module, str)
+ self.assertEqual(module, some.__module__)
+
+ with self.assertRaises(SystemError):
+ _testcapi.function_get_module(None) # not a function
+
class TestPendingCalls(unittest.TestCase):
@@ -788,6 +993,7 @@ def test_pendingcalls_non_threaded(self):
class SubinterpreterTest(unittest.TestCase):
+ @unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
def test_subinterps(self):
import builtins
r, w = os.pipe()
@@ -803,6 +1009,7 @@ def test_subinterps(self):
self.assertNotEqual(pickle.load(f), id(sys.modules))
self.assertNotEqual(pickle.load(f), id(builtins))
+ @unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
def test_subinterps_recent_language_features(self):
r, w = os.pipe()
code = """if 1:
@@ -894,6 +1101,21 @@ def callback():
t.start()
t.join()
+ @threading_helper.reap_threads
+ @threading_helper.requires_working_threading()
+ def test_gilstate_ensure_no_deadlock(self):
+ # See https://github.com/python/cpython/issues/96071
+ code = textwrap.dedent(f"""
+ import _testcapi
+
+ def callback():
+ print('callback called')
+
+ _testcapi._test_thread_state(callback)
+ """)
+ ret = assert_python_ok('-X', 'tracemalloc', '-c', code)
+ self.assertIn(b'callback called', ret.out)
+
class Test_testcapi(unittest.TestCase):
locals().update((name, getattr(_testcapi, name))
@@ -1141,33 +1363,54 @@ def test_frame_get_generator(self):
frame = next(gen)
self.assertIs(gen, _testcapi.frame_getgenerator(frame))
+ def test_frame_fback_api(self):
+ """Test that accessing `f_back` does not cause a segmentation fault on
+ a frame created with `PyFrame_New` (GH-99110)."""
+ def dummy():
+ pass
+
+ frame = _testcapi.frame_new(dummy.__code__, globals(), locals())
+ # The following line should not cause a segmentation fault.
+ self.assertIsNone(frame.f_back)
+
SUFFICIENT_TO_DEOPT_AND_SPECIALIZE = 100
class Test_Pep523API(unittest.TestCase):
- def do_test(self, func):
- calls = []
+ def do_test(self, func, names):
+ actual_calls = []
start = SUFFICIENT_TO_DEOPT_AND_SPECIALIZE
count = start + SUFFICIENT_TO_DEOPT_AND_SPECIALIZE
- for i in range(count):
- if i == start:
- _testinternalcapi.set_eval_frame_record(calls)
- func()
- _testinternalcapi.set_eval_frame_default()
- self.assertEqual(len(calls), SUFFICIENT_TO_DEOPT_AND_SPECIALIZE)
- for name in calls:
- self.assertEqual(name, func.__name__)
-
- def test_pep523_with_specialization_simple(self):
- def func1():
- pass
- self.do_test(func1)
+ try:
+ for i in range(count):
+ if i == start:
+ _testinternalcapi.set_eval_frame_record(actual_calls)
+ func()
+ finally:
+ _testinternalcapi.set_eval_frame_default()
+ expected_calls = names * SUFFICIENT_TO_DEOPT_AND_SPECIALIZE
+ self.assertEqual(len(expected_calls), len(actual_calls))
+ for expected, actual in zip(expected_calls, actual_calls, strict=True):
+ self.assertEqual(expected, actual)
+
+ def test_inlined_binary_subscr(self):
+ class C:
+ def __getitem__(self, other):
+ return None
+ def func():
+ C()[42]
+ names = ["func", "__getitem__"]
+ self.do_test(func, names)
- def test_pep523_with_specialization_with_default(self):
- def func2(x=None):
+ def test_inlined_call(self):
+ def inner(x=42):
pass
- self.do_test(func2)
+ def func():
+ inner()
+ inner(42)
+ names = ["func", "inner", "inner"]
+ self.do_test(func, names)
if __name__ == "__main__":
diff --git a/Lib/test/test_structmembers.py b/Lib/test/test_capi/test_structmembers.py
similarity index 100%
rename from Lib/test/test_structmembers.py
rename to Lib/test/test_capi/test_structmembers.py
diff --git a/Lib/test/test_capi/test_unicode.py b/Lib/test/test_capi/test_unicode.py
new file mode 100644
index 00000000000000..77a180a30693dc
--- /dev/null
+++ b/Lib/test/test_capi/test_unicode.py
@@ -0,0 +1,474 @@
+import unittest
+import sys
+from test import support
+from test.support import import_helper
+
+try:
+ import _testcapi
+except ImportError:
+ _testcapi = None
+
+
+class CAPITest(unittest.TestCase):
+
+ # Test PyUnicode_FromFormat()
+ def test_from_format(self):
+ import_helper.import_module('ctypes')
+ from ctypes import (
+ c_char_p,
+ pythonapi, py_object, sizeof,
+ c_int, c_long, c_longlong, c_ssize_t,
+ c_uint, c_ulong, c_ulonglong, c_size_t, c_void_p)
+ name = "PyUnicode_FromFormat"
+ _PyUnicode_FromFormat = getattr(pythonapi, name)
+ _PyUnicode_FromFormat.argtypes = (c_char_p,)
+ _PyUnicode_FromFormat.restype = py_object
+
+ def PyUnicode_FromFormat(format, *args):
+ cargs = tuple(
+ py_object(arg) if isinstance(arg, str) else arg
+ for arg in args)
+ return _PyUnicode_FromFormat(format, *cargs)
+
+ def check_format(expected, format, *args):
+ text = PyUnicode_FromFormat(format, *args)
+ self.assertEqual(expected, text)
+
+ # ascii format, non-ascii argument
+ check_format('ascii\x7f=unicode\xe9',
+ b'ascii\x7f=%U', 'unicode\xe9')
+
+ # non-ascii format, ascii argument: ensure that PyUnicode_FromFormatV()
+ # raises an error
+ self.assertRaisesRegex(ValueError,
+ r'^PyUnicode_FromFormatV\(\) expects an ASCII-encoded format '
+ 'string, got a non-ASCII byte: 0xe9$',
+ PyUnicode_FromFormat, b'unicode\xe9=%s', 'ascii')
+
+ # test "%c"
+ check_format('\uabcd',
+ b'%c', c_int(0xabcd))
+ check_format('\U0010ffff',
+ b'%c', c_int(0x10ffff))
+ with self.assertRaises(OverflowError):
+ PyUnicode_FromFormat(b'%c', c_int(0x110000))
+ # Issue #18183
+ check_format('\U00010000\U00100000',
+ b'%c%c', c_int(0x10000), c_int(0x100000))
+
+ # test "%"
+ check_format('%',
+ b'%')
+ check_format('%',
+ b'%%')
+ check_format('%s',
+ b'%%s')
+ check_format('[%]',
+ b'[%%]')
+ check_format('%abc',
+ b'%%%s', b'abc')
+
+ # truncated string
+ check_format('abc',
+ b'%.3s', b'abcdef')
+ check_format('abc[\ufffd',
+ b'%.5s', 'abc[\u20ac]'.encode('utf8'))
+ check_format("'\\u20acABC'",
+ b'%A', '\u20acABC')
+ check_format("'\\u20",
+ b'%.5A', '\u20acABCDEF')
+ check_format("'\u20acABC'",
+ b'%R', '\u20acABC')
+ check_format("'\u20acA",
+ b'%.3R', '\u20acABCDEF')
+ check_format('\u20acAB',
+ b'%.3S', '\u20acABCDEF')
+ check_format('\u20acAB',
+ b'%.3U', '\u20acABCDEF')
+ check_format('\u20acAB',
+ b'%.3V', '\u20acABCDEF', None)
+ check_format('abc[\ufffd',
+ b'%.5V', None, 'abc[\u20ac]'.encode('utf8'))
+
+ # following tests comes from #7330
+ # test width modifier and precision modifier with %S
+ check_format("repr= abc",
+ b'repr=%5S', 'abc')
+ check_format("repr=ab",
+ b'repr=%.2S', 'abc')
+ check_format("repr= ab",
+ b'repr=%5.2S', 'abc')
+
+ # test width modifier and precision modifier with %R
+ check_format("repr= 'abc'",
+ b'repr=%8R', 'abc')
+ check_format("repr='ab",
+ b'repr=%.3R', 'abc')
+ check_format("repr= 'ab",
+ b'repr=%5.3R', 'abc')
+
+ # test width modifier and precision modifier with %A
+ check_format("repr= 'abc'",
+ b'repr=%8A', 'abc')
+ check_format("repr='ab",
+ b'repr=%.3A', 'abc')
+ check_format("repr= 'ab",
+ b'repr=%5.3A', 'abc')
+
+ # test width modifier and precision modifier with %s
+ check_format("repr= abc",
+ b'repr=%5s', b'abc')
+ check_format("repr=ab",
+ b'repr=%.2s', b'abc')
+ check_format("repr= ab",
+ b'repr=%5.2s', b'abc')
+
+ # test width modifier and precision modifier with %U
+ check_format("repr= abc",
+ b'repr=%5U', 'abc')
+ check_format("repr=ab",
+ b'repr=%.2U', 'abc')
+ check_format("repr= ab",
+ b'repr=%5.2U', 'abc')
+
+ # test width modifier and precision modifier with %V
+ check_format("repr= abc",
+ b'repr=%5V', 'abc', b'123')
+ check_format("repr=ab",
+ b'repr=%.2V', 'abc', b'123')
+ check_format("repr= ab",
+ b'repr=%5.2V', 'abc', b'123')
+ check_format("repr= 123",
+ b'repr=%5V', None, b'123')
+ check_format("repr=12",
+ b'repr=%.2V', None, b'123')
+ check_format("repr= 12",
+ b'repr=%5.2V', None, b'123')
+
+ # test integer formats (%i, %d, %u)
+ check_format('010',
+ b'%03i', c_int(10))
+ check_format('0010',
+ b'%0.4i', c_int(10))
+ check_format('-123',
+ b'%i', c_int(-123))
+ check_format('-123',
+ b'%li', c_long(-123))
+ check_format('-123',
+ b'%lli', c_longlong(-123))
+ check_format('-123',
+ b'%zi', c_ssize_t(-123))
+
+ check_format('-123',
+ b'%d', c_int(-123))
+ check_format('-123',
+ b'%ld', c_long(-123))
+ check_format('-123',
+ b'%lld', c_longlong(-123))
+ check_format('-123',
+ b'%zd', c_ssize_t(-123))
+
+ check_format('123',
+ b'%u', c_uint(123))
+ check_format('123',
+ b'%lu', c_ulong(123))
+ check_format('123',
+ b'%llu', c_ulonglong(123))
+ check_format('123',
+ b'%zu', c_size_t(123))
+
+ # test long output
+ min_longlong = -(2 ** (8 * sizeof(c_longlong) - 1))
+ max_longlong = -min_longlong - 1
+ check_format(str(min_longlong),
+ b'%lld', c_longlong(min_longlong))
+ check_format(str(max_longlong),
+ b'%lld', c_longlong(max_longlong))
+ max_ulonglong = 2 ** (8 * sizeof(c_ulonglong)) - 1
+ check_format(str(max_ulonglong),
+ b'%llu', c_ulonglong(max_ulonglong))
+ PyUnicode_FromFormat(b'%p', c_void_p(-1))
+
+ # test padding (width and/or precision)
+ check_format('123'.rjust(10, '0'),
+ b'%010i', c_int(123))
+ check_format('123'.rjust(100),
+ b'%100i', c_int(123))
+ check_format('123'.rjust(100, '0'),
+ b'%.100i', c_int(123))
+ check_format('123'.rjust(80, '0').rjust(100),
+ b'%100.80i', c_int(123))
+
+ check_format('123'.rjust(10, '0'),
+ b'%010u', c_uint(123))
+ check_format('123'.rjust(100),
+ b'%100u', c_uint(123))
+ check_format('123'.rjust(100, '0'),
+ b'%.100u', c_uint(123))
+ check_format('123'.rjust(80, '0').rjust(100),
+ b'%100.80u', c_uint(123))
+
+ check_format('123'.rjust(10, '0'),
+ b'%010x', c_int(0x123))
+ check_format('123'.rjust(100),
+ b'%100x', c_int(0x123))
+ check_format('123'.rjust(100, '0'),
+ b'%.100x', c_int(0x123))
+ check_format('123'.rjust(80, '0').rjust(100),
+ b'%100.80x', c_int(0x123))
+
+ # test %A
+ check_format(r"%A:'abc\xe9\uabcd\U0010ffff'",
+ b'%%A:%A', 'abc\xe9\uabcd\U0010ffff')
+
+ # test %V
+ check_format('repr=abc',
+ b'repr=%V', 'abc', b'xyz')
+
+ # test %p
+ # We cannot test the exact result,
+ # because it returns a hex representation of a C pointer,
+ # which is going to be different each time. But, we can test the format.
+ p_format_regex = r'^0x[a-zA-Z0-9]{3,}$'
+ p_format1 = PyUnicode_FromFormat(b'%p', 'abc')
+ self.assertIsInstance(p_format1, str)
+ self.assertRegex(p_format1, p_format_regex)
+
+ p_format2 = PyUnicode_FromFormat(b'%p %p', '123456', b'xyz')
+ self.assertIsInstance(p_format2, str)
+ self.assertRegex(p_format2,
+ r'0x[a-zA-Z0-9]{3,} 0x[a-zA-Z0-9]{3,}')
+
+ # Extra args are ignored:
+ p_format3 = PyUnicode_FromFormat(b'%p', '123456', None, b'xyz')
+ self.assertIsInstance(p_format3, str)
+ self.assertRegex(p_format3, p_format_regex)
+
+ # Test string decode from parameter of %s using utf-8.
+ # b'\xe4\xba\xba\xe6\xb0\x91' is utf-8 encoded byte sequence of
+ # '\u4eba\u6c11'
+ check_format('repr=\u4eba\u6c11',
+ b'repr=%V', None, b'\xe4\xba\xba\xe6\xb0\x91')
+
+ #Test replace error handler.
+ check_format('repr=abc\ufffd',
+ b'repr=%V', None, b'abc\xff')
+
+ # not supported: copy the raw format string. these tests are just here
+ # to check for crashes and should not be considered as specifications
+ check_format('%s',
+ b'%1%s', b'abc')
+ check_format('%1abc',
+ b'%1abc')
+ check_format('%+i',
+ b'%+i', c_int(10))
+ check_format('%.%s',
+ b'%.%s', b'abc')
+
+ # Issue #33817: empty strings
+ check_format('',
+ b'')
+ check_format('',
+ b'%s', b'')
+
+ # Test PyUnicode_AsWideChar()
+ @support.cpython_only
+ @unittest.skipIf(_testcapi is None, 'need _testcapi module')
+ def test_aswidechar(self):
+ from _testcapi import unicode_aswidechar
+ import_helper.import_module('ctypes')
+ from ctypes import c_wchar, sizeof
+
+ wchar, size = unicode_aswidechar('abcdef', 2)
+ self.assertEqual(size, 2)
+ self.assertEqual(wchar, 'ab')
+
+ wchar, size = unicode_aswidechar('abc', 3)
+ self.assertEqual(size, 3)
+ self.assertEqual(wchar, 'abc')
+
+ wchar, size = unicode_aswidechar('abc', 4)
+ self.assertEqual(size, 3)
+ self.assertEqual(wchar, 'abc\0')
+
+ wchar, size = unicode_aswidechar('abc', 10)
+ self.assertEqual(size, 3)
+ self.assertEqual(wchar, 'abc\0')
+
+ wchar, size = unicode_aswidechar('abc\0def', 20)
+ self.assertEqual(size, 7)
+ self.assertEqual(wchar, 'abc\0def\0')
+
+ nonbmp = chr(0x10ffff)
+ if sizeof(c_wchar) == 2:
+ buflen = 3
+ nchar = 2
+ else: # sizeof(c_wchar) == 4
+ buflen = 2
+ nchar = 1
+ wchar, size = unicode_aswidechar(nonbmp, buflen)
+ self.assertEqual(size, nchar)
+ self.assertEqual(wchar, nonbmp + '\0')
+
+ # Test PyUnicode_AsWideCharString()
+ @support.cpython_only
+ @unittest.skipIf(_testcapi is None, 'need _testcapi module')
+ def test_aswidecharstring(self):
+ from _testcapi import unicode_aswidecharstring
+ import_helper.import_module('ctypes')
+ from ctypes import c_wchar, sizeof
+
+ wchar, size = unicode_aswidecharstring('abc')
+ self.assertEqual(size, 3)
+ self.assertEqual(wchar, 'abc\0')
+
+ wchar, size = unicode_aswidecharstring('abc\0def')
+ self.assertEqual(size, 7)
+ self.assertEqual(wchar, 'abc\0def\0')
+
+ nonbmp = chr(0x10ffff)
+ if sizeof(c_wchar) == 2:
+ nchar = 2
+ else: # sizeof(c_wchar) == 4
+ nchar = 1
+ wchar, size = unicode_aswidecharstring(nonbmp)
+ self.assertEqual(size, nchar)
+ self.assertEqual(wchar, nonbmp + '\0')
+
+ # Test PyUnicode_AsUCS4()
+ @support.cpython_only
+ @unittest.skipIf(_testcapi is None, 'need _testcapi module')
+ def test_asucs4(self):
+ from _testcapi import unicode_asucs4
+ for s in ['abc', '\xa1\xa2', '\u4f60\u597d', 'a\U0001f600',
+ 'a\ud800b\udfffc', '\ud834\udd1e']:
+ l = len(s)
+ self.assertEqual(unicode_asucs4(s, l, True), s+'\0')
+ self.assertEqual(unicode_asucs4(s, l, False), s+'\uffff')
+ self.assertEqual(unicode_asucs4(s, l+1, True), s+'\0\uffff')
+ self.assertEqual(unicode_asucs4(s, l+1, False), s+'\0\uffff')
+ self.assertRaises(SystemError, unicode_asucs4, s, l-1, True)
+ self.assertRaises(SystemError, unicode_asucs4, s, l-2, False)
+ s = '\0'.join([s, s])
+ self.assertEqual(unicode_asucs4(s, len(s), True), s+'\0')
+ self.assertEqual(unicode_asucs4(s, len(s), False), s+'\uffff')
+
+ # Test PyUnicode_AsUTF8()
+ @support.cpython_only
+ @unittest.skipIf(_testcapi is None, 'need _testcapi module')
+ def test_asutf8(self):
+ from _testcapi import unicode_asutf8
+
+ bmp = '\u0100'
+ bmp2 = '\uffff'
+ nonbmp = chr(0x10ffff)
+
+ self.assertEqual(unicode_asutf8(bmp), b'\xc4\x80')
+ self.assertEqual(unicode_asutf8(bmp2), b'\xef\xbf\xbf')
+ self.assertEqual(unicode_asutf8(nonbmp), b'\xf4\x8f\xbf\xbf')
+ self.assertRaises(UnicodeEncodeError, unicode_asutf8, 'a\ud800b\udfffc')
+
+ # Test PyUnicode_AsUTF8AndSize()
+ @support.cpython_only
+ @unittest.skipIf(_testcapi is None, 'need _testcapi module')
+ def test_asutf8andsize(self):
+ from _testcapi import unicode_asutf8andsize
+
+ bmp = '\u0100'
+ bmp2 = '\uffff'
+ nonbmp = chr(0x10ffff)
+
+ self.assertEqual(unicode_asutf8andsize(bmp), (b'\xc4\x80', 2))
+ self.assertEqual(unicode_asutf8andsize(bmp2), (b'\xef\xbf\xbf', 3))
+ self.assertEqual(unicode_asutf8andsize(nonbmp), (b'\xf4\x8f\xbf\xbf', 4))
+ self.assertRaises(UnicodeEncodeError, unicode_asutf8andsize, 'a\ud800b\udfffc')
+
+ # Test PyUnicode_FindChar()
+ @support.cpython_only
+ @unittest.skipIf(_testcapi is None, 'need _testcapi module')
+ def test_findchar(self):
+ from _testcapi import unicode_findchar
+
+ for str in "\xa1", "\u8000\u8080", "\ud800\udc02", "\U0001f100\U0001f1f1":
+ for i, ch in enumerate(str):
+ self.assertEqual(unicode_findchar(str, ord(ch), 0, len(str), 1), i)
+ self.assertEqual(unicode_findchar(str, ord(ch), 0, len(str), -1), i)
+
+ str = "!>_= end
+ self.assertEqual(unicode_findchar(str, ord('!'), 0, 0, 1), -1)
+ self.assertEqual(unicode_findchar(str, ord('!'), len(str), 0, 1), -1)
+ # negative
+ self.assertEqual(unicode_findchar(str, ord('!'), -len(str), -1, 1), 0)
+ self.assertEqual(unicode_findchar(str, ord('!'), -len(str), -1, -1), 0)
+
+ # Test PyUnicode_CopyCharacters()
+ @support.cpython_only
+ @unittest.skipIf(_testcapi is None, 'need _testcapi module')
+ def test_copycharacters(self):
+ from _testcapi import unicode_copycharacters
+
+ strings = [
+ 'abcde', '\xa1\xa2\xa3\xa4\xa5',
+ '\u4f60\u597d\u4e16\u754c\uff01',
+ '\U0001f600\U0001f601\U0001f602\U0001f603\U0001f604'
+ ]
+
+ for idx, from_ in enumerate(strings):
+ # wide -> narrow: exceed maxchar limitation
+ for to in strings[:idx]:
+ self.assertRaises(
+ SystemError,
+ unicode_copycharacters, to, 0, from_, 0, 5
+ )
+ # same kind
+ for from_start in range(5):
+ self.assertEqual(
+ unicode_copycharacters(from_, 0, from_, from_start, 5),
+ (from_[from_start:from_start+5].ljust(5, '\0'),
+ 5-from_start)
+ )
+ for to_start in range(5):
+ self.assertEqual(
+ unicode_copycharacters(from_, to_start, from_, to_start, 5),
+ (from_[to_start:to_start+5].rjust(5, '\0'),
+ 5-to_start)
+ )
+ # narrow -> wide
+ # Tests omitted since this creates invalid strings.
+
+ s = strings[0]
+ self.assertRaises(IndexError, unicode_copycharacters, s, 6, s, 0, 5)
+ self.assertRaises(IndexError, unicode_copycharacters, s, -1, s, 0, 5)
+ self.assertRaises(IndexError, unicode_copycharacters, s, 0, s, 6, 5)
+ self.assertRaises(IndexError, unicode_copycharacters, s, 0, s, -1, 5)
+ self.assertRaises(SystemError, unicode_copycharacters, s, 1, s, 0, 5)
+ self.assertRaises(SystemError, unicode_copycharacters, s, 0, s, 0, -1)
+ self.assertRaises(SystemError, unicode_copycharacters, s, 0, b'', 0, 0)
+
+ @support.cpython_only
+ @unittest.skipIf(_testcapi is None, 'need _testcapi module')
+ def test_pep393_utf8_caching_bug(self):
+ # Issue #25709: Problem with string concatenation and utf-8 cache
+ from _testcapi import getargs_s_hash
+ for k in 0x24, 0xa4, 0x20ac, 0x1f40d:
+ s = ''
+ for i in range(5):
+ # Due to CPython specific optimization the 's' string can be
+ # resized in-place.
+ s += chr(k)
+ # Parsing with the "s#" format code calls indirectly
+ # PyUnicode_AsUTF8AndSize() which creates the UTF-8
+ # encoded string cached in the Unicode object.
+ self.assertEqual(getargs_s_hash(s), chr(k).encode() * (i + 1))
+ # Check that the second call returns the same result
+ self.assertEqual(getargs_s_hash(s), chr(k).encode() * (i + 1))
+
+
+if __name__ == "__main__":
+ unittest.main()
diff --git a/Lib/test/test_check_c_globals.py b/Lib/test/test_check_c_globals.py
index 030debc452e409..898807a5e69259 100644
--- a/Lib/test/test_check_c_globals.py
+++ b/Lib/test/test_check_c_globals.py
@@ -1,9 +1,14 @@
import unittest
import test.test_tools
+from test.support.warnings_helper import save_restore_warnings_filters
test.test_tools.skip_if_missing('c-analyzer')
with test.test_tools.imports_under_tool('c-analyzer'):
- from cpython.__main__ import main
+ # gh-95349: Save/restore warnings filters to leave them unchanged.
+ # Importing the c-analyzer imports docutils which imports pkg_resources
+ # which adds a warnings filter.
+ with save_restore_warnings_filters():
+ from cpython.__main__ import main
class ActualChecks(unittest.TestCase):
diff --git a/Lib/test/test_clinic.py b/Lib/test/test_clinic.py
index 4aa9691a4829d1..8d4f92fa310c3e 100644
--- a/Lib/test/test_clinic.py
+++ b/Lib/test/test_clinic.py
@@ -3,7 +3,7 @@
# Licensed to the PSF under a contributor agreement.
from test import support, test_tools
-from test.support import os_helper
+from test.support import import_helper, os_helper
from unittest import TestCase
import collections
import inspect
@@ -730,6 +730,15 @@ def test_parameters_not_permitted_after_slash_for_now(self):
x: int
""")
+ def test_parameters_no_more_than_one_vararg(self):
+ s = self.parse_function_should_fail("""
+module foo
+foo.bar
+ *vararg1: object
+ *vararg2: object
+""")
+ self.assertEqual(s, "Error on line 0:\nToo many var args\n")
+
def test_function_not_at_column_0(self):
function = self.parse_function("""
module foo
@@ -764,6 +773,45 @@ def test_legacy_converters(self):
module, function = block.signatures
self.assertIsInstance((function.parameters['path']).converter, clinic.str_converter)
+ def test_legacy_converters_non_string_constant_annotation(self):
+ expected_failure_message = """\
+Error on line 0:
+Annotations must be either a name, a function call, or a string.
+"""
+
+ s = self.parse_function_should_fail('module os\nos.access\n path: 42')
+ self.assertEqual(s, expected_failure_message)
+
+ s = self.parse_function_should_fail('module os\nos.access\n path: 42.42')
+ self.assertEqual(s, expected_failure_message)
+
+ s = self.parse_function_should_fail('module os\nos.access\n path: 42j')
+ self.assertEqual(s, expected_failure_message)
+
+ s = self.parse_function_should_fail('module os\nos.access\n path: b"42"')
+ self.assertEqual(s, expected_failure_message)
+
+ def test_other_bizarre_things_in_annotations_fail(self):
+ expected_failure_message = """\
+Error on line 0:
+Annotations must be either a name, a function call, or a string.
+"""
+
+ s = self.parse_function_should_fail(
+ 'module os\nos.access\n path: {"some": "dictionary"}'
+ )
+ self.assertEqual(s, expected_failure_message)
+
+ s = self.parse_function_should_fail(
+ 'module os\nos.access\n path: ["list", "of", "strings"]'
+ )
+ self.assertEqual(s, expected_failure_message)
+
+ s = self.parse_function_should_fail(
+ 'module os\nos.access\n path: (x for x in range(42))'
+ )
+ self.assertEqual(s, expected_failure_message)
+
def parse(self, text):
c = FakeClinic()
parser = DSLParser(c)
@@ -820,5 +868,464 @@ def test_external(self):
self.assertEqual(new_mtime_ns, old_mtime_ns)
+try:
+ import _testclinic as ac_tester
+except ImportError:
+ ac_tester = None
+
+@unittest.skipIf(ac_tester is None, "_testclinic is missing")
+class ClinicFunctionalTest(unittest.TestCase):
+ locals().update((name, getattr(ac_tester, name))
+ for name in dir(ac_tester) if name.startswith('test_'))
+
+ def test_objects_converter(self):
+ with self.assertRaises(TypeError):
+ ac_tester.objects_converter()
+ self.assertEqual(ac_tester.objects_converter(1, 2), (1, 2))
+ self.assertEqual(ac_tester.objects_converter([], 'whatever class'), ([], 'whatever class'))
+ self.assertEqual(ac_tester.objects_converter(1), (1, None))
+
+ def test_bytes_object_converter(self):
+ with self.assertRaises(TypeError):
+ ac_tester.bytes_object_converter(1)
+ self.assertEqual(ac_tester.bytes_object_converter(b'BytesObject'), (b'BytesObject',))
+
+ def test_byte_array_object_converter(self):
+ with self.assertRaises(TypeError):
+ ac_tester.byte_array_object_converter(1)
+ byte_arr = bytearray(b'ByteArrayObject')
+ self.assertEqual(ac_tester.byte_array_object_converter(byte_arr), (byte_arr,))
+
+ def test_unicode_converter(self):
+ with self.assertRaises(TypeError):
+ ac_tester.unicode_converter(1)
+ self.assertEqual(ac_tester.unicode_converter('unicode'), ('unicode',))
+
+ def test_bool_converter(self):
+ with self.assertRaises(TypeError):
+ ac_tester.bool_converter(False, False, 'not a int')
+ self.assertEqual(ac_tester.bool_converter(), (True, True, True))
+ self.assertEqual(ac_tester.bool_converter('', [], 5), (False, False, True))
+ self.assertEqual(ac_tester.bool_converter(('not empty',), {1: 2}, 0), (True, True, False))
+
+ def test_char_converter(self):
+ with self.assertRaises(TypeError):
+ ac_tester.char_converter(1)
+ with self.assertRaises(TypeError):
+ ac_tester.char_converter(b'ab')
+ chars = [b'A', b'\a', b'\b', b'\t', b'\n', b'\v', b'\f', b'\r', b'"', b"'", b'?', b'\\', b'\000', b'\377']
+ expected = tuple(ord(c) for c in chars)
+ self.assertEqual(ac_tester.char_converter(), expected)
+ chars = [b'1', b'2', b'3', b'4', b'5', b'6', b'7', b'8', b'9', b'0', b'a', b'b', b'c', b'd']
+ expected = tuple(ord(c) for c in chars)
+ self.assertEqual(ac_tester.char_converter(*chars), expected)
+
+ def test_unsigned_char_converter(self):
+ from _testcapi import UCHAR_MAX
+ with self.assertRaises(OverflowError):
+ ac_tester.unsigned_char_converter(-1)
+ with self.assertRaises(OverflowError):
+ ac_tester.unsigned_char_converter(UCHAR_MAX + 1)
+ with self.assertRaises(OverflowError):
+ ac_tester.unsigned_char_converter(0, UCHAR_MAX + 1)
+ with self.assertRaises(TypeError):
+ ac_tester.unsigned_char_converter([])
+ self.assertEqual(ac_tester.unsigned_char_converter(), (12, 34, 56))
+ self.assertEqual(ac_tester.unsigned_char_converter(0, 0, UCHAR_MAX + 1), (0, 0, 0))
+ self.assertEqual(ac_tester.unsigned_char_converter(0, 0, (UCHAR_MAX + 1) * 3 + 123), (0, 0, 123))
+
+ def test_short_converter(self):
+ from _testcapi import SHRT_MIN, SHRT_MAX
+ with self.assertRaises(OverflowError):
+ ac_tester.short_converter(SHRT_MIN - 1)
+ with self.assertRaises(OverflowError):
+ ac_tester.short_converter(SHRT_MAX + 1)
+ with self.assertRaises(TypeError):
+ ac_tester.short_converter([])
+ self.assertEqual(ac_tester.short_converter(-1234), (-1234,))
+ self.assertEqual(ac_tester.short_converter(4321), (4321,))
+
+ def test_unsigned_short_converter(self):
+ from _testcapi import USHRT_MAX
+ with self.assertRaises(ValueError):
+ ac_tester.unsigned_short_converter(-1)
+ with self.assertRaises(OverflowError):
+ ac_tester.unsigned_short_converter(USHRT_MAX + 1)
+ with self.assertRaises(OverflowError):
+ ac_tester.unsigned_short_converter(0, USHRT_MAX + 1)
+ with self.assertRaises(TypeError):
+ ac_tester.unsigned_short_converter([])
+ self.assertEqual(ac_tester.unsigned_short_converter(), (12, 34, 56))
+ self.assertEqual(ac_tester.unsigned_short_converter(0, 0, USHRT_MAX + 1), (0, 0, 0))
+ self.assertEqual(ac_tester.unsigned_short_converter(0, 0, (USHRT_MAX + 1) * 3 + 123), (0, 0, 123))
+
+ def test_int_converter(self):
+ from _testcapi import INT_MIN, INT_MAX
+ with self.assertRaises(OverflowError):
+ ac_tester.int_converter(INT_MIN - 1)
+ with self.assertRaises(OverflowError):
+ ac_tester.int_converter(INT_MAX + 1)
+ with self.assertRaises(TypeError):
+ ac_tester.int_converter(1, 2, 3)
+ with self.assertRaises(TypeError):
+ ac_tester.int_converter([])
+ self.assertEqual(ac_tester.int_converter(), (12, 34, 45))
+ self.assertEqual(ac_tester.int_converter(1, 2, '3'), (1, 2, ord('3')))
+
+ def test_unsigned_int_converter(self):
+ from _testcapi import UINT_MAX
+ with self.assertRaises(ValueError):
+ ac_tester.unsigned_int_converter(-1)
+ with self.assertRaises(OverflowError):
+ ac_tester.unsigned_int_converter(UINT_MAX + 1)
+ with self.assertRaises(OverflowError):
+ ac_tester.unsigned_int_converter(0, UINT_MAX + 1)
+ with self.assertRaises(TypeError):
+ ac_tester.unsigned_int_converter([])
+ self.assertEqual(ac_tester.unsigned_int_converter(), (12, 34, 56))
+ self.assertEqual(ac_tester.unsigned_int_converter(0, 0, UINT_MAX + 1), (0, 0, 0))
+ self.assertEqual(ac_tester.unsigned_int_converter(0, 0, (UINT_MAX + 1) * 3 + 123), (0, 0, 123))
+
+ def test_long_converter(self):
+ from _testcapi import LONG_MIN, LONG_MAX
+ with self.assertRaises(OverflowError):
+ ac_tester.long_converter(LONG_MIN - 1)
+ with self.assertRaises(OverflowError):
+ ac_tester.long_converter(LONG_MAX + 1)
+ with self.assertRaises(TypeError):
+ ac_tester.long_converter([])
+ self.assertEqual(ac_tester.long_converter(), (12,))
+ self.assertEqual(ac_tester.long_converter(-1234), (-1234,))
+
+ def test_unsigned_long_converter(self):
+ from _testcapi import ULONG_MAX
+ with self.assertRaises(ValueError):
+ ac_tester.unsigned_long_converter(-1)
+ with self.assertRaises(OverflowError):
+ ac_tester.unsigned_long_converter(ULONG_MAX + 1)
+ with self.assertRaises(OverflowError):
+ ac_tester.unsigned_long_converter(0, ULONG_MAX + 1)
+ with self.assertRaises(TypeError):
+ ac_tester.unsigned_long_converter([])
+ self.assertEqual(ac_tester.unsigned_long_converter(), (12, 34, 56))
+ self.assertEqual(ac_tester.unsigned_long_converter(0, 0, ULONG_MAX + 1), (0, 0, 0))
+ self.assertEqual(ac_tester.unsigned_long_converter(0, 0, (ULONG_MAX + 1) * 3 + 123), (0, 0, 123))
+
+ def test_long_long_converter(self):
+ from _testcapi import LLONG_MIN, LLONG_MAX
+ with self.assertRaises(OverflowError):
+ ac_tester.long_long_converter(LLONG_MIN - 1)
+ with self.assertRaises(OverflowError):
+ ac_tester.long_long_converter(LLONG_MAX + 1)
+ with self.assertRaises(TypeError):
+ ac_tester.long_long_converter([])
+ self.assertEqual(ac_tester.long_long_converter(), (12,))
+ self.assertEqual(ac_tester.long_long_converter(-1234), (-1234,))
+
+ def test_unsigned_long_long_converter(self):
+ from _testcapi import ULLONG_MAX
+ with self.assertRaises(ValueError):
+ ac_tester.unsigned_long_long_converter(-1)
+ with self.assertRaises(OverflowError):
+ ac_tester.unsigned_long_long_converter(ULLONG_MAX + 1)
+ with self.assertRaises(OverflowError):
+ ac_tester.unsigned_long_long_converter(0, ULLONG_MAX + 1)
+ with self.assertRaises(TypeError):
+ ac_tester.unsigned_long_long_converter([])
+ self.assertEqual(ac_tester.unsigned_long_long_converter(), (12, 34, 56))
+ self.assertEqual(ac_tester.unsigned_long_long_converter(0, 0, ULLONG_MAX + 1), (0, 0, 0))
+ self.assertEqual(ac_tester.unsigned_long_long_converter(0, 0, (ULLONG_MAX + 1) * 3 + 123), (0, 0, 123))
+
+ def test_py_ssize_t_converter(self):
+ from _testcapi import PY_SSIZE_T_MIN, PY_SSIZE_T_MAX
+ with self.assertRaises(OverflowError):
+ ac_tester.py_ssize_t_converter(PY_SSIZE_T_MIN - 1)
+ with self.assertRaises(OverflowError):
+ ac_tester.py_ssize_t_converter(PY_SSIZE_T_MAX + 1)
+ with self.assertRaises(TypeError):
+ ac_tester.py_ssize_t_converter([])
+ self.assertEqual(ac_tester.py_ssize_t_converter(), (12, 34, 56))
+ self.assertEqual(ac_tester.py_ssize_t_converter(1, 2, None), (1, 2, 56))
+
+ def test_slice_index_converter(self):
+ from _testcapi import PY_SSIZE_T_MIN, PY_SSIZE_T_MAX
+ with self.assertRaises(TypeError):
+ ac_tester.slice_index_converter([])
+ self.assertEqual(ac_tester.slice_index_converter(), (12, 34, 56))
+ self.assertEqual(ac_tester.slice_index_converter(1, 2, None), (1, 2, 56))
+ self.assertEqual(ac_tester.slice_index_converter(PY_SSIZE_T_MAX, PY_SSIZE_T_MAX + 1, PY_SSIZE_T_MAX + 1234),
+ (PY_SSIZE_T_MAX, PY_SSIZE_T_MAX, PY_SSIZE_T_MAX))
+ self.assertEqual(ac_tester.slice_index_converter(PY_SSIZE_T_MIN, PY_SSIZE_T_MIN - 1, PY_SSIZE_T_MIN - 1234),
+ (PY_SSIZE_T_MIN, PY_SSIZE_T_MIN, PY_SSIZE_T_MIN))
+
+ def test_size_t_converter(self):
+ with self.assertRaises(ValueError):
+ ac_tester.size_t_converter(-1)
+ with self.assertRaises(TypeError):
+ ac_tester.size_t_converter([])
+ self.assertEqual(ac_tester.size_t_converter(), (12,))
+
+ def test_float_converter(self):
+ with self.assertRaises(TypeError):
+ ac_tester.float_converter([])
+ self.assertEqual(ac_tester.float_converter(), (12.5,))
+ self.assertEqual(ac_tester.float_converter(-0.5), (-0.5,))
+
+ def test_double_converter(self):
+ with self.assertRaises(TypeError):
+ ac_tester.double_converter([])
+ self.assertEqual(ac_tester.double_converter(), (12.5,))
+ self.assertEqual(ac_tester.double_converter(-0.5), (-0.5,))
+
+ def test_py_complex_converter(self):
+ with self.assertRaises(TypeError):
+ ac_tester.py_complex_converter([])
+ self.assertEqual(ac_tester.py_complex_converter(complex(1, 2)), (complex(1, 2),))
+ self.assertEqual(ac_tester.py_complex_converter(complex('-1-2j')), (complex('-1-2j'),))
+ self.assertEqual(ac_tester.py_complex_converter(-0.5), (-0.5,))
+ self.assertEqual(ac_tester.py_complex_converter(10), (10,))
+
+ def test_str_converter(self):
+ with self.assertRaises(TypeError):
+ ac_tester.str_converter(1)
+ with self.assertRaises(TypeError):
+ ac_tester.str_converter('a', 'b', 'c')
+ with self.assertRaises(ValueError):
+ ac_tester.str_converter('a', b'b\0b', 'c')
+ self.assertEqual(ac_tester.str_converter('a', b'b', 'c'), ('a', 'b', 'c'))
+ self.assertEqual(ac_tester.str_converter('a', b'b', b'c'), ('a', 'b', 'c'))
+ self.assertEqual(ac_tester.str_converter('a', b'b', 'c\0c'), ('a', 'b', 'c\0c'))
+
+ def test_str_converter_encoding(self):
+ with self.assertRaises(TypeError):
+ ac_tester.str_converter_encoding(1)
+ self.assertEqual(ac_tester.str_converter_encoding('a', 'b', 'c'), ('a', 'b', 'c'))
+ with self.assertRaises(TypeError):
+ ac_tester.str_converter_encoding('a', b'b\0b', 'c')
+ self.assertEqual(ac_tester.str_converter_encoding('a', b'b', bytearray([ord('c')])), ('a', 'b', 'c'))
+ self.assertEqual(ac_tester.str_converter_encoding('a', b'b', bytearray([ord('c'), 0, ord('c')])),
+ ('a', 'b', 'c\x00c'))
+ self.assertEqual(ac_tester.str_converter_encoding('a', b'b', b'c\x00c'), ('a', 'b', 'c\x00c'))
+
+ def test_py_buffer_converter(self):
+ with self.assertRaises(TypeError):
+ ac_tester.py_buffer_converter('a', 'b')
+ self.assertEqual(ac_tester.py_buffer_converter('abc', bytearray([1, 2, 3])), (b'abc', b'\x01\x02\x03'))
+
+ def test_keywords(self):
+ self.assertEqual(ac_tester.keywords(1, 2), (1, 2))
+ self.assertEqual(ac_tester.keywords(1, b=2), (1, 2))
+ self.assertEqual(ac_tester.keywords(a=1, b=2), (1, 2))
+
+ def test_keywords_kwonly(self):
+ with self.assertRaises(TypeError):
+ ac_tester.keywords_kwonly(1, 2)
+ self.assertEqual(ac_tester.keywords_kwonly(1, b=2), (1, 2))
+ self.assertEqual(ac_tester.keywords_kwonly(a=1, b=2), (1, 2))
+
+ def test_keywords_opt(self):
+ self.assertEqual(ac_tester.keywords_opt(1), (1, None, None))
+ self.assertEqual(ac_tester.keywords_opt(1, 2), (1, 2, None))
+ self.assertEqual(ac_tester.keywords_opt(1, 2, 3), (1, 2, 3))
+ self.assertEqual(ac_tester.keywords_opt(1, b=2), (1, 2, None))
+ self.assertEqual(ac_tester.keywords_opt(1, 2, c=3), (1, 2, 3))
+ self.assertEqual(ac_tester.keywords_opt(a=1, c=3), (1, None, 3))
+ self.assertEqual(ac_tester.keywords_opt(a=1, b=2, c=3), (1, 2, 3))
+
+ def test_keywords_opt_kwonly(self):
+ self.assertEqual(ac_tester.keywords_opt_kwonly(1), (1, None, None, None))
+ self.assertEqual(ac_tester.keywords_opt_kwonly(1, 2), (1, 2, None, None))
+ with self.assertRaises(TypeError):
+ ac_tester.keywords_opt_kwonly(1, 2, 3)
+ self.assertEqual(ac_tester.keywords_opt_kwonly(1, b=2), (1, 2, None, None))
+ self.assertEqual(ac_tester.keywords_opt_kwonly(1, 2, c=3), (1, 2, 3, None))
+ self.assertEqual(ac_tester.keywords_opt_kwonly(a=1, c=3), (1, None, 3, None))
+ self.assertEqual(ac_tester.keywords_opt_kwonly(a=1, b=2, c=3, d=4), (1, 2, 3, 4))
+
+ def test_keywords_kwonly_opt(self):
+ self.assertEqual(ac_tester.keywords_kwonly_opt(1), (1, None, None))
+ with self.assertRaises(TypeError):
+ ac_tester.keywords_kwonly_opt(1, 2)
+ self.assertEqual(ac_tester.keywords_kwonly_opt(1, b=2), (1, 2, None))
+ self.assertEqual(ac_tester.keywords_kwonly_opt(a=1, c=3), (1, None, 3))
+ self.assertEqual(ac_tester.keywords_kwonly_opt(a=1, b=2, c=3), (1, 2, 3))
+
+ def test_posonly_keywords(self):
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords(1)
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords(a=1, b=2)
+ self.assertEqual(ac_tester.posonly_keywords(1, 2), (1, 2))
+ self.assertEqual(ac_tester.posonly_keywords(1, b=2), (1, 2))
+
+ def test_posonly_kwonly(self):
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_kwonly(1)
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_kwonly(1, 2)
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_kwonly(a=1, b=2)
+ self.assertEqual(ac_tester.posonly_kwonly(1, b=2), (1, 2))
+
+ def test_posonly_keywords_kwonly(self):
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_kwonly(1)
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_kwonly(1, 2, 3)
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_kwonly(a=1, b=2, c=3)
+ self.assertEqual(ac_tester.posonly_keywords_kwonly(1, 2, c=3), (1, 2, 3))
+ self.assertEqual(ac_tester.posonly_keywords_kwonly(1, b=2, c=3), (1, 2, 3))
+
+ def test_posonly_keywords_opt(self):
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_opt(1)
+ self.assertEqual(ac_tester.posonly_keywords_opt(1, 2), (1, 2, None, None))
+ self.assertEqual(ac_tester.posonly_keywords_opt(1, 2, 3), (1, 2, 3, None))
+ self.assertEqual(ac_tester.posonly_keywords_opt(1, 2, 3, 4), (1, 2, 3, 4))
+ self.assertEqual(ac_tester.posonly_keywords_opt(1, b=2), (1, 2, None, None))
+ self.assertEqual(ac_tester.posonly_keywords_opt(1, 2, c=3), (1, 2, 3, None))
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_opt(a=1, b=2, c=3, d=4)
+ self.assertEqual(ac_tester.posonly_keywords_opt(1, b=2, c=3, d=4), (1, 2, 3, 4))
+
+ def test_posonly_opt_keywords_opt(self):
+ self.assertEqual(ac_tester.posonly_opt_keywords_opt(1), (1, None, None, None))
+ self.assertEqual(ac_tester.posonly_opt_keywords_opt(1, 2), (1, 2, None, None))
+ self.assertEqual(ac_tester.posonly_opt_keywords_opt(1, 2, 3), (1, 2, 3, None))
+ self.assertEqual(ac_tester.posonly_opt_keywords_opt(1, 2, 3, 4), (1, 2, 3, 4))
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_opt_keywords_opt(1, b=2)
+ self.assertEqual(ac_tester.posonly_opt_keywords_opt(1, 2, c=3), (1, 2, 3, None))
+ self.assertEqual(ac_tester.posonly_opt_keywords_opt(1, 2, c=3, d=4), (1, 2, 3, 4))
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_opt_keywords_opt(a=1, b=2, c=3, d=4)
+
+ def test_posonly_kwonly_opt(self):
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_kwonly_opt(1)
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_kwonly_opt(1, 2)
+ self.assertEqual(ac_tester.posonly_kwonly_opt(1, b=2), (1, 2, None, None))
+ self.assertEqual(ac_tester.posonly_kwonly_opt(1, b=2, c=3), (1, 2, 3, None))
+ self.assertEqual(ac_tester.posonly_kwonly_opt(1, b=2, c=3, d=4), (1, 2, 3, 4))
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_kwonly_opt(a=1, b=2, c=3, d=4)
+
+ def test_posonly_opt_kwonly_opt(self):
+ self.assertEqual(ac_tester.posonly_opt_kwonly_opt(1), (1, None, None, None))
+ self.assertEqual(ac_tester.posonly_opt_kwonly_opt(1, 2), (1, 2, None, None))
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_opt_kwonly_opt(1, 2, 3)
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_opt_kwonly_opt(1, b=2)
+ self.assertEqual(ac_tester.posonly_opt_kwonly_opt(1, 2, c=3), (1, 2, 3, None))
+ self.assertEqual(ac_tester.posonly_opt_kwonly_opt(1, 2, c=3, d=4), (1, 2, 3, 4))
+
+ def test_posonly_keywords_kwonly_opt(self):
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_kwonly_opt(1)
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_kwonly_opt(1, 2)
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_kwonly_opt(1, b=2)
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_kwonly_opt(1, 2, 3)
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_kwonly_opt(a=1, b=2, c=3)
+ self.assertEqual(ac_tester.posonly_keywords_kwonly_opt(1, 2, c=3), (1, 2, 3, None, None))
+ self.assertEqual(ac_tester.posonly_keywords_kwonly_opt(1, b=2, c=3), (1, 2, 3, None, None))
+ self.assertEqual(ac_tester.posonly_keywords_kwonly_opt(1, 2, c=3, d=4), (1, 2, 3, 4, None))
+ self.assertEqual(ac_tester.posonly_keywords_kwonly_opt(1, 2, c=3, d=4, e=5), (1, 2, 3, 4, 5))
+
+ def test_posonly_keywords_opt_kwonly_opt(self):
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_opt_kwonly_opt(1)
+ self.assertEqual(ac_tester.posonly_keywords_opt_kwonly_opt(1, 2), (1, 2, None, None, None))
+ self.assertEqual(ac_tester.posonly_keywords_opt_kwonly_opt(1, b=2), (1, 2, None, None, None))
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_opt_kwonly_opt(1, 2, 3, 4)
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_keywords_opt_kwonly_opt(a=1, b=2)
+ self.assertEqual(ac_tester.posonly_keywords_opt_kwonly_opt(1, 2, c=3), (1, 2, 3, None, None))
+ self.assertEqual(ac_tester.posonly_keywords_opt_kwonly_opt(1, b=2, c=3), (1, 2, 3, None, None))
+ self.assertEqual(ac_tester.posonly_keywords_opt_kwonly_opt(1, 2, 3, d=4), (1, 2, 3, 4, None))
+ self.assertEqual(ac_tester.posonly_keywords_opt_kwonly_opt(1, 2, c=3, d=4), (1, 2, 3, 4, None))
+ self.assertEqual(ac_tester.posonly_keywords_opt_kwonly_opt(1, 2, 3, d=4, e=5), (1, 2, 3, 4, 5))
+ self.assertEqual(ac_tester.posonly_keywords_opt_kwonly_opt(1, 2, c=3, d=4, e=5), (1, 2, 3, 4, 5))
+
+ def test_posonly_opt_keywords_opt_kwonly_opt(self):
+ self.assertEqual(ac_tester.posonly_opt_keywords_opt_kwonly_opt(1), (1, None, None, None))
+ self.assertEqual(ac_tester.posonly_opt_keywords_opt_kwonly_opt(1, 2), (1, 2, None, None))
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_opt_keywords_opt_kwonly_opt(1, b=2)
+ self.assertEqual(ac_tester.posonly_opt_keywords_opt_kwonly_opt(1, 2, 3), (1, 2, 3, None))
+ self.assertEqual(ac_tester.posonly_opt_keywords_opt_kwonly_opt(1, 2, c=3), (1, 2, 3, None))
+ self.assertEqual(ac_tester.posonly_opt_keywords_opt_kwonly_opt(1, 2, 3, d=4), (1, 2, 3, 4))
+ self.assertEqual(ac_tester.posonly_opt_keywords_opt_kwonly_opt(1, 2, c=3, d=4), (1, 2, 3, 4))
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_opt_keywords_opt_kwonly_opt(1, 2, 3, 4)
+
+ def test_keyword_only_parameter(self):
+ with self.assertRaises(TypeError):
+ ac_tester.keyword_only_parameter()
+ with self.assertRaises(TypeError):
+ ac_tester.keyword_only_parameter(1)
+ self.assertEqual(ac_tester.keyword_only_parameter(a=1), (1,))
+
+ def test_posonly_vararg(self):
+ with self.assertRaises(TypeError):
+ ac_tester.posonly_vararg()
+ self.assertEqual(ac_tester.posonly_vararg(1, 2), (1, 2, ()))
+ self.assertEqual(ac_tester.posonly_vararg(1, b=2), (1, 2, ()))
+ self.assertEqual(ac_tester.posonly_vararg(1, 2, 3, 4), (1, 2, (3, 4)))
+
+ def test_vararg_and_posonly(self):
+ with self.assertRaises(TypeError):
+ ac_tester.vararg_and_posonly()
+ with self.assertRaises(TypeError):
+ ac_tester.vararg_and_posonly(1, b=2)
+ self.assertEqual(ac_tester.vararg_and_posonly(1, 2, 3, 4), (1, (2, 3, 4)))
+
+ def test_vararg(self):
+ with self.assertRaises(TypeError):
+ ac_tester.vararg()
+ with self.assertRaises(TypeError):
+ ac_tester.vararg(1, b=2)
+ self.assertEqual(ac_tester.vararg(1, 2, 3, 4), (1, (2, 3, 4)))
+
+ def test_vararg_with_default(self):
+ with self.assertRaises(TypeError):
+ ac_tester.vararg_with_default()
+ self.assertEqual(ac_tester.vararg_with_default(1, b=False), (1, (), False))
+ self.assertEqual(ac_tester.vararg_with_default(1, 2, 3, 4), (1, (2, 3, 4), False))
+ self.assertEqual(ac_tester.vararg_with_default(1, 2, 3, 4, b=True), (1, (2, 3, 4), True))
+
+ def test_vararg_with_only_defaults(self):
+ self.assertEqual(ac_tester.vararg_with_only_defaults(), ((), None))
+ self.assertEqual(ac_tester.vararg_with_only_defaults(b=2), ((), 2))
+ self.assertEqual(ac_tester.vararg_with_only_defaults(1, b=2), ((1, ), 2))
+ self.assertEqual(ac_tester.vararg_with_only_defaults(1, 2, 3, 4), ((1, 2, 3, 4), None))
+ self.assertEqual(ac_tester.vararg_with_only_defaults(1, 2, 3, 4, b=5), ((1, 2, 3, 4), 5))
+
+ def test_gh_32092_oob(self):
+ ac_tester.gh_32092_oob(1, 2, 3, 4, kw1=5, kw2=6)
+
+ def test_gh_32092_kw_pass(self):
+ ac_tester.gh_32092_kw_pass(1, 2, 3)
+
+ def test_gh_99233_refcount(self):
+ arg = '*A unique string is not referenced by anywhere else.*'
+ arg_refcount_origin = sys.getrefcount(arg)
+ ac_tester.gh_99233_refcount(arg)
+ arg_refcount_after = sys.getrefcount(arg)
+ self.assertEqual(arg_refcount_origin, arg_refcount_after)
+
+ def test_gh_99240_double_free(self):
+ expected_error = r'gh_99240_double_free\(\) argument 2 must be encoded string without null bytes, not str'
+ with self.assertRaisesRegex(TypeError, expected_error):
+ ac_tester.gh_99240_double_free('a', '\0b')
+
+
if __name__ == "__main__":
unittest.main()
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index 5a9e14bbd32007..1c33be285837cb 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -28,32 +28,55 @@ def _kill_python_and_exit_code(p):
returncode = p.wait()
return data, returncode
+
class CmdLineTest(unittest.TestCase):
def test_directories(self):
assert_python_failure('.')
assert_python_failure('< .')
def verify_valid_flag(self, cmd_line):
- rc, out, err = assert_python_ok(*cmd_line)
+ rc, out, err = assert_python_ok(cmd_line)
self.assertTrue(out == b'' or out.endswith(b'\n'))
self.assertNotIn(b'Traceback', out)
self.assertNotIn(b'Traceback', err)
+ return out
- def test_optimize(self):
- self.verify_valid_flag('-O')
- self.verify_valid_flag('-OO')
+ def test_help(self):
+ self.verify_valid_flag('-h')
+ self.verify_valid_flag('-?')
+ out = self.verify_valid_flag('--help')
+ lines = out.splitlines()
+ self.assertIn(b'usage', lines[0])
+ self.assertNotIn(b'PYTHONHOME', out)
+ self.assertNotIn(b'-X dev', out)
+ self.assertLess(len(lines), 50)
- def test_site_flag(self):
- self.verify_valid_flag('-S')
+ def test_help_env(self):
+ out = self.verify_valid_flag('--help-env')
+ self.assertIn(b'PYTHONHOME', out)
+
+ def test_help_xoptions(self):
+ out = self.verify_valid_flag('--help-xoptions')
+ self.assertIn(b'-X dev', out)
- def test_usage(self):
- rc, out, err = assert_python_ok('-h')
+ def test_help_all(self):
+ out = self.verify_valid_flag('--help-all')
lines = out.splitlines()
self.assertIn(b'usage', lines[0])
+ self.assertIn(b'PYTHONHOME', out)
+ self.assertIn(b'-X dev', out)
+
# The first line contains the program name,
# but the rest should be ASCII-only
b''.join(lines[1:]).decode('ascii')
+ def test_optimize(self):
+ self.verify_valid_flag('-O')
+ self.verify_valid_flag('-OO')
+
+ def test_site_flag(self):
+ self.verify_valid_flag('-S')
+
def test_version(self):
version = ('Python %d.%d' % sys.version_info[:2]).encode("ascii")
for switch in '-V', '--version', '-VV':
@@ -85,17 +108,8 @@ def get_xoptions(*args):
opts = get_xoptions()
self.assertEqual(opts, {})
- opts = get_xoptions('-Xno_debug_ranges', '-Xdev=1234')
- self.assertEqual(opts, {'no_debug_ranges': True, 'dev': '1234'})
-
- @unittest.skipIf(interpreter_requires_environment(),
- 'Cannot run -E tests when PYTHON env vars are required.')
- def test_unknown_xoptions(self):
- rc, out, err = assert_python_failure('-X', 'blech')
- self.assertIn(b'Unknown value for option -X', err)
- msg = b'Fatal Python error: Unknown value for option -X'
- self.assertEqual(err.splitlines().count(msg), 1)
- self.assertEqual(b'', out)
+ opts = get_xoptions('-Xa', '-Xb=c,d=e')
+ self.assertEqual(opts, {'a': True, 'b': 'c,d=e'})
def test_showrefcount(self):
def run_python(*args):
@@ -137,7 +151,6 @@ def test_xoption_frozen_modules(self):
}
for raw, expected in tests:
cmd = ['-X', f'frozen_modules{raw}',
- #'-c', 'import os; print(os.__spec__.loader.__name__, end="")']
'-c', 'import os; print(os.__spec__.loader, end="")']
with self.subTest(raw):
res = assert_python_ok(*cmd)
@@ -170,7 +183,6 @@ def test_relativedir_bug46421(self):
# Test `python -m unittest` with a relative directory beginning with ./
# Note: We have to switch to the project's top module's directory, as per
# the python unittest wiki. We will switch back when we are done.
- defaultwd = os.getcwd()
projectlibpath = os.path.dirname(__file__).removesuffix("test")
with os_helper.change_cwd(projectlibpath):
# Testing with and without ./
@@ -250,7 +262,6 @@ def test_invalid_utf8_arg(self):
#
# Test with default config, in the C locale, in the Python UTF-8 Mode.
code = 'import sys, os; s=os.fsencode(sys.argv[1]); print(ascii(s))'
- base_cmd = [sys.executable, '-c', code]
def run_default(arg):
cmd = [sys.executable, '-c', code, arg]
@@ -857,6 +868,41 @@ def test_parsing_error(self):
self.assertTrue(proc.stderr.startswith(err_msg), proc.stderr)
self.assertNotEqual(proc.returncode, 0)
+ def test_int_max_str_digits(self):
+ code = "import sys; print(sys.flags.int_max_str_digits, sys.get_int_max_str_digits())"
+
+ assert_python_failure('-X', 'int_max_str_digits', '-c', code)
+ assert_python_failure('-X', 'int_max_str_digits=foo', '-c', code)
+ assert_python_failure('-X', 'int_max_str_digits=100', '-c', code)
+ assert_python_failure('-X', 'int_max_str_digits', '-c', code,
+ PYTHONINTMAXSTRDIGITS='4000')
+
+ assert_python_failure('-c', code, PYTHONINTMAXSTRDIGITS='foo')
+ assert_python_failure('-c', code, PYTHONINTMAXSTRDIGITS='100')
+
+ def res2int(res):
+ out = res.out.strip().decode("utf-8")
+ return tuple(int(i) for i in out.split())
+
+ res = assert_python_ok('-c', code)
+ self.assertEqual(res2int(res), (-1, sys.get_int_max_str_digits()))
+ res = assert_python_ok('-X', 'int_max_str_digits=0', '-c', code)
+ self.assertEqual(res2int(res), (0, 0))
+ res = assert_python_ok('-X', 'int_max_str_digits=4000', '-c', code)
+ self.assertEqual(res2int(res), (4000, 4000))
+ res = assert_python_ok('-X', 'int_max_str_digits=100000', '-c', code)
+ self.assertEqual(res2int(res), (100000, 100000))
+
+ res = assert_python_ok('-c', code, PYTHONINTMAXSTRDIGITS='0')
+ self.assertEqual(res2int(res), (0, 0))
+ res = assert_python_ok('-c', code, PYTHONINTMAXSTRDIGITS='4000')
+ self.assertEqual(res2int(res), (4000, 4000))
+ res = assert_python_ok(
+ '-X', 'int_max_str_digits=6000', '-c', code,
+ PYTHONINTMAXSTRDIGITS='4000'
+ )
+ self.assertEqual(res2int(res), (6000, 6000))
+
@unittest.skipIf(interpreter_requires_environment(),
'Cannot run -I tests when PYTHON env vars are required.')
@@ -895,6 +941,7 @@ def test_sys_flags_not_set(self):
PYTHONSAFEPATH="1",
)
+
class SyntaxErrorTests(unittest.TestCase):
def check_string(self, code):
proc = subprocess.run([sys.executable, "-"], input=code,
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
index bb433dc1e73a43..d10012759c370b 100644
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -549,17 +549,18 @@ def test_pep_409_verbiage(self):
script_name = _make_test_script(script_dir, 'script', script)
exitcode, stdout, stderr = assert_python_failure(script_name)
text = stderr.decode('ascii').split('\n')
- self.assertEqual(len(text), 6)
+ self.assertEqual(len(text), 5)
self.assertTrue(text[0].startswith('Traceback'))
self.assertTrue(text[1].startswith(' File '))
- self.assertTrue(text[4].startswith('NameError'))
+ self.assertTrue(text[3].startswith('NameError'))
def test_non_ascii(self):
# Mac OS X denies the creation of a file with an invalid UTF-8 name.
# Windows allows creating a name with an arbitrary bytes name, but
# Python cannot a undecodable bytes argument to a subprocess.
+ # WASI does not permit invalid UTF-8 names.
if (os_helper.TESTFN_UNDECODABLE
- and sys.platform not in ('win32', 'darwin')):
+ and sys.platform not in ('win32', 'darwin', 'emscripten', 'wasi')):
name = os.fsdecode(os_helper.TESTFN_UNDECODABLE)
elif os_helper.TESTFN_NONASCII:
name = os_helper.TESTFN_NONASCII
@@ -656,6 +657,31 @@ def test_syntaxerror_invalid_escape_sequence_multi_line(self):
],
)
+ def test_syntaxerror_null_bytes(self):
+ script = "x = '\0' nothing to see here\n';import os;os.system('echo pwnd')\n"
+ with os_helper.temp_dir() as script_dir:
+ script_name = _make_test_script(script_dir, 'script', script)
+ exitcode, stdout, stderr = assert_python_failure(script_name)
+ self.assertEqual(
+ stderr.splitlines()[-2:],
+ [ b" x = '",
+ b'SyntaxError: source code cannot contain null bytes'
+ ],
+ )
+
+ def test_syntaxerror_null_bytes_in_multiline_string(self):
+ scripts = ["\n'''\nmultilinestring\0\n'''", "\nf'''\nmultilinestring\0\n'''"] # Both normal and f-strings
+ with os_helper.temp_dir() as script_dir:
+ for script in scripts:
+ script_name = _make_test_script(script_dir, 'script', script)
+ _, _, stderr = assert_python_failure(script_name)
+ self.assertEqual(
+ stderr.splitlines()[-2:],
+ [ b" multilinestring",
+ b'SyntaxError: source code cannot contain null bytes'
+ ]
+ )
+
def test_consistent_sys_path_for_direct_execution(self):
# This test case ensures that the following all give the same
# sys.path configuration:
@@ -739,6 +765,23 @@ def test_nonexisting_script(self):
self.assertIn(": can't open file ", err)
self.assertNotEqual(proc.returncode, 0)
+ @unittest.skipUnless(os.path.exists('/dev/fd/0'), 'requires /dev/fd platform')
+ @unittest.skipIf(sys.platform.startswith("freebsd") and
+ os.stat("/dev").st_dev == os.stat("/dev/fd").st_dev,
+ "Requires fdescfs mounted on /dev/fd on FreeBSD")
+ def test_script_as_dev_fd(self):
+ # GH-87235: On macOS passing a non-trivial script to /dev/fd/N can cause
+ # problems because all open /dev/fd/N file descriptors share the same
+ # offset.
+ script = 'print("12345678912345678912345")'
+ with os_helper.temp_dir() as work_dir:
+ script_name = _make_test_script(work_dir, 'script.py', script)
+ with open(script_name, "r") as fp:
+ p = spawn_python(f"/dev/fd/{fp.fileno()}", close_fds=False, pass_fds=(0,1,2,fp.fileno()))
+ out, err = p.communicate()
+ self.assertEqual(out, b"12345678912345678912345\n")
+
+
def tearDownModule():
support.reap_children()
diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 1bb138e7f3243b..d3e20129eee8ef 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -132,6 +132,7 @@
import unittest
import textwrap
import weakref
+import dis
try:
import ctypes
@@ -141,6 +142,7 @@
check_impl_detail, requires_debug_ranges,
gc_collect)
from test.support.script_helper import assert_python_ok
+from test.support import threading_helper
from opcode import opmap
COPY_FREE_VARS = opmap['COPY_FREE_VARS']
@@ -375,7 +377,6 @@ def test_co_positions_artificial_instructions(self):
for instruction in artificial_instructions
],
[
- ('RESUME', 0),
("PUSH_EXC_INFO", None),
("LOAD_CONST", None), # artificial 'None'
("STORE_NAME", "e"), # XX: we know the location for this
@@ -428,6 +429,27 @@ def func():
self.assertIsNone(line)
self.assertEqual(end_line, new_code.co_firstlineno + 1)
+ def test_code_equality(self):
+ def f():
+ try:
+ a()
+ except:
+ b()
+ else:
+ c()
+ finally:
+ d()
+ code_a = f.__code__
+ code_b = code_a.replace(co_linetable=b"")
+ code_c = code_a.replace(co_exceptiontable=b"")
+ code_d = code_b.replace(co_exceptiontable=b"")
+ self.assertNotEqual(code_a, code_b)
+ self.assertNotEqual(code_a, code_c)
+ self.assertNotEqual(code_a, code_d)
+ self.assertNotEqual(code_b, code_c)
+ self.assertNotEqual(code_b, code_d)
+ self.assertNotEqual(code_c, code_d)
+
def isinterned(s):
return s is sys.intern(('_' + s + '_')[1:-1])
@@ -574,6 +596,15 @@ def positions_from_location_table(code):
for _ in range(length):
yield (line, end_line, col, end_col)
+def dedup(lst, prev=object()):
+ for item in lst:
+ if item != prev:
+ yield item
+ prev = item
+
+def lines_from_postions(positions):
+ return dedup(l for (l, _, _, _) in positions)
+
def misshappen():
"""
@@ -606,6 +637,13 @@ def misshappen():
) else p
+def bug93662():
+ example_report_generation_message= (
+ """
+ """
+ ).strip()
+ raise ValueError()
+
class CodeLocationTest(unittest.TestCase):
@@ -616,10 +654,55 @@ def check_positions(self, func):
self.assertEqual(l1, l2)
self.assertEqual(len(pos1), len(pos2))
-
def test_positions(self):
self.check_positions(parse_location_table)
self.check_positions(misshappen)
+ self.check_positions(bug93662)
+
+ def check_lines(self, func):
+ co = func.__code__
+ lines1 = list(dedup(l for (_, _, l) in co.co_lines()))
+ lines2 = list(lines_from_postions(positions_from_location_table(co)))
+ for l1, l2 in zip(lines1, lines2):
+ self.assertEqual(l1, l2)
+ self.assertEqual(len(lines1), len(lines2))
+
+ def test_lines(self):
+ self.check_lines(parse_location_table)
+ self.check_lines(misshappen)
+ self.check_lines(bug93662)
+
+ @cpython_only
+ def test_code_new_empty(self):
+ # If this test fails, it means that the construction of PyCode_NewEmpty
+ # needs to be modified! Please update this test *and* PyCode_NewEmpty,
+ # so that they both stay in sync.
+ def f():
+ pass
+ PY_CODE_LOCATION_INFO_NO_COLUMNS = 13
+ f.__code__ = f.__code__.replace(
+ co_firstlineno=42,
+ co_code=bytes(
+ [
+ dis.opmap["RESUME"], 0,
+ dis.opmap["LOAD_ASSERTION_ERROR"], 0,
+ dis.opmap["RAISE_VARARGS"], 1,
+ ]
+ ),
+ co_linetable=bytes(
+ [
+ (1 << 7)
+ | (PY_CODE_LOCATION_INFO_NO_COLUMNS << 3)
+ | (3 - 1),
+ 0,
+ ]
+ ),
+ )
+ self.assertRaises(AssertionError, f)
+ self.assertEqual(
+ list(f.__code__.co_positions()),
+ 3 * [(42, 42, None, None)],
+ )
if check_impl_detail(cpython=True) and ctypes is not None:
@@ -694,6 +777,7 @@ def test_get_set(self):
self.assertEqual(extra.value, 300)
del f
+ @threading_helper.requires_working_threading()
def test_free_different_thread(self):
# Freeing a code object on a different thread then
# where the co_extra was set should be safe.
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 42c600dcb00de1..934e4bb347ef3f 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -709,7 +709,8 @@ def test_decoder_state(self):
"spamspam", self.spambe)
def test_bug691291(self):
- # Files are always opened in binary mode, even if no binary mode was
+ # If encoding is not None, then
+ # files are always opened in binary mode, even if no binary mode was
# specified. This means that no automatic conversion of '\n' is done
# on reading and writing.
s1 = 'Hello\r\nworld\r\n'
@@ -1552,6 +1553,12 @@ def test_builtin_encode(self):
self.assertEqual("pyth\xf6n.org".encode("idna"), b"xn--pythn-mua.org")
self.assertEqual("pyth\xf6n.org.".encode("idna"), b"xn--pythn-mua.org.")
+ def test_builtin_decode_length_limit(self):
+ with self.assertRaisesRegex(UnicodeError, "too long"):
+ (b"xn--016c"+b"a"*1100).decode("idna")
+ with self.assertRaisesRegex(UnicodeError, "too long"):
+ (b"xn--016c"+b"a"*70).decode("idna")
+
def test_stream(self):
r = codecs.getreader("idna")(io.BytesIO(b"abc"))
r.read(3)
diff --git a/Lib/test/test_codeop.py b/Lib/test/test_codeop.py
index 17376c7ed7537e..133096d25a44bc 100644
--- a/Lib/test/test_codeop.py
+++ b/Lib/test/test_codeop.py
@@ -321,6 +321,26 @@ def test_warning(self):
warnings.simplefilter('error', SyntaxWarning)
compile_command('1 is 1', symbol='exec')
+ # Check DeprecationWarning treated as an SyntaxError
+ with warnings.catch_warnings(), self.assertRaises(SyntaxError):
+ warnings.simplefilter('error', DeprecationWarning)
+ compile_command(r"'\e'", symbol='exec')
+
+ def test_incomplete_warning(self):
+ with warnings.catch_warnings(record=True) as w:
+ warnings.simplefilter('always')
+ self.assertIncomplete("'\\e' + (")
+ self.assertEqual(w, [])
+
+ def test_invalid_warning(self):
+ with warnings.catch_warnings(record=True) as w:
+ warnings.simplefilter('always')
+ self.assertInvalid("'\\e' 1")
+ self.assertEqual(len(w), 1)
+ self.assertEqual(w[0].category, DeprecationWarning)
+ self.assertRegex(str(w[0].message), 'invalid escape sequence')
+ self.assertEqual(w[0].filename, ''
-class Cmp:
- def __init__(self,arg):
- self.arg = arg
+class ComparisonSimpleTest(unittest.TestCase):
+ """Test equality and order comparisons for some simple cases."""
- def __repr__(self):
- return '' % self.arg
+ class Empty:
+ def __repr__(self):
+ return ''
- def __eq__(self, other):
- return self.arg == other
+ class Cmp:
+ def __init__(self, arg):
+ self.arg = arg
+
+ def __repr__(self):
+ return '' % self.arg
+
+ def __eq__(self, other):
+ return self.arg == other
-class ComparisonTest(unittest.TestCase):
set1 = [2, 2.0, 2, 2+0j, Cmp(2.0)]
set2 = [[1], (3,), None, Empty()]
candidates = set1 + set2
@@ -32,16 +38,15 @@ def test_id_comparisons(self):
# Ensure default comparison compares id() of args
L = []
for i in range(10):
- L.insert(len(L)//2, Empty())
+ L.insert(len(L)//2, self.Empty())
for a in L:
for b in L:
- self.assertEqual(a == b, id(a) == id(b),
- 'a=%r, b=%r' % (a, b))
+ self.assertEqual(a == b, a is b, 'a=%r, b=%r' % (a, b))
def test_ne_defaults_to_not_eq(self):
- a = Cmp(1)
- b = Cmp(1)
- c = Cmp(2)
+ a = self.Cmp(1)
+ b = self.Cmp(1)
+ c = self.Cmp(2)
self.assertIs(a == b, True)
self.assertIs(a != b, False)
self.assertIs(a != c, True)
@@ -114,5 +119,392 @@ def test_issue_1393(self):
self.assertEqual(ALWAYS_EQ, y)
+class ComparisonFullTest(unittest.TestCase):
+ """Test equality and ordering comparisons for built-in types and
+ user-defined classes that implement relevant combinations of rich
+ comparison methods.
+ """
+
+ class CompBase:
+ """Base class for classes with rich comparison methods.
+
+ The "x" attribute should be set to an underlying value to compare.
+
+ Derived classes have a "meth" tuple attribute listing names of
+ comparison methods implemented. See assert_total_order().
+ """
+
+ # Class without any rich comparison methods.
+ class CompNone(CompBase):
+ meth = ()
+
+ # Classes with all combinations of value-based equality comparison methods.
+ class CompEq(CompBase):
+ meth = ("eq",)
+ def __eq__(self, other):
+ return self.x == other.x
+
+ class CompNe(CompBase):
+ meth = ("ne",)
+ def __ne__(self, other):
+ return self.x != other.x
+
+ class CompEqNe(CompBase):
+ meth = ("eq", "ne")
+ def __eq__(self, other):
+ return self.x == other.x
+ def __ne__(self, other):
+ return self.x != other.x
+
+ # Classes with all combinations of value-based less/greater-than order
+ # comparison methods.
+ class CompLt(CompBase):
+ meth = ("lt",)
+ def __lt__(self, other):
+ return self.x < other.x
+
+ class CompGt(CompBase):
+ meth = ("gt",)
+ def __gt__(self, other):
+ return self.x > other.x
+
+ class CompLtGt(CompBase):
+ meth = ("lt", "gt")
+ def __lt__(self, other):
+ return self.x < other.x
+ def __gt__(self, other):
+ return self.x > other.x
+
+ # Classes with all combinations of value-based less/greater-or-equal-than
+ # order comparison methods
+ class CompLe(CompBase):
+ meth = ("le",)
+ def __le__(self, other):
+ return self.x <= other.x
+
+ class CompGe(CompBase):
+ meth = ("ge",)
+ def __ge__(self, other):
+ return self.x >= other.x
+
+ class CompLeGe(CompBase):
+ meth = ("le", "ge")
+ def __le__(self, other):
+ return self.x <= other.x
+ def __ge__(self, other):
+ return self.x >= other.x
+
+ # It should be sufficient to combine the comparison methods only within
+ # each group.
+ all_comp_classes = (
+ CompNone,
+ CompEq, CompNe, CompEqNe, # equal group
+ CompLt, CompGt, CompLtGt, # less/greater-than group
+ CompLe, CompGe, CompLeGe) # less/greater-or-equal group
+
+ def create_sorted_instances(self, class_, values):
+ """Create objects of type `class_` and return them in a list.
+
+ `values` is a list of values that determines the value of data
+ attribute `x` of each object.
+
+ Objects in the returned list are sorted by their identity. They
+ assigned values in `values` list order. By assign decreasing
+ values to objects with increasing identities, testcases can assert
+ that order comparison is performed by value and not by identity.
+ """
+
+ instances = [class_() for __ in range(len(values))]
+ instances.sort(key=id)
+ # Assign the provided values to the instances.
+ for inst, value in zip(instances, values):
+ inst.x = value
+ return instances
+
+ def assert_equality_only(self, a, b, equal):
+ """Assert equality result and that ordering is not implemented.
+
+ a, b: Instances to be tested (of same or different type).
+ equal: Boolean indicating the expected equality comparison results.
+ """
+ self.assertEqual(a == b, equal)
+ self.assertEqual(b == a, equal)
+ self.assertEqual(a != b, not equal)
+ self.assertEqual(b != a, not equal)
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ a < b
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ a <= b
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ a > b
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ a >= b
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ b < a
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ b <= a
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ b > a
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ b >= a
+
+ def assert_total_order(self, a, b, comp, a_meth=None, b_meth=None):
+ """Test total ordering comparison of two instances.
+
+ a, b: Instances to be tested (of same or different type).
+
+ comp: -1, 0, or 1 indicates that the expected order comparison
+ result for operations that are supported by the classes is
+ a <, ==, or > b.
+
+ a_meth, b_meth: Either None, indicating that all rich comparison
+ methods are available, aa for builtins, or the tuple (subset)
+ of "eq", "ne", "lt", "le", "gt", and "ge" that are available
+ for the corresponding instance (of a user-defined class).
+ """
+ self.assert_eq_subtest(a, b, comp, a_meth, b_meth)
+ self.assert_ne_subtest(a, b, comp, a_meth, b_meth)
+ self.assert_lt_subtest(a, b, comp, a_meth, b_meth)
+ self.assert_le_subtest(a, b, comp, a_meth, b_meth)
+ self.assert_gt_subtest(a, b, comp, a_meth, b_meth)
+ self.assert_ge_subtest(a, b, comp, a_meth, b_meth)
+
+ # The body of each subtest has form:
+ #
+ # if value-based comparison methods:
+ # expect what the testcase defined for a op b and b rop a;
+ # else: no value-based comparison
+ # expect default behavior of object for a op b and b rop a.
+
+ def assert_eq_subtest(self, a, b, comp, a_meth, b_meth):
+ if a_meth is None or "eq" in a_meth or "eq" in b_meth:
+ self.assertEqual(a == b, comp == 0)
+ self.assertEqual(b == a, comp == 0)
+ else:
+ self.assertEqual(a == b, a is b)
+ self.assertEqual(b == a, a is b)
+
+ def assert_ne_subtest(self, a, b, comp, a_meth, b_meth):
+ if a_meth is None or not {"ne", "eq"}.isdisjoint(a_meth + b_meth):
+ self.assertEqual(a != b, comp != 0)
+ self.assertEqual(b != a, comp != 0)
+ else:
+ self.assertEqual(a != b, a is not b)
+ self.assertEqual(b != a, a is not b)
+
+ def assert_lt_subtest(self, a, b, comp, a_meth, b_meth):
+ if a_meth is None or "lt" in a_meth or "gt" in b_meth:
+ self.assertEqual(a < b, comp < 0)
+ self.assertEqual(b > a, comp < 0)
+ else:
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ a < b
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ b > a
+
+ def assert_le_subtest(self, a, b, comp, a_meth, b_meth):
+ if a_meth is None or "le" in a_meth or "ge" in b_meth:
+ self.assertEqual(a <= b, comp <= 0)
+ self.assertEqual(b >= a, comp <= 0)
+ else:
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ a <= b
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ b >= a
+
+ def assert_gt_subtest(self, a, b, comp, a_meth, b_meth):
+ if a_meth is None or "gt" in a_meth or "lt" in b_meth:
+ self.assertEqual(a > b, comp > 0)
+ self.assertEqual(b < a, comp > 0)
+ else:
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ a > b
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ b < a
+
+ def assert_ge_subtest(self, a, b, comp, a_meth, b_meth):
+ if a_meth is None or "ge" in a_meth or "le" in b_meth:
+ self.assertEqual(a >= b, comp >= 0)
+ self.assertEqual(b <= a, comp >= 0)
+ else:
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ a >= b
+ with self.assertRaisesRegex(TypeError, "not supported"):
+ b <= a
+
+ def test_objects(self):
+ """Compare instances of type 'object'."""
+ a = object()
+ b = object()
+ self.assert_equality_only(a, a, True)
+ self.assert_equality_only(a, b, False)
+
+ def test_comp_classes_same(self):
+ """Compare same-class instances with comparison methods."""
+
+ for cls in self.all_comp_classes:
+ with self.subTest(cls):
+ instances = self.create_sorted_instances(cls, (1, 2, 1))
+
+ # Same object.
+ self.assert_total_order(instances[0], instances[0], 0,
+ cls.meth, cls.meth)
+
+ # Different objects, same value.
+ self.assert_total_order(instances[0], instances[2], 0,
+ cls.meth, cls.meth)
+
+ # Different objects, value ascending for ascending identities.
+ self.assert_total_order(instances[0], instances[1], -1,
+ cls.meth, cls.meth)
+
+ # different objects, value descending for ascending identities.
+ # This is the interesting case to assert that order comparison
+ # is performed based on the value and not based on the identity.
+ self.assert_total_order(instances[1], instances[2], +1,
+ cls.meth, cls.meth)
+
+ def test_comp_classes_different(self):
+ """Compare different-class instances with comparison methods."""
+
+ for cls_a in self.all_comp_classes:
+ for cls_b in self.all_comp_classes:
+ with self.subTest(a=cls_a, b=cls_b):
+ a1 = cls_a()
+ a1.x = 1
+ b1 = cls_b()
+ b1.x = 1
+ b2 = cls_b()
+ b2.x = 2
+
+ self.assert_total_order(
+ a1, b1, 0, cls_a.meth, cls_b.meth)
+ self.assert_total_order(
+ a1, b2, -1, cls_a.meth, cls_b.meth)
+
+ def test_str_subclass(self):
+ """Compare instances of str and a subclass."""
+ class StrSubclass(str):
+ pass
+
+ s1 = str("a")
+ s2 = str("b")
+ c1 = StrSubclass("a")
+ c2 = StrSubclass("b")
+ c3 = StrSubclass("b")
+
+ self.assert_total_order(s1, s1, 0)
+ self.assert_total_order(s1, s2, -1)
+ self.assert_total_order(c1, c1, 0)
+ self.assert_total_order(c1, c2, -1)
+ self.assert_total_order(c2, c3, 0)
+
+ self.assert_total_order(s1, c2, -1)
+ self.assert_total_order(s2, c3, 0)
+ self.assert_total_order(c1, s2, -1)
+ self.assert_total_order(c2, s2, 0)
+
+ def test_numbers(self):
+ """Compare number types."""
+
+ # Same types.
+ i1 = 1001
+ i2 = 1002
+ self.assert_total_order(i1, i1, 0)
+ self.assert_total_order(i1, i2, -1)
+
+ f1 = 1001.0
+ f2 = 1001.1
+ self.assert_total_order(f1, f1, 0)
+ self.assert_total_order(f1, f2, -1)
+
+ q1 = Fraction(2002, 2)
+ q2 = Fraction(2003, 2)
+ self.assert_total_order(q1, q1, 0)
+ self.assert_total_order(q1, q2, -1)
+
+ d1 = Decimal('1001.0')
+ d2 = Decimal('1001.1')
+ self.assert_total_order(d1, d1, 0)
+ self.assert_total_order(d1, d2, -1)
+
+ c1 = 1001+0j
+ c2 = 1001+1j
+ self.assert_equality_only(c1, c1, True)
+ self.assert_equality_only(c1, c2, False)
+
+
+ # Mixing types.
+ for n1, n2 in ((i1,f1), (i1,q1), (i1,d1), (f1,q1), (f1,d1), (q1,d1)):
+ self.assert_total_order(n1, n2, 0)
+ for n1 in (i1, f1, q1, d1):
+ self.assert_equality_only(n1, c1, True)
+
+ def test_sequences(self):
+ """Compare list, tuple, and range."""
+ l1 = [1, 2]
+ l2 = [2, 3]
+ self.assert_total_order(l1, l1, 0)
+ self.assert_total_order(l1, l2, -1)
+
+ t1 = (1, 2)
+ t2 = (2, 3)
+ self.assert_total_order(t1, t1, 0)
+ self.assert_total_order(t1, t2, -1)
+
+ r1 = range(1, 2)
+ r2 = range(2, 2)
+ self.assert_equality_only(r1, r1, True)
+ self.assert_equality_only(r1, r2, False)
+
+ self.assert_equality_only(t1, l1, False)
+ self.assert_equality_only(l1, r1, False)
+ self.assert_equality_only(r1, t1, False)
+
+ def test_bytes(self):
+ """Compare bytes and bytearray."""
+ bs1 = b'a1'
+ bs2 = b'b2'
+ self.assert_total_order(bs1, bs1, 0)
+ self.assert_total_order(bs1, bs2, -1)
+
+ ba1 = bytearray(b'a1')
+ ba2 = bytearray(b'b2')
+ self.assert_total_order(ba1, ba1, 0)
+ self.assert_total_order(ba1, ba2, -1)
+
+ self.assert_total_order(bs1, ba1, 0)
+ self.assert_total_order(bs1, ba2, -1)
+ self.assert_total_order(ba1, bs1, 0)
+ self.assert_total_order(ba1, bs2, -1)
+
+ def test_sets(self):
+ """Compare set and frozenset."""
+ s1 = {1, 2}
+ s2 = {1, 2, 3}
+ self.assert_total_order(s1, s1, 0)
+ self.assert_total_order(s1, s2, -1)
+
+ f1 = frozenset(s1)
+ f2 = frozenset(s2)
+ self.assert_total_order(f1, f1, 0)
+ self.assert_total_order(f1, f2, -1)
+
+ self.assert_total_order(s1, f1, 0)
+ self.assert_total_order(s1, f2, -1)
+ self.assert_total_order(f1, s1, 0)
+ self.assert_total_order(f1, s2, -1)
+
+ def test_mappings(self):
+ """ Compare dict.
+ """
+ d1 = {1: "a", 2: "b"}
+ d2 = {2: "b", 3: "c"}
+ d3 = {3: "c", 2: "b"}
+ self.assert_equality_only(d1, d1, True)
+ self.assert_equality_only(d1, d2, False)
+ self.assert_equality_only(d2, d3, True)
+
+
if __name__ == '__main__':
unittest.main()
diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 5a9c618786f4e2..c756d43a3cf3b8 100644
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -109,7 +109,9 @@ def __getitem__(self, key):
self.assertEqual(d['z'], 12)
def test_extended_arg(self):
- longexpr = 'x = x or ' + '-x' * 2500
+ # default: 1000 * 2.5 = 2500 repetitions
+ repeat = int(sys.getrecursionlimit() * 2.5)
+ longexpr = 'x = x or ' + '-x' * repeat
g = {}
code = '''
def f(x):
@@ -159,7 +161,7 @@ def test_leading_newlines(self):
co = compile(s256, 'fn', 'exec')
self.assertEqual(co.co_firstlineno, 1)
lines = list(co.co_lines())
- self.assertEqual(lines[0][2], None)
+ self.assertEqual(lines[0][2], 0)
self.assertEqual(lines[1][2], 257)
def test_literals_with_leading_zeroes(self):
@@ -195,6 +197,19 @@ def test_literals_with_leading_zeroes(self):
self.assertEqual(eval("0o777"), 511)
self.assertEqual(eval("-0o0000010"), -8)
+ def test_int_literals_too_long(self):
+ n = 3000
+ source = f"a = 1\nb = 2\nc = {'3'*n}\nd = 4"
+ with support.adjust_int_max_str_digits(n):
+ compile(source, "", "exec") # no errors.
+ with support.adjust_int_max_str_digits(n-1):
+ with self.assertRaises(SyntaxError) as err_ctx:
+ compile(source, "", "exec")
+ exc = err_ctx.exception
+ self.assertEqual(exc.lineno, 3)
+ self.assertIn('Exceeds the limit ', str(exc))
+ self.assertIn(' Consider hexadecimal ', str(exc))
+
def test_unary_minus(self):
# Verify treatment of unary minus on negative numbers SF bug #660455
if sys.maxsize == 2147483647:
@@ -527,7 +542,7 @@ def test_particularly_evil_undecodable(self):
with open(fn, "wb") as fp:
fp.write(src)
res = script_helper.run_python_until_end(fn)[0]
- self.assertIn(b"Non-UTF-8", res.err)
+ self.assertIn(b"source code cannot contain null bytes", res.err)
def test_yet_more_evil_still_undecodable(self):
# Issue #25388
@@ -537,7 +552,7 @@ def test_yet_more_evil_still_undecodable(self):
with open(fn, "wb") as fp:
fp.write(src)
res = script_helper.run_python_until_end(fn)[0]
- self.assertIn(b"Non-UTF-8", res.err)
+ self.assertIn(b"source code cannot contain null bytes", res.err)
@support.cpython_only
def test_compiler_recursion_limit(self):
@@ -573,9 +588,9 @@ def check_limit(prefix, repeated, mode="single"):
def test_null_terminated(self):
# The source code is null-terminated internally, but bytes-like
# objects are accepted, which could be not terminated.
- with self.assertRaisesRegex(ValueError, "cannot contain null"):
+ with self.assertRaisesRegex(SyntaxError, "cannot contain null"):
compile("123\x00", "", "eval")
- with self.assertRaisesRegex(ValueError, "cannot contain null"):
+ with self.assertRaisesRegex(SyntaxError, "cannot contain null"):
compile(memoryview(b"123\x00"), "", "eval")
code = compile(memoryview(b"123\x00")[1:-1], "", "eval")
self.assertEqual(eval(code), 23)
@@ -611,7 +626,7 @@ def check_same_constant(const):
exec(code, ns)
f1 = ns['f1']
f2 = ns['f2']
- self.assertIs(f1.__code__, f2.__code__)
+ self.assertIs(f1.__code__.co_consts, f2.__code__.co_consts)
self.check_constant(f1, const)
self.assertEqual(repr(f1()), repr(const))
@@ -624,7 +639,7 @@ def check_same_constant(const):
# Note: "lambda: ..." emits "LOAD_CONST Ellipsis",
# whereas "lambda: Ellipsis" emits "LOAD_GLOBAL Ellipsis"
f1, f2 = lambda: ..., lambda: ...
- self.assertIs(f1.__code__, f2.__code__)
+ self.assertIs(f1.__code__.co_consts, f2.__code__.co_consts)
self.check_constant(f1, Ellipsis)
self.assertEqual(repr(f1()), repr(Ellipsis))
@@ -639,7 +654,7 @@ def check_same_constant(const):
# {0} is converted to a constant frozenset({0}) by the peephole
# optimizer
f1, f2 = lambda x: x in {0}, lambda x: x in {0}
- self.assertIs(f1.__code__, f2.__code__)
+ self.assertIs(f1.__code__.co_consts, f2.__code__.co_consts)
self.check_constant(f1, frozenset({0}))
self.assertTrue(f1(0))
@@ -1024,6 +1039,50 @@ def while_not_chained(a, b, c):
for instr in dis.Bytecode(while_not_chained):
self.assertNotEqual(instr.opname, "EXTENDED_ARG")
+ def test_compare_positions(self):
+ for opname, op in [
+ ("COMPARE_OP", "<"),
+ ("COMPARE_OP", "<="),
+ ("COMPARE_OP", ">"),
+ ("COMPARE_OP", ">="),
+ ("CONTAINS_OP", "in"),
+ ("CONTAINS_OP", "not in"),
+ ("IS_OP", "is"),
+ ("IS_OP", "is not"),
+ ]:
+ expr = f'a {op} b {op} c'
+ expected_positions = 2 * [(2, 2, 0, len(expr))]
+ for source in [
+ f"\\\n{expr}", f'if \\\n{expr}: x', f"x if \\\n{expr} else y"
+ ]:
+ code = compile(source, "", "exec")
+ actual_positions = [
+ instruction.positions
+ for instruction in dis.get_instructions(code)
+ if instruction.opname == opname
+ ]
+ with self.subTest(source):
+ self.assertEqual(actual_positions, expected_positions)
+
+ def test_apply_static_swaps(self):
+ def f(x, y):
+ a, a = x, y
+ return a
+ self.assertEqual(f("x", "y"), "y")
+
+ def test_apply_static_swaps_2(self):
+ def f(x, y, z):
+ a, b, a = x, y, z
+ return a
+ self.assertEqual(f("x", "y", "z"), "z")
+
+ def test_apply_static_swaps_3(self):
+ def f(x, y, z):
+ a, a, b = x, y, z
+ return a
+ self.assertEqual(f("x", "y", "z"), "y")
+
+
@requires_debug_ranges()
class TestSourcePositions(unittest.TestCase):
# Ensure that compiled code snippets have correct line and column numbers
@@ -1052,6 +1111,8 @@ def generic_visit(self, node):
# Check against the positions in the code object.
for (line, end_line, col, end_col) in code.co_positions():
+ if line == 0:
+ continue # This is an artificial module-start line
# If the offset is not None (indicating missing data), ensure that
# it was part of one of the AST nodes.
if line is not None:
@@ -1141,6 +1202,146 @@ def test_complex_single_line_expression(self):
self.assertOpcodeSourcePositionIs(compiled_code, 'BINARY_OP',
line=1, end_line=1, column=0, end_column=27, occurrence=4)
+ def test_multiline_assert_rewritten_as_method_call(self):
+ # GH-94694: Don't crash if pytest rewrites a multiline assert as a
+ # method call with the same location information:
+ tree = ast.parse("assert (\n42\n)")
+ old_node = tree.body[0]
+ new_node = ast.Expr(
+ ast.Call(
+ ast.Attribute(
+ ast.Name("spam", ast.Load()),
+ "eggs",
+ ast.Load(),
+ ),
+ [],
+ [],
+ )
+ )
+ ast.copy_location(new_node, old_node)
+ ast.fix_missing_locations(new_node)
+ tree.body[0] = new_node
+ compile(tree, "", "exec")
+
+ def test_push_null_load_global_positions(self):
+ source_template = """
+ import abc, dis
+ import ast as art
+
+ abc = None
+ dix = dis
+ ast = art
+
+ def f():
+ {}
+ """
+ for body in [
+ " abc.a()",
+ " art.a()",
+ " ast.a()",
+ " dis.a()",
+ " dix.a()",
+ " abc[...]()",
+ " art()()",
+ " (ast or ...)()",
+ " [dis]()",
+ " (dix + ...)()",
+ ]:
+ with self.subTest(body):
+ namespace = {}
+ source = textwrap.dedent(source_template.format(body))
+ exec(source, namespace)
+ code = namespace["f"].__code__
+ self.assertOpcodeSourcePositionIs(
+ code,
+ "LOAD_GLOBAL",
+ line=10,
+ end_line=10,
+ column=4,
+ end_column=7,
+ )
+
+ def test_attribute_augassign(self):
+ source = "(\n lhs \n . \n rhs \n ) += 42"
+ code = compile(source, "", "exec")
+ self.assertOpcodeSourcePositionIs(
+ code, "LOAD_ATTR", line=4, end_line=4, column=5, end_column=8
+ )
+ self.assertOpcodeSourcePositionIs(
+ code, "STORE_ATTR", line=4, end_line=4, column=5, end_column=8
+ )
+
+ def test_attribute_del(self):
+ source = "del (\n lhs \n . \n rhs \n )"
+ code = compile(source, "", "exec")
+ self.assertOpcodeSourcePositionIs(
+ code, "DELETE_ATTR", line=4, end_line=4, column=5, end_column=8
+ )
+
+ def test_attribute_load(self):
+ source = "(\n lhs \n . \n rhs \n )"
+ code = compile(source, "", "exec")
+ self.assertOpcodeSourcePositionIs(
+ code, "LOAD_ATTR", line=4, end_line=4, column=5, end_column=8
+ )
+
+ def test_attribute_store(self):
+ source = "(\n lhs \n . \n rhs \n ) = 42"
+ code = compile(source, "", "exec")
+ self.assertOpcodeSourcePositionIs(
+ code, "STORE_ATTR", line=4, end_line=4, column=5, end_column=8
+ )
+
+ def test_method_call(self):
+ source = "(\n lhs \n . \n rhs \n )()"
+ code = compile(source, "", "exec")
+ self.assertOpcodeSourcePositionIs(
+ code, "LOAD_METHOD", line=4, end_line=4, column=5, end_column=8
+ )
+ self.assertOpcodeSourcePositionIs(
+ code, "CALL", line=4, end_line=5, column=5, end_column=10
+ )
+
+ def test_weird_attribute_position_regressions(self):
+ def f():
+ (bar.
+ baz)
+ (bar.
+ baz(
+ ))
+ files().setdefault(
+ 0
+ ).setdefault(
+ 0
+ )
+ for line, end_line, column, end_column in f.__code__.co_positions():
+ self.assertIsNotNone(line)
+ self.assertIsNotNone(end_line)
+ self.assertIsNotNone(column)
+ self.assertIsNotNone(end_column)
+ self.assertLessEqual((line, column), (end_line, end_column))
+
+ @support.cpython_only
+ def test_column_offset_deduplication(self):
+ # GH-95150: Code with different column offsets shouldn't be merged!
+ for source in [
+ "lambda: a",
+ "(a for b in c)",
+ "[a for b in c]",
+ "{a for b in c}",
+ "{a: b for c in d}",
+ ]:
+ with self.subTest(source):
+ code = compile(f"{source}, {source}", "", "eval")
+ self.assertEqual(len(code.co_consts), 2)
+ self.assertIsInstance(code.co_consts[0], types.CodeType)
+ self.assertIsInstance(code.co_consts[1], types.CodeType)
+ self.assertNotEqual(code.co_consts[0], code.co_consts[1])
+ self.assertNotEqual(
+ list(code.co_consts[0].co_positions()),
+ list(code.co_consts[1].co_positions()),
+ )
+
class TestExpressionStackSize(unittest.TestCase):
# These tests check that the computed stack size for a code object
@@ -1205,6 +1406,19 @@ def test_func_and(self):
code += " x and x\n" * self.N
self.check_stack_size(code)
+ def test_stack_3050(self):
+ M = 3050
+ code = "x," * M + "=t"
+ # This raised on 3.10.0 to 3.10.5
+ compile(code, "", "single")
+
+ def test_stack_3050_2(self):
+ M = 3050
+ args = ", ".join(f"arg{i}:type{i}" for i in range(M))
+ code = f"def f({args}):\n pass"
+ # This raised on 3.10.0 to 3.10.5
+ compile(code, "", "single")
+
class TestStackSizeStability(unittest.TestCase):
# Check that repeating certain snippets doesn't increase the stack size
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
index 1a9fc973c3aa12..05154c8f1c6057 100644
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -167,6 +167,20 @@ def test_compile_file_pathlike_ddir(self):
quiet=2))
self.assertTrue(os.path.isfile(self.bc_path))
+ def test_compile_file_pathlike_stripdir(self):
+ self.assertFalse(os.path.isfile(self.bc_path))
+ self.assertTrue(compileall.compile_file(pathlib.Path(self.source_path),
+ stripdir=pathlib.Path('stripdir_path'),
+ quiet=2))
+ self.assertTrue(os.path.isfile(self.bc_path))
+
+ def test_compile_file_pathlike_prependdir(self):
+ self.assertFalse(os.path.isfile(self.bc_path))
+ self.assertTrue(compileall.compile_file(pathlib.Path(self.source_path),
+ prependdir=pathlib.Path('prependdir_path'),
+ quiet=2))
+ self.assertTrue(os.path.isfile(self.bc_path))
+
def test_compile_path(self):
with test.test_importlib.util.import_state(path=[self.directory]):
self.assertTrue(compileall.compile_path(quiet=2))
@@ -219,6 +233,20 @@ def test_compile_dir_pathlike(self):
self.assertRegex(line, r'Listing ([^WindowsPath|PosixPath].*)')
self.assertTrue(os.path.isfile(self.bc_path))
+ def test_compile_dir_pathlike_stripdir(self):
+ self.assertFalse(os.path.isfile(self.bc_path))
+ self.assertTrue(compileall.compile_dir(pathlib.Path(self.directory),
+ stripdir=pathlib.Path('stripdir_path'),
+ quiet=2))
+ self.assertTrue(os.path.isfile(self.bc_path))
+
+ def test_compile_dir_pathlike_prependdir(self):
+ self.assertFalse(os.path.isfile(self.bc_path))
+ self.assertTrue(compileall.compile_dir(pathlib.Path(self.directory),
+ prependdir=pathlib.Path('prependdir_path'),
+ quiet=2))
+ self.assertTrue(os.path.isfile(self.bc_path))
+
@skipUnless(_have_multiprocessing, "requires multiprocessing")
@mock.patch('concurrent.futures.ProcessPoolExecutor')
def test_compile_pool_called(self, pool_mock):
@@ -434,6 +462,9 @@ class CompileallTestsWithoutSourceEpoch(CompileallTestsBase,
pass
+# WASI does not have a temp directory and uses cwd instead. The cwd contains
+# non-ASCII chars, so _walk_dir() fails to encode self.directory.
+@unittest.skipIf(support.is_wasi, "tempdir is not encodable on WASI")
class EncodingTest(unittest.TestCase):
"""Issue 6716: compileall should escape source code when printing errors
to stdout."""
diff --git a/Lib/test/test_complex.py b/Lib/test/test_complex.py
index e046577b935e92..51ba151505fb54 100644
--- a/Lib/test/test_complex.py
+++ b/Lib/test/test_complex.py
@@ -306,15 +306,10 @@ def test_conjugate(self):
self.assertClose(complex(5.3, 9.8).conjugate(), 5.3-9.8j)
def test_constructor(self):
- class OS:
+ class NS:
def __init__(self, value): self.value = value
def __complex__(self): return self.value
- class NS(object):
- def __init__(self, value): self.value = value
- def __complex__(self): return self.value
- self.assertEqual(complex(OS(1+10j)), 1+10j)
self.assertEqual(complex(NS(1+10j)), 1+10j)
- self.assertRaises(TypeError, complex, OS(None))
self.assertRaises(TypeError, complex, NS(None))
self.assertRaises(TypeError, complex, {})
self.assertRaises(TypeError, complex, NS(1.5))
diff --git a/Lib/test/test_concurrent_futures.py b/Lib/test/test_concurrent_futures.py
index 4363e90b8bbabb..1bb6156a18ddbf 100644
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@ -14,6 +14,7 @@
from logging.handlers import QueueHandler
import os
import queue
+import signal
import sys
import threading
import time
@@ -396,6 +397,33 @@ def test_hang_gh83386(self):
self.assertFalse(err)
self.assertEqual(out.strip(), b"apple")
+ def test_hang_gh94440(self):
+ """shutdown(wait=True) doesn't hang when a future was submitted and
+ quickly canceled right before shutdown.
+
+ See https://github.com/python/cpython/issues/94440.
+ """
+ if not hasattr(signal, 'alarm'):
+ raise unittest.SkipTest(
+ "Tested platform does not support the alarm signal")
+
+ def timeout(_signum, _frame):
+ raise RuntimeError("timed out waiting for shutdown")
+
+ kwargs = {}
+ if getattr(self, 'ctx', None):
+ kwargs['mp_context'] = self.get_context()
+ executor = self.executor_type(max_workers=1, **kwargs)
+ executor.submit(int).result()
+ old_handler = signal.signal(signal.SIGALRM, timeout)
+ try:
+ signal.alarm(5)
+ executor.submit(int).cancel()
+ executor.shutdown(wait=True)
+ finally:
+ signal.alarm(0)
+ signal.signal(signal.SIGALRM, old_handler)
+
class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase):
def test_threads_terminate(self):
@@ -484,7 +512,7 @@ def test_cancel_futures_wait_false(self):
t = ThreadPoolExecutor()
t.submit(sleep_and_print, .1, "apple")
t.shutdown(wait=False, cancel_futures=True)
- """.format(executor_type=self.executor_type.__name__))
+ """)
# Errors in atexit hooks don't change the process exit code, check
# stderr manually.
self.assertFalse(err)
@@ -497,10 +525,16 @@ def acquire_lock(lock):
lock.acquire()
mp_context = self.get_context()
+ if mp_context.get_start_method(allow_none=False) == "fork":
+ # fork pre-spawns, not on demand.
+ expected_num_processes = self.worker_count
+ else:
+ expected_num_processes = 3
+
sem = mp_context.Semaphore(0)
for _ in range(3):
self.executor.submit(acquire_lock, sem)
- self.assertEqual(len(self.executor._processes), 3)
+ self.assertEqual(len(self.executor._processes), expected_num_processes)
for _ in range(3):
sem.release()
processes = self.executor._processes
@@ -925,6 +959,33 @@ def submit(pool):
with futures.ProcessPoolExecutor(1, mp_context=mp.get_context('fork')) as workers:
workers.submit(tuple)
+ def test_executor_map_current_future_cancel(self):
+ stop_event = threading.Event()
+ log = []
+
+ def log_n_wait(ident):
+ log.append(f"{ident=} started")
+ try:
+ stop_event.wait()
+ finally:
+ log.append(f"{ident=} stopped")
+
+ with self.executor_type(max_workers=1) as pool:
+ # submit work to saturate the pool
+ fut = pool.submit(log_n_wait, ident="first")
+ try:
+ with contextlib.closing(
+ pool.map(log_n_wait, ["second", "third"], timeout=0)
+ ) as gen:
+ with self.assertRaises(TimeoutError):
+ next(gen)
+ finally:
+ stop_event.set()
+ fut.result()
+ # ident='second' is cancelled as a result of raising a TimeoutError
+ # ident='third' is cancelled because it remained in the collection of futures
+ self.assertListEqual(log, ["ident='first' started", "ident='first' stopped"])
+
class ProcessPoolExecutorTest(ExecutorTest):
@@ -1021,6 +1082,8 @@ def test_saturation(self):
def test_idle_process_reuse_one(self):
executor = self.executor
assert executor._max_workers >= 4
+ if self.get_context().get_start_method(allow_none=False) == "fork":
+ raise unittest.SkipTest("Incompatible with the fork start method.")
executor.submit(mul, 21, 2).result()
executor.submit(mul, 6, 7).result()
executor.submit(mul, 3, 14).result()
@@ -1029,6 +1092,8 @@ def test_idle_process_reuse_one(self):
def test_idle_process_reuse_multiple(self):
executor = self.executor
assert executor._max_workers <= 5
+ if self.get_context().get_start_method(allow_none=False) == "fork":
+ raise unittest.SkipTest("Incompatible with the fork start method.")
executor.submit(mul, 12, 7).result()
executor.submit(mul, 33, 25)
executor.submit(mul, 25, 26).result()
diff --git a/Lib/test/test_context.py b/Lib/test/test_context.py
index 3132cea668cb1b..b1aece4f5c9c49 100644
--- a/Lib/test/test_context.py
+++ b/Lib/test/test_context.py
@@ -535,6 +535,41 @@ def test_hamt_collision_1(self):
self.assertEqual(len(h4), 2)
self.assertEqual(len(h5), 3)
+ def test_hamt_collision_3(self):
+ # Test that iteration works with the deepest tree possible.
+ # https://github.com/python/cpython/issues/93065
+
+ C = HashKey(0b10000000_00000000_00000000_00000000, 'C')
+ D = HashKey(0b10000000_00000000_00000000_00000000, 'D')
+
+ E = HashKey(0b00000000_00000000_00000000_00000000, 'E')
+
+ h = hamt()
+ h = h.set(C, 'C')
+ h = h.set(D, 'D')
+ h = h.set(E, 'E')
+
+ # BitmapNode(size=2 count=1 bitmap=0b1):
+ # NULL:
+ # BitmapNode(size=2 count=1 bitmap=0b1):
+ # NULL:
+ # BitmapNode(size=2 count=1 bitmap=0b1):
+ # NULL:
+ # BitmapNode(size=2 count=1 bitmap=0b1):
+ # NULL:
+ # BitmapNode(size=2 count=1 bitmap=0b1):
+ # NULL:
+ # BitmapNode(size=2 count=1 bitmap=0b1):
+ # NULL:
+ # BitmapNode(size=4 count=2 bitmap=0b101):
+ # : 'E'
+ # NULL:
+ # CollisionNode(size=4 id=0x107a24520):
+ # : 'C'
+ # : 'D'
+
+ self.assertEqual({k.name for k in h.keys()}, {'C', 'D', 'E'})
+
def test_hamt_stress(self):
COLLECTION_SIZE = 7000
TEST_ITERS_EVERY = 647
diff --git a/Lib/test/test_contextlib.py b/Lib/test/test_contextlib.py
index 31f5c74572b630..ec06785b5667a6 100644
--- a/Lib/test/test_contextlib.py
+++ b/Lib/test/test_contextlib.py
@@ -104,15 +104,39 @@ def f():
self.assertEqual(frames[0].line, '1/0')
# Repeat with RuntimeError (which goes through a different code path)
+ class RuntimeErrorSubclass(RuntimeError):
+ pass
+
try:
with f():
- raise NotImplementedError(42)
- except NotImplementedError as e:
+ raise RuntimeErrorSubclass(42)
+ except RuntimeErrorSubclass as e:
frames = traceback.extract_tb(e.__traceback__)
self.assertEqual(len(frames), 1)
self.assertEqual(frames[0].name, 'test_contextmanager_traceback')
- self.assertEqual(frames[0].line, 'raise NotImplementedError(42)')
+ self.assertEqual(frames[0].line, 'raise RuntimeErrorSubclass(42)')
+
+ class StopIterationSubclass(StopIteration):
+ pass
+
+ for stop_exc in (
+ StopIteration('spam'),
+ StopIterationSubclass('spam'),
+ ):
+ with self.subTest(type=type(stop_exc)):
+ try:
+ with f():
+ raise stop_exc
+ except type(stop_exc) as e:
+ self.assertIs(e, stop_exc)
+ frames = traceback.extract_tb(e.__traceback__)
+ else:
+ self.fail(f'{stop_exc} was suppressed')
+
+ self.assertEqual(len(frames), 1)
+ self.assertEqual(frames[0].name, 'test_contextmanager_traceback')
+ self.assertEqual(frames[0].line, 'raise stop_exc')
def test_contextmanager_no_reraise(self):
@contextmanager
diff --git a/Lib/test/test_contextlib_async.py b/Lib/test/test_contextlib_async.py
index 76bd81c7d02ccd..3d43ed0fcab168 100644
--- a/Lib/test/test_contextlib_async.py
+++ b/Lib/test/test_contextlib_async.py
@@ -5,6 +5,7 @@
import functools
from test import support
import unittest
+import traceback
from test.test_contextlib import TestBaseExitStack
@@ -15,15 +16,12 @@ def _async_test(func):
@functools.wraps(func)
def wrapper(*args, **kwargs):
coro = func(*args, **kwargs)
- loop = asyncio.new_event_loop()
- asyncio.set_event_loop(loop)
- try:
- return loop.run_until_complete(coro)
- finally:
- loop.close()
- asyncio.set_event_loop_policy(None)
+ asyncio.run(coro)
return wrapper
+def tearDownModule():
+ asyncio.set_event_loop_policy(None)
+
class TestAbstractAsyncContextManager(unittest.TestCase):
@@ -128,6 +126,62 @@ async def woohoo():
raise ZeroDivisionError()
self.assertEqual(state, [1, 42, 999])
+ @_async_test
+ async def test_contextmanager_traceback(self):
+ @asynccontextmanager
+ async def f():
+ yield
+
+ try:
+ async with f():
+ 1/0
+ except ZeroDivisionError as e:
+ frames = traceback.extract_tb(e.__traceback__)
+
+ self.assertEqual(len(frames), 1)
+ self.assertEqual(frames[0].name, 'test_contextmanager_traceback')
+ self.assertEqual(frames[0].line, '1/0')
+
+ # Repeat with RuntimeError (which goes through a different code path)
+ class RuntimeErrorSubclass(RuntimeError):
+ pass
+
+ try:
+ async with f():
+ raise RuntimeErrorSubclass(42)
+ except RuntimeErrorSubclass as e:
+ frames = traceback.extract_tb(e.__traceback__)
+
+ self.assertEqual(len(frames), 1)
+ self.assertEqual(frames[0].name, 'test_contextmanager_traceback')
+ self.assertEqual(frames[0].line, 'raise RuntimeErrorSubclass(42)')
+
+ class StopIterationSubclass(StopIteration):
+ pass
+
+ class StopAsyncIterationSubclass(StopAsyncIteration):
+ pass
+
+ for stop_exc in (
+ StopIteration('spam'),
+ StopAsyncIteration('ham'),
+ StopIterationSubclass('spam'),
+ StopAsyncIterationSubclass('spam')
+ ):
+ with self.subTest(type=type(stop_exc)):
+ try:
+ async with f():
+ raise stop_exc
+ except type(stop_exc) as e:
+ self.assertIs(e, stop_exc)
+ frames = traceback.extract_tb(e.__traceback__)
+ else:
+ self.fail(f'{stop_exc} was suppressed')
+
+ self.assertEqual(len(frames), 1)
+ self.assertEqual(frames[0].name, 'test_contextmanager_traceback')
+ self.assertEqual(frames[0].line, 'raise stop_exc')
+
@_async_test
async def test_contextmanager_no_reraise(self):
@asynccontextmanager
diff --git a/Lib/test/test_copy.py b/Lib/test/test_copy.py
index f1ca8cb254d188..7b1a927b4e5692 100644
--- a/Lib/test/test_copy.py
+++ b/Lib/test/test_copy.py
@@ -51,6 +51,9 @@ def pickle_C(obj):
self.assertRaises(TypeError, copy.copy, x)
copyreg.pickle(C, pickle_C, C)
y = copy.copy(x)
+ self.assertIsNot(x, y)
+ self.assertEqual(type(y), C)
+ self.assertEqual(y.foo, x.foo)
def test_copy_reduce_ex(self):
class C(object):
@@ -313,6 +316,9 @@ def pickle_C(obj):
self.assertRaises(TypeError, copy.deepcopy, x)
copyreg.pickle(C, pickle_C, C)
y = copy.deepcopy(x)
+ self.assertIsNot(x, y)
+ self.assertEqual(type(y), C)
+ self.assertEqual(y.foo, x.foo)
def test_deepcopy_reduce_ex(self):
class C(object):
@@ -356,8 +362,8 @@ class NewStyle(object):
pass
def f():
pass
- tests = [None, 42, 2**100, 3.14, True, False, 1j,
- "hello", "hello\u1234", f.__code__,
+ tests = [None, ..., NotImplemented, 42, 2**100, 3.14, True, False, 1j,
+ b"bytes", "hello", "hello\u1234", f.__code__,
NewStyle, range(10), Classic, max, property()]
for x in tests:
self.assertIs(copy.deepcopy(x), x)
@@ -678,6 +684,28 @@ def __eq__(self, other):
self.assertIsNot(x, y)
self.assertIsNot(x["foo"], y["foo"])
+ def test_reduce_6tuple(self):
+ def state_setter(*args, **kwargs):
+ self.fail("shouldn't call this")
+ class C:
+ def __reduce__(self):
+ return C, (), self.__dict__, None, None, state_setter
+ x = C()
+ with self.assertRaises(TypeError):
+ copy.copy(x)
+ with self.assertRaises(TypeError):
+ copy.deepcopy(x)
+
+ def test_reduce_6tuple_none(self):
+ class C:
+ def __reduce__(self):
+ return C, (), self.__dict__, None, None, None
+ x = C()
+ with self.assertRaises(TypeError):
+ copy.copy(x)
+ with self.assertRaises(TypeError):
+ copy.deepcopy(x)
+
def test_copy_slots(self):
class C(object):
__slots__ = ["foo"]
diff --git a/Lib/test/test_coroutines.py b/Lib/test/test_coroutines.py
index 77944e678c7504..93ddbf6e8976cb 100644
--- a/Lib/test/test_coroutines.py
+++ b/Lib/test/test_coroutines.py
@@ -4,6 +4,7 @@
import pickle
import sys
import types
+import traceback
import unittest
import warnings
from test import support
@@ -1279,7 +1280,7 @@ async def __aexit__(self, *exc):
async def func():
async with CM():
- assert (1, ) == 1
+ self.assertEqual((1, ), 1)
with self.assertRaises(AssertionError):
run_async(func())
@@ -2206,10 +2207,35 @@ async def f():
gen = f()
with self.assertWarns(RuntimeWarning):
gen.cr_frame.clear()
+ gen.close()
+
+ def test_stack_in_coroutine_throw(self):
+ # Regression test for https://github.com/python/cpython/issues/93592
+ async def a():
+ return await b()
+
+ async def b():
+ return await c()
+
+ @types.coroutine
+ def c():
+ try:
+ # traceback.print_stack()
+ yield len(traceback.extract_stack())
+ except ZeroDivisionError:
+ # traceback.print_stack()
+ yield len(traceback.extract_stack())
+
+ coro = a()
+ len_send = coro.send(None)
+ len_throw = coro.throw(ZeroDivisionError)
+ # before fixing, visible stack from throw would be shorter than from send.
+ self.assertEqual(len_send, len_throw)
@unittest.skipIf(
- support.is_emscripten, "asyncio does not work under Emscripten yet."
+ support.is_emscripten or support.is_wasi,
+ "asyncio does not work under Emscripten/WASI yet."
)
class CoroAsyncIOCompatTest(unittest.TestCase):
@@ -2386,7 +2412,8 @@ class UnawaitedWarningDuringShutdownTest(unittest.TestCase):
def test_unawaited_warning_during_shutdown(self):
code = ("import asyncio\n"
"async def f(): pass\n"
- "asyncio.gather(f())\n")
+ "async def t(): asyncio.gather(f())\n"
+ "asyncio.run(t())\n")
assert_python_ok("-c", code)
code = ("import sys\n"
diff --git a/Lib/test/test_cppext.py b/Lib/test/test_cppext.py
index 337cb08f8c9d8c..465894d24e7dfc 100644
--- a/Lib/test/test_cppext.py
+++ b/Lib/test/test_cppext.py
@@ -1,91 +1,104 @@
# gh-91321: Build a basic C++ test extension to check that the Python C API is
# compatible with C++ and does not emit C++ compiler warnings.
-import contextlib
-import os
+import os.path
import sys
import unittest
-import warnings
+import subprocess
+import sysconfig
from test import support
from test.support import os_helper
-with warnings.catch_warnings():
- warnings.simplefilter('ignore', DeprecationWarning)
- from distutils.core import setup, Extension
- import distutils.sysconfig
-
MS_WINDOWS = (sys.platform == 'win32')
-SOURCE = support.findfile('_testcppext.cpp')
-if not MS_WINDOWS:
- # C++ compiler flags for GCC and clang
- CPPFLAGS = [
- # Python currently targets C++11
- '-std=c++11',
- # gh-91321: The purpose of _testcppext extension is to check that building
- # a C++ extension using the Python C API does not emit C++ compiler
- # warnings
- '-Werror',
- # Warn on old-style cast (C cast) like: (PyObject*)op
- '-Wold-style-cast',
- # Warn when using NULL rather than _Py_NULL in static inline functions
- '-Wzero-as-null-pointer-constant',
- ]
-else:
- # Don't pass any compiler flag to MSVC
- CPPFLAGS = []
+SETUP_TESTCPPEXT = support.findfile('setup_testcppext.py')
@support.requires_subprocess()
class TestCPPExt(unittest.TestCase):
- def build(self):
- cpp_ext = Extension(
- '_testcppext',
- sources=[SOURCE],
- language='c++',
- extra_compile_args=CPPFLAGS)
- capture_stdout = (not support.verbose)
-
- try:
- try:
- if capture_stdout:
- stdout = support.captured_stdout()
- else:
- print()
- stdout = contextlib.nullcontext()
- with (stdout,
- support.swap_attr(sys, 'argv', ['setup.py', 'build_ext', '--verbose'])):
- setup(name="_testcppext", ext_modules=[cpp_ext])
- return
- except:
- if capture_stdout:
- # Show output on error
- print()
- print(stdout.getvalue())
- raise
- except SystemExit:
- self.fail("Build failed")
+ def test_build_cpp11(self):
+ self.check_build(False, '_testcpp11ext')
+
+ def test_build_cpp03(self):
+ self.check_build(True, '_testcpp03ext')
# With MSVC, the linker fails with: cannot open file 'python311.lib'
# https://github.com/python/cpython/pull/32175#issuecomment-1111175897
@unittest.skipIf(MS_WINDOWS, 'test fails on Windows')
- def test_build(self):
- # save/restore os.environ
- def restore_env(old_env):
- os.environ.clear()
- os.environ.update(old_env)
- self.addCleanup(restore_env, dict(os.environ))
-
- def restore_sysconfig_vars(old_config_vars):
- distutils.sysconfig._config_vars.clear()
- distutils.sysconfig._config_vars.update(old_config_vars)
- self.addCleanup(restore_sysconfig_vars,
- dict(distutils.sysconfig._config_vars))
-
+ # Building and running an extension in clang sanitizing mode is not
+ # straightforward
+ @unittest.skipIf(
+ '-fsanitize' in (sysconfig.get_config_var('PY_CFLAGS') or ''),
+ 'test does not work with analyzing builds')
+ # the test uses venv+pip: skip if it's not available
+ @support.requires_venv_with_pip()
+ def check_build(self, std_cpp03, extension_name):
# Build in a temporary directory
with os_helper.temp_cwd():
- self.build()
+ self._check_build(std_cpp03, extension_name)
+
+ def _check_build(self, std_cpp03, extension_name):
+ venv_dir = 'env'
+ verbose = support.verbose
+
+ # Create virtual environment to get setuptools
+ cmd = [sys.executable, '-X', 'dev', '-m', 'venv', venv_dir]
+ if verbose:
+ print()
+ print('Run:', ' '.join(cmd))
+ subprocess.run(cmd, check=True)
+
+ # Get the Python executable of the venv
+ python_exe = 'python'
+ if sys.executable.endswith('.exe'):
+ python_exe += '.exe'
+ if MS_WINDOWS:
+ python = os.path.join(venv_dir, 'Scripts', python_exe)
+ else:
+ python = os.path.join(venv_dir, 'bin', python_exe)
+
+ def run_cmd(operation, cmd):
+ if verbose:
+ print('Run:', ' '.join(cmd))
+ subprocess.run(cmd, check=True)
+ else:
+ proc = subprocess.run(cmd,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ text=True)
+ if proc.returncode:
+ print(proc.stdout, end='')
+ self.fail(
+ f"{operation} failed with exit code {proc.returncode}")
+
+ # Build the C++ extension
+ cmd = [python, '-X', 'dev',
+ SETUP_TESTCPPEXT, 'build_ext', '--verbose']
+ if std_cpp03:
+ cmd.append('-std=c++03')
+ run_cmd('Build', cmd)
+
+ # Install the C++ extension
+ cmd = [python, '-X', 'dev',
+ SETUP_TESTCPPEXT, 'install']
+ run_cmd('Install', cmd)
+
+ # Do a reference run. Until we test that running python
+ # doesn't leak references (gh-94755), run it so one can manually check
+ # -X showrefcount results against this baseline.
+ cmd = [python,
+ '-X', 'dev',
+ '-X', 'showrefcount',
+ '-c', 'pass']
+ run_cmd('Reference run', cmd)
+
+ # Import the C++ extension
+ cmd = [python,
+ '-X', 'dev',
+ '-X', 'showrefcount',
+ '-c', f"import {extension_name}"]
+ run_cmd('Import', cmd)
if __name__ == "__main__":
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
index 95a19dd46cb4ff..05653a26841799 100644
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -10,7 +10,7 @@
import gc
import pickle
from test import support
-from test.support import warnings_helper
+from test.support import warnings_helper, import_helper, check_disallow_instantiation
from itertools import permutations
from textwrap import dedent
from collections import OrderedDict
@@ -362,6 +362,11 @@ def test_read_quoting(self):
self._read_test(['1,@,3,@,5'], [['1', ',3,', '5']], quotechar='@')
self._read_test(['1,\0,3,\0,5'], [['1', ',3,', '5']], quotechar='\0')
+ def test_read_skipinitialspace(self):
+ self._read_test(['no space, space, spaces,\ttab'],
+ [['no space', 'space', 'spaces', '\ttab']],
+ skipinitialspace=True)
+
def test_read_bigfield(self):
# This exercises the buffer realloc functionality and field size
# limits.
@@ -448,6 +453,34 @@ def test_register_kwargs(self):
self.assertEqual(csv.get_dialect(name).delimiter, ';')
self.assertEqual([['X', 'Y', 'Z']], list(csv.reader(['X;Y;Z'], name)))
+ def test_register_kwargs_override(self):
+ class mydialect(csv.Dialect):
+ delimiter = "\t"
+ quotechar = '"'
+ doublequote = True
+ skipinitialspace = False
+ lineterminator = '\r\n'
+ quoting = csv.QUOTE_MINIMAL
+
+ name = 'test_dialect'
+ csv.register_dialect(name, mydialect,
+ delimiter=';',
+ quotechar="'",
+ doublequote=False,
+ skipinitialspace=True,
+ lineterminator='\n',
+ quoting=csv.QUOTE_ALL)
+ self.addCleanup(csv.unregister_dialect, name)
+
+ # Ensure that kwargs do override attributes of a dialect class:
+ dialect = csv.get_dialect(name)
+ self.assertEqual(dialect.delimiter, ';')
+ self.assertEqual(dialect.quotechar, "'")
+ self.assertEqual(dialect.doublequote, False)
+ self.assertEqual(dialect.skipinitialspace, True)
+ self.assertEqual(dialect.lineterminator, '\n')
+ self.assertEqual(dialect.quoting, csv.QUOTE_ALL)
+
def test_incomplete_dialect(self):
class myexceltsv(csv.Dialect):
delimiter = "\t"
@@ -1357,5 +1390,12 @@ def test_subclassable(self):
# issue 44089
class Foo(csv.Error): ...
+ @support.cpython_only
+ def test_disallow_instantiation(self):
+ _csv = import_helper.import_module("_csv")
+ for tp in _csv.Reader, _csv.Writer:
+ with self.subTest(tp=tp):
+ check_disallow_instantiation(self, tp)
+
if __name__ == '__main__':
unittest.main()
diff --git a/Lib/test/test_dataclasses.py b/Lib/test/test_dataclasses.py
index 6a36da104ac89a..4714d0bca86114 100644
--- a/Lib/test/test_dataclasses.py
+++ b/Lib/test/test_dataclasses.py
@@ -5,11 +5,13 @@
from dataclasses import *
import abc
+import io
import pickle
import inspect
import builtins
import types
import weakref
+import traceback
import unittest
from unittest.mock import Mock
from typing import ClassVar, Any, List, Union, Tuple, Dict, Generic, TypeVar, Optional, Protocol
@@ -68,6 +70,24 @@ def test_field_repr(self):
self.assertEqual(repr_output, expected_output)
+ def test_field_recursive_repr(self):
+ rec_field = field()
+ rec_field.type = rec_field
+ rec_field.name = "id"
+ repr_output = repr(rec_field)
+
+ self.assertIn(",type=...,", repr_output)
+
+ def test_recursive_annotation(self):
+ class C:
+ pass
+
+ @dataclass
+ class D:
+ C: C = field()
+
+ self.assertIn(",type=...,", repr(D.__dataclass_fields__["C"]))
+
def test_named_init_params(self):
@dataclass
class C:
@@ -231,6 +251,14 @@ class C:
c = C('foo')
self.assertEqual(c.object, 'foo')
+ def test_field_named_BUILTINS_frozen(self):
+ # gh-96151
+ @dataclass(frozen=True)
+ class C:
+ BUILTINS: int
+ c = C(5)
+ self.assertEqual(c.BUILTINS, 5)
+
def test_field_named_like_builtin(self):
# Attribute names can shadow built-in names
# since code generation is used.
@@ -1474,6 +1502,16 @@ class C: pass
with self.assertRaisesRegex(TypeError, 'dataclass type or instance'):
fields(C())
+ def test_clean_traceback_from_fields_exception(self):
+ stdout = io.StringIO()
+ try:
+ fields(object)
+ except TypeError as exc:
+ traceback.print_exception(exc, file=stdout)
+ printed_traceback = stdout.getvalue()
+ self.assertNotIn("AttributeError", printed_traceback)
+ self.assertNotIn("__dataclass_fields__", printed_traceback)
+
def test_helper_asdict(self):
# Basic tests for asdict(), it should return a new dictionary.
@dataclass
@@ -2186,6 +2224,19 @@ class C:
self.assertDocStrEqual(C.__doc__, "C(x:collections.deque=)")
+ def test_docstring_with_no_signature(self):
+ # See https://github.com/python/cpython/issues/103449
+ class Meta(type):
+ __call__ = dict
+ class Base(metaclass=Meta):
+ pass
+
+ @dataclass
+ class C(Base):
+ pass
+
+ self.assertDocStrEqual(C.__doc__, "C")
+
class TestInit(unittest.TestCase):
def test_base_has_init(self):
@@ -2215,12 +2266,12 @@ class C(B):
self.assertEqual(c.z, 100)
def test_no_init(self):
- dataclass(init=False)
+ @dataclass(init=False)
class C:
i: int = 0
self.assertEqual(C().i, 0)
- dataclass(init=False)
+ @dataclass(init=False)
class C:
i: int = 2
def __init__(self):
@@ -3017,6 +3068,74 @@ def test_frozen_pickle(self):
self.assertIsNot(obj, p)
self.assertEqual(obj, p)
+ @dataclass(frozen=True, slots=True)
+ class FrozenSlotsGetStateClass:
+ foo: str
+ bar: int
+
+ getstate_called: bool = field(default=False, compare=False)
+
+ def __getstate__(self):
+ object.__setattr__(self, 'getstate_called', True)
+ return [self.foo, self.bar]
+
+ @dataclass(frozen=True, slots=True)
+ class FrozenSlotsSetStateClass:
+ foo: str
+ bar: int
+
+ setstate_called: bool = field(default=False, compare=False)
+
+ def __setstate__(self, state):
+ object.__setattr__(self, 'setstate_called', True)
+ object.__setattr__(self, 'foo', state[0])
+ object.__setattr__(self, 'bar', state[1])
+
+ @dataclass(frozen=True, slots=True)
+ class FrozenSlotsAllStateClass:
+ foo: str
+ bar: int
+
+ getstate_called: bool = field(default=False, compare=False)
+ setstate_called: bool = field(default=False, compare=False)
+
+ def __getstate__(self):
+ object.__setattr__(self, 'getstate_called', True)
+ return [self.foo, self.bar]
+
+ def __setstate__(self, state):
+ object.__setattr__(self, 'setstate_called', True)
+ object.__setattr__(self, 'foo', state[0])
+ object.__setattr__(self, 'bar', state[1])
+
+ def test_frozen_slots_pickle_custom_state(self):
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+ with self.subTest(proto=proto):
+ obj = self.FrozenSlotsGetStateClass('a', 1)
+ dumped = pickle.dumps(obj, protocol=proto)
+
+ self.assertTrue(obj.getstate_called)
+ self.assertEqual(obj, pickle.loads(dumped))
+
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+ with self.subTest(proto=proto):
+ obj = self.FrozenSlotsSetStateClass('a', 1)
+ obj2 = pickle.loads(pickle.dumps(obj, protocol=proto))
+
+ self.assertTrue(obj2.setstate_called)
+ self.assertEqual(obj, obj2)
+
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+ with self.subTest(proto=proto):
+ obj = self.FrozenSlotsAllStateClass('a', 1)
+ dumped = pickle.dumps(obj, protocol=proto)
+
+ self.assertTrue(obj.getstate_called)
+
+ obj2 = pickle.loads(dumped)
+ self.assertTrue(obj2.setstate_called)
+ self.assertEqual(obj, obj2)
+
def test_slots_with_default_no_init(self):
# Originally reported in bpo-44649.
@dataclass(slots=True)
@@ -3050,6 +3169,8 @@ class A:
with self.assertRaisesRegex(TypeError,
"cannot create weak reference"):
weakref.ref(a)
+ with self.assertRaises(AttributeError):
+ a.__weakref__
def test_slots_weakref(self):
@dataclass(slots=True, weakref_slot=True)
@@ -3058,7 +3179,9 @@ class A:
self.assertIn("__weakref__", A.__slots__)
a = A(1)
- weakref.ref(a)
+ a_ref = weakref.ref(a)
+
+ self.assertIs(a.__weakref__, a_ref)
def test_slots_weakref_base_str(self):
class Base:
@@ -3109,6 +3232,57 @@ def test_weakref_slot_make_dataclass(self):
"weakref_slot is True but slots is False"):
B = make_dataclass('B', [('a', int),], weakref_slot=True)
+ def test_weakref_slot_subclass_weakref_slot(self):
+ @dataclass(slots=True, weakref_slot=True)
+ class Base:
+ field: int
+
+ # A *can* also specify weakref_slot=True if it wants to (gh-93521)
+ @dataclass(slots=True, weakref_slot=True)
+ class A(Base):
+ ...
+
+ # __weakref__ is in the base class, not A. But an instance of A
+ # is still weakref-able.
+ self.assertIn("__weakref__", Base.__slots__)
+ self.assertNotIn("__weakref__", A.__slots__)
+ a = A(1)
+ a_ref = weakref.ref(a)
+ self.assertIs(a.__weakref__, a_ref)
+
+ def test_weakref_slot_subclass_no_weakref_slot(self):
+ @dataclass(slots=True, weakref_slot=True)
+ class Base:
+ field: int
+
+ @dataclass(slots=True)
+ class A(Base):
+ ...
+
+ # __weakref__ is in the base class, not A. Even though A doesn't
+ # specify weakref_slot, it should still be weakref-able.
+ self.assertIn("__weakref__", Base.__slots__)
+ self.assertNotIn("__weakref__", A.__slots__)
+ a = A(1)
+ a_ref = weakref.ref(a)
+ self.assertIs(a.__weakref__, a_ref)
+
+ def test_weakref_slot_normal_base_weakref_slot(self):
+ class Base:
+ __slots__ = ('__weakref__',)
+
+ @dataclass(slots=True, weakref_slot=True)
+ class A(Base):
+ field: int
+
+ # __weakref__ is in the base class, not A. But an instance of
+ # A is still weakref-able.
+ self.assertIn("__weakref__", Base.__slots__)
+ self.assertNotIn("__weakref__", A.__slots__)
+ a = A(1)
+ a_ref = weakref.ref(a)
+ self.assertIs(a.__weakref__, a_ref)
+
class TestDescriptors(unittest.TestCase):
def test_set_name(self):
@@ -3181,6 +3355,115 @@ class C:
self.assertEqual(D.__set_name__.call_count, 1)
+ def test_init_calls_set(self):
+ class D:
+ pass
+
+ D.__set__ = Mock()
+
+ @dataclass
+ class C:
+ i: D = D()
+
+ # Make sure D.__set__ is called.
+ D.__set__.reset_mock()
+ c = C(5)
+ self.assertEqual(D.__set__.call_count, 1)
+
+ def test_getting_field_calls_get(self):
+ class D:
+ pass
+
+ D.__set__ = Mock()
+ D.__get__ = Mock()
+
+ @dataclass
+ class C:
+ i: D = D()
+
+ c = C(5)
+
+ # Make sure D.__get__ is called.
+ D.__get__.reset_mock()
+ value = c.i
+ self.assertEqual(D.__get__.call_count, 1)
+
+ def test_setting_field_calls_set(self):
+ class D:
+ pass
+
+ D.__set__ = Mock()
+
+ @dataclass
+ class C:
+ i: D = D()
+
+ c = C(5)
+
+ # Make sure D.__set__ is called.
+ D.__set__.reset_mock()
+ c.i = 10
+ self.assertEqual(D.__set__.call_count, 1)
+
+ def test_setting_uninitialized_descriptor_field(self):
+ class D:
+ pass
+
+ D.__set__ = Mock()
+
+ @dataclass
+ class C:
+ i: D
+
+ # D.__set__ is not called because there's no D instance to call it on
+ D.__set__.reset_mock()
+ c = C(5)
+ self.assertEqual(D.__set__.call_count, 0)
+
+ # D.__set__ still isn't called after setting i to an instance of D
+ # because descriptors don't behave like that when stored as instance vars
+ c.i = D()
+ c.i = 5
+ self.assertEqual(D.__set__.call_count, 0)
+
+ def test_default_value(self):
+ class D:
+ def __get__(self, instance: Any, owner: object) -> int:
+ if instance is None:
+ return 100
+
+ return instance._x
+
+ def __set__(self, instance: Any, value: int) -> None:
+ instance._x = value
+
+ @dataclass
+ class C:
+ i: D = D()
+
+ c = C()
+ self.assertEqual(c.i, 100)
+
+ c = C(5)
+ self.assertEqual(c.i, 5)
+
+ def test_no_default_value(self):
+ class D:
+ def __get__(self, instance: Any, owner: object) -> int:
+ if instance is None:
+ raise AttributeError()
+
+ return instance._x
+
+ def __set__(self, instance: Any, value: int) -> None:
+ instance._x = value
+
+ @dataclass
+ class C:
+ i: D = D()
+
+ with self.assertRaisesRegex(TypeError, 'missing 1 required positional argument'):
+ c = C()
class TestStringAnnotations(unittest.TestCase):
def test_classvar(self):
diff --git a/Lib/test/test_dbm_dumb.py b/Lib/test/test_dbm_dumb.py
index 73cff638f1e1a4..a481175b3bfdbd 100644
--- a/Lib/test/test_dbm_dumb.py
+++ b/Lib/test/test_dbm_dumb.py
@@ -42,6 +42,7 @@ def test_dumbdbm_creation(self):
self.read_helper(f)
@unittest.skipUnless(hasattr(os, 'umask'), 'test needs os.umask()')
+ @os_helper.skip_unless_working_chmod
def test_dumbdbm_creation_mode(self):
try:
old_umask = os.umask(0o002)
@@ -265,6 +266,7 @@ def test_invalid_flag(self):
"'r', 'w', 'c', or 'n'"):
dumbdbm.open(_fname, flag)
+ @os_helper.skip_unless_working_chmod
def test_readonly_files(self):
with os_helper.temp_dir() as dir:
fname = os.path.join(dir, 'db')
diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py
index f7a47c86a3fe88..67ccaab40c5edc 100644
--- a/Lib/test/test_decimal.py
+++ b/Lib/test/test_decimal.py
@@ -37,7 +37,7 @@
requires_legacy_unicode_capi, check_sanitizer)
from test.support import (TestFailed,
run_with_locale, cpython_only,
- darwin_malloc_err_warning)
+ darwin_malloc_err_warning, is_emscripten)
from test.support.import_helper import import_fresh_module
from test.support import threading_helper
from test.support import warnings_helper
@@ -2526,6 +2526,15 @@ class CUsabilityTest(UsabilityTest):
class PyUsabilityTest(UsabilityTest):
decimal = P
+ def setUp(self):
+ super().setUp()
+ self._previous_int_limit = sys.get_int_max_str_digits()
+ sys.set_int_max_str_digits(7000)
+
+ def tearDown(self):
+ sys.set_int_max_str_digits(self._previous_int_limit)
+ super().tearDown()
+
class PythonAPItests(unittest.TestCase):
def test_abc(self):
@@ -4626,6 +4635,15 @@ class CCoverage(Coverage):
class PyCoverage(Coverage):
decimal = P
+ def setUp(self):
+ super().setUp()
+ self._previous_int_limit = sys.get_int_max_str_digits()
+ sys.set_int_max_str_digits(7000)
+
+ def tearDown(self):
+ sys.set_int_max_str_digits(self._previous_int_limit)
+ super().tearDown()
+
class PyFunctionality(unittest.TestCase):
"""Extra functionality in decimal.py"""
@@ -5605,6 +5623,7 @@ def __abs__(self):
# Issue 41540:
@unittest.skipIf(sys.platform.startswith("aix"),
"AIX: default ulimit: test is flaky because of extreme over-allocation")
+ @unittest.skipIf(is_emscripten, "Test is unstable on Emscripten")
@unittest.skipIf(check_sanitizer(address=True, memory=True),
"ASAN/MSAN sanitizer defaults to crashing "
"instead of returning NULL for malloc failure.")
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index afe0f7e9c7fd42..f07d7d4596599c 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1310,6 +1310,15 @@ class X(object):
with self.assertRaisesRegex(AttributeError, "'X' object has no attribute 'a'"):
X().a
+ # Test string subclass in `__slots__`, see gh-98783
+ class SubStr(str):
+ pass
+ class X(object):
+ __slots__ = (SubStr('x'),)
+ X().x = 1
+ with self.assertRaisesRegex(AttributeError, "'X' object has no attribute 'a'"):
+ X().a
+
def test_slots_special(self):
# Testing __dict__ and __weakref__ in __slots__...
class D(object):
@@ -3581,6 +3590,16 @@ def __repr__(self):
self.assertEqual(o.__str__(), '41')
self.assertEqual(o.__repr__(), 'A repr')
+ def test_repr_with_module_str_subclass(self):
+ # gh-98783
+ class StrSub(str):
+ pass
+ class Some:
+ pass
+ Some.__module__ = StrSub('example')
+ self.assertIsInstance(repr(Some), str) # should not crash
+ self.assertIsInstance(repr(Some()), str) # should not crash
+
def test_keyword_arguments(self):
# Testing keyword arguments to __init__, __call__...
def f(a): return a
@@ -4980,6 +4999,19 @@ class Child(Parent):
gc.collect()
self.assertEqual(Parent.__subclasses__(), [])
+ def test_attr_raise_through_property(self):
+ # add test case for gh-103272
+ class A:
+ def __getattr__(self, name):
+ raise ValueError("FOO")
+
+ @property
+ def foo(self):
+ return self.__getattr__("asdf")
+
+ with self.assertRaisesRegex(ValueError, "FOO"):
+ A().foo
+
class DictProxyTests(unittest.TestCase):
def setUp(self):
diff --git a/Lib/test/test_descrtut.py b/Lib/test/test_descrtut.py
index e01a31a74695d5..9aefda3d521b7d 100644
--- a/Lib/test/test_descrtut.py
+++ b/Lib/test/test_descrtut.py
@@ -1,7 +1,7 @@
# This contains most of the executable examples from Guido's descr
# tutorial, once at
#
-# http://www.python.org/2.2/descrintro.html
+# https://www.python.org/download/releases/2.2.3/descrintro/
#
# A few examples left implicit in the writeup were fleshed out, a few were
# skipped due to lack of interest (e.g., faking super() by hand isn't
diff --git a/Lib/test/test_dictviews.py b/Lib/test/test_dictviews.py
index be271bebaaf1ff..dae93740d46c7c 100644
--- a/Lib/test/test_dictviews.py
+++ b/Lib/test/test_dictviews.py
@@ -320,6 +320,9 @@ def test_abc_registry(self):
self.assertIsInstance(d.values(), collections.abc.ValuesView)
self.assertIsInstance(d.values(), collections.abc.MappingView)
self.assertIsInstance(d.values(), collections.abc.Sized)
+ self.assertIsInstance(d.values(), collections.abc.Collection)
+ self.assertIsInstance(d.values(), collections.abc.Iterable)
+ self.assertIsInstance(d.values(), collections.abc.Container)
self.assertIsInstance(d.items(), collections.abc.ItemsView)
self.assertIsInstance(d.items(), collections.abc.MappingView)
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 202b99829f2133..6a0a2d92796703 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -272,7 +272,7 @@ def bug42562():
expr_str = "x + 1"
dis_expr_str = """\
- RESUME 0
+ 0 RESUME 0
1 LOAD_NAME 0 (x)
LOAD_CONST 0 (1)
@@ -283,7 +283,7 @@ def bug42562():
simple_stmt_str = "x = x + 1"
dis_simple_stmt_str = """\
- RESUME 0
+ 0 RESUME 0
1 LOAD_NAME 0 (x)
LOAD_CONST 0 (1)
@@ -302,7 +302,7 @@ def bug42562():
# leading newline is for a reason (tests lineno)
dis_annot_stmt_str = """\
- RESUME 0
+ 0 RESUME 0
2 SETUP_ANNOTATIONS
LOAD_CONST 0 (1)
@@ -342,7 +342,7 @@ def bug42562():
# Trailing newline has been deliberately omitted
dis_compound_stmt_str = """\
- RESUME 0
+ 0 RESUME 0
1 LOAD_CONST 0 (0)
STORE_NAME 0 (x)
@@ -366,14 +366,12 @@ def bug42562():
LOAD_CONST 2 (0)
--> BINARY_OP 11 (/)
POP_TOP
-
-%3d LOAD_FAST 1 (tb)
- RETURN_VALUE
+ JUMP_FORWARD 30 (to 76)
>> PUSH_EXC_INFO
%3d LOAD_GLOBAL 0 (Exception)
CHECK_EXC_MATCH
- POP_JUMP_FORWARD_IF_FALSE 18 (to 72)
+ POP_JUMP_FORWARD_IF_FALSE 17 (to 68)
STORE_FAST 0 (e)
%3d LOAD_FAST 0 (e)
@@ -383,9 +381,7 @@ def bug42562():
LOAD_CONST 0 (None)
STORE_FAST 0 (e)
DELETE_FAST 0 (e)
-
-%3d LOAD_FAST 1 (tb)
- RETURN_VALUE
+ JUMP_FORWARD 8 (to 76)
>> LOAD_CONST 0 (None)
STORE_FAST 0 (e)
DELETE_FAST 0 (e)
@@ -395,15 +391,17 @@ def bug42562():
>> COPY 3
POP_EXCEPT
RERAISE 1
+
+%3d >> LOAD_FAST 1 (tb)
+ RETURN_VALUE
ExceptionTable:
""" % (TRACEBACK_CODE.co_firstlineno,
TRACEBACK_CODE.co_firstlineno + 1,
TRACEBACK_CODE.co_firstlineno + 2,
- TRACEBACK_CODE.co_firstlineno + 5,
TRACEBACK_CODE.co_firstlineno + 3,
TRACEBACK_CODE.co_firstlineno + 4,
- TRACEBACK_CODE.co_firstlineno + 5,
- TRACEBACK_CODE.co_firstlineno + 3)
+ TRACEBACK_CODE.co_firstlineno + 3,
+ TRACEBACK_CODE.co_firstlineno + 5)
def _fstring(a, b, c, d):
return f'{a} {b:4} {c!r} {d!r:4}'
@@ -633,6 +631,22 @@ def loop_test():
loop_test.__code__.co_firstlineno + 2,
loop_test.__code__.co_firstlineno + 1,)
+def extended_arg_quick():
+ *_, _ = ...
+
+dis_extended_arg_quick_code = """\
+%3d 0 RESUME 0
+
+%3d 2 LOAD_CONST 1 (Ellipsis)
+ 4 EXTENDED_ARG 1
+ 6 UNPACK_EX 256
+ 8 STORE_FAST 0 (_)
+ 10 STORE_FAST 0 (_)
+ 12 LOAD_CONST 0 (None)
+ 14 RETURN_VALUE
+"""% (extended_arg_quick.__code__.co_firstlineno,
+ extended_arg_quick.__code__.co_firstlineno + 1,)
+
QUICKENING_WARMUP_DELAY = 8
class DisTestBase(unittest.TestCase):
@@ -938,7 +952,7 @@ def test_super_instructions(self):
@cpython_only
def test_binary_specialize(self):
binary_op_quicken = """\
- 0 RESUME_QUICK 0
+ 0 0 RESUME_QUICK 0
1 2 LOAD_NAME 0 (a)
4 LOAD_NAME 1 (b)
@@ -956,7 +970,7 @@ def test_binary_specialize(self):
self.do_disassembly_compare(got, binary_op_quicken % "BINARY_OP_ADD_UNICODE 0 (+)", True)
binary_subscr_quicken = """\
- 0 RESUME_QUICK 0
+ 0 0 RESUME_QUICK 0
1 2 LOAD_NAME 0 (a)
4 LOAD_CONST 0 (0)
@@ -976,7 +990,7 @@ def test_binary_specialize(self):
@cpython_only
def test_load_attr_specialize(self):
load_attr_quicken = """\
- 0 RESUME_QUICK 0
+ 0 0 RESUME_QUICK 0
1 2 LOAD_CONST 0 ('a')
4 LOAD_ATTR_SLOT 0 (__class__)
@@ -990,7 +1004,7 @@ def test_load_attr_specialize(self):
@cpython_only
def test_call_specialize(self):
call_quicken = """\
- 0 RESUME_QUICK 0
+ 0 0 RESUME_QUICK 0
1 2 PUSH_NULL
4 LOAD_NAME 0 (str)
@@ -1011,6 +1025,11 @@ def test_loop_quicken(self):
got = self.get_disassembly(loop_test, adaptive=True)
self.do_disassembly_compare(got, dis_loop_test_quickened_code, True)
+ @cpython_only
+ def test_extended_arg_quick(self):
+ got = self.get_disassembly(extended_arg_quick)
+ self.do_disassembly_compare(got, dis_extended_arg_quick_code, True)
+
def get_cached_values(self, quickened, adaptive):
def f():
l = []
@@ -1039,8 +1058,10 @@ def test_show_caches(self):
caches = list(self.get_cached_values(quickened, adaptive))
for cache in caches:
self.assertRegex(cache, pattern)
- self.assertEqual(caches.count(""), 8)
- self.assertEqual(len(caches), 25)
+ total_caches = 25
+ empty_caches = 8 if adaptive and quickened else total_caches
+ self.assertEqual(caches.count(""), empty_caches)
+ self.assertEqual(len(caches), total_caches)
class DisWithFileTests(DisTests):
@@ -1055,7 +1076,7 @@ def get_disassembly(self, func, lasti=-1, wrapper=True, **kwargs):
return output.getvalue()
-if sys.flags.optimize:
+if dis.code_info.__doc__ is None:
code_info_consts = "0: None"
else:
code_info_consts = "0: 'Formatted details of methods, functions, or code.'"
@@ -1490,7 +1511,7 @@ def _prepare_test_cases():
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=368, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=378, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=380, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='JUMP_FORWARD', opcode=110, arg=21, argval=426, argrepr='to 426', offset=382, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='JUMP_FORWARD', opcode=110, arg=4, argval=392, argrepr='to 392', offset=382, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=384, starts_line=22, is_jump_target=True, positions=None),
Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=386, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=388, starts_line=None, is_jump_target=False, positions=None),
@@ -1502,24 +1523,16 @@ def _prepare_test_cases():
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=420, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=422, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=424, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=426, starts_line=23, is_jump_target=True, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=428, starts_line=28, is_jump_target=False, positions=None),
+ Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=426, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=428, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=440, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=442, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=446, starts_line=None, is_jump_target=False, positions=None),
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=456, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=458, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RETURN_VALUE', opcode=83, arg=None, argval=None, argrepr='', offset=460, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=462, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=464, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=476, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='PRECALL', opcode=166, arg=1, argval=1, argrepr='', offset=478, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=482, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=492, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=494, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=496, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=498, starts_line=None, is_jump_target=False, positions=None),
- Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=500, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=458, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=460, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=462, starts_line=None, is_jump_target=False, positions=None),
+ Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=464, starts_line=None, is_jump_target=False, positions=None),
]
# One last piece of inspect fodder to check the default line number handling
@@ -1580,7 +1593,7 @@ def test_co_positions(self):
for instr in dis.get_instructions(code)
]
expected = [
- (None, None, None, None),
+ (0, 1, 0, 0),
(1, 1, 0, 1),
(1, 1, 0, 1),
(2, 2, 2, 3),
@@ -1616,6 +1629,36 @@ def test_co_positions_missing_info(self):
self.assertIsNone(positions.col_offset)
self.assertIsNone(positions.end_col_offset)
+ @requires_debug_ranges()
+ def test_co_positions_with_lots_of_caches(self):
+ def roots(a, b, c):
+ d = b**2 - 4 * a * c
+ yield (-b - cmath.sqrt(d)) / (2 * a)
+ if d:
+ yield (-b + cmath.sqrt(d)) / (2 * a)
+ code = roots.__code__
+ ops = code.co_code[::2]
+ cache_opcode = opcode.opmap["CACHE"]
+ caches = sum(op == cache_opcode for op in ops)
+ non_caches = len(ops) - caches
+ # Make sure we have "lots of caches". If not, roots should be changed:
+ assert 1 / 3 <= caches / non_caches, "this test needs more caches!"
+ for show_caches in (False, True):
+ for adaptive in (False, True):
+ with self.subTest(f"{adaptive=}, {show_caches=}"):
+ co_positions = [
+ positions
+ for op, positions in zip(ops, code.co_positions(), strict=True)
+ if show_caches or op != cache_opcode
+ ]
+ dis_positions = [
+ instruction.positions
+ for instruction in dis.get_instructions(
+ code, adaptive=adaptive, show_caches=show_caches
+ )
+ ]
+ self.assertEqual(co_positions, dis_positions)
+
# get_instructions has its own tests above, so can rely on it to validate
# the object oriented API
class BytecodeTests(InstructionTestCase, DisTestBase):
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
index 3e7f3782d89f42..00aeacddc12cac 100644
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -25,6 +25,7 @@
# NOTE: There are some additional tests relating to interaction with
# zipimport in the test_zipimport_support test module.
+# There are also related tests in `test_doctest2` module.
######################################################################
## Sample Objects (used by test cases)
@@ -460,7 +461,7 @@ def basics(): r"""
>>> tests = finder.find(sample_func)
>>> print(tests) # doctest: +ELLIPSIS
- []
+ []
The exact name depends on how test_doctest was invoked, so allow for
leading path components.
@@ -642,6 +643,26 @@ def basics(): r"""
1 SampleClass.double
1 SampleClass.get
+When used with `exclude_empty=False` we are also interested in line numbers
+of doctests that are empty.
+It used to be broken for quite some time until `bpo-28249`.
+
+ >>> from test import doctest_lineno
+ >>> tests = doctest.DocTestFinder(exclude_empty=False).find(doctest_lineno)
+ >>> for t in tests:
+ ... print('%5s %s' % (t.lineno, t.name))
+ None test.doctest_lineno
+ 22 test.doctest_lineno.ClassWithDocstring
+ 30 test.doctest_lineno.ClassWithDoctest
+ None test.doctest_lineno.ClassWithoutDocstring
+ None test.doctest_lineno.MethodWrapper
+ 39 test.doctest_lineno.MethodWrapper.method_with_docstring
+ 45 test.doctest_lineno.MethodWrapper.method_with_doctest
+ None test.doctest_lineno.MethodWrapper.method_without_docstring
+ 4 test.doctest_lineno.func_with_docstring
+ 12 test.doctest_lineno.func_with_doctest
+ None test.doctest_lineno.func_without_docstring
+
Turning off Recursion
~~~~~~~~~~~~~~~~~~~~~
DocTestFinder can be told not to look for tests in contained objects
@@ -2833,7 +2854,7 @@ def test_testmod(): r"""
# Skip the test: the filesystem encoding is unable to encode the filename
supports_unicode = False
-if supports_unicode and not support.has_no_debug_ranges():
+if supports_unicode:
def test_unicode(): """
Check doctest with a non-ascii filename:
@@ -2855,10 +2876,8 @@ def test_unicode(): """
Traceback (most recent call last):
File ...
exec(compile(example.source, filename, "single",
- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "", line 1, in
raise Exception('clé')
- ^^^^^^^^^^^^^^^^^^^^^^
Exception: clé
TestResults(failed=1, attempted=1)
"""
diff --git a/Lib/test/test_dtrace.py b/Lib/test/test_dtrace.py
index 8a436ad123b80f..4b971deacc1a5c 100644
--- a/Lib/test/test_dtrace.py
+++ b/Lib/test/test_dtrace.py
@@ -6,9 +6,14 @@
import types
import unittest
+from test import support
from test.support import findfile
+if not support.has_subprocess_support:
+ raise unittest.SkipTest("test module requires subprocess")
+
+
def abspath(filename):
return os.path.abspath(findfile(filename, subdir="dtracedata"))
diff --git a/Lib/test/test_dynamic.py b/Lib/test/test_dynamic.py
index 3e0fcf4d158f8a..fee7718f634e78 100644
--- a/Lib/test/test_dynamic.py
+++ b/Lib/test/test_dynamic.py
@@ -1,6 +1,7 @@
# Test the most dynamic corner cases of Python's runtime semantics.
import builtins
+import sys
import unittest
from test.support import swap_item, swap_attr
@@ -146,5 +147,48 @@ def __missing__(self, key):
for _ in range(30):
self.assertEqual(sum_1000(), expected)
+
+class TestTracing(unittest.TestCase):
+
+ def setUp(self):
+ self.addCleanup(sys.settrace, sys.gettrace())
+ sys.settrace(None)
+
+ def test_after_specialization(self):
+
+ def trace(frame, event, arg):
+ return trace
+
+ turn_on_trace = False
+
+ class C:
+ def __init__(self, x):
+ self.x = x
+ def __del__(self):
+ if turn_on_trace:
+ sys.settrace(trace)
+
+ def f():
+ # LOAD_GLOBAL[_BUILTIN] immediately follows the call to C.__del__
+ C(0).x, len
+
+ def g():
+ # BINARY_SUSCR[_LIST_INT] immediately follows the call to C.__del__
+ [0][C(0).x]
+
+ def h():
+ # BINARY_OP[_ADD_INT] immediately follows the call to C.__del__
+ 0 + C(0).x
+
+ for func in (f, g, h):
+ with self.subTest(func.__name__):
+ for _ in range(58):
+ func()
+ turn_on_trace = True
+ func()
+ sys.settrace(None)
+ turn_on_trace = False
+
+
if __name__ == "__main__":
unittest.main()
diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py
index 69f883a3673f26..ca8212825ffca4 100644
--- a/Lib/test/test_email/test_email.py
+++ b/Lib/test/test_email/test_email.py
@@ -19,24 +19,25 @@
import email.policy
from email.charset import Charset
-from email.header import Header, decode_header, make_header
-from email.parser import Parser, HeaderParser
from email.generator import Generator, DecodedGenerator, BytesGenerator
+from email.header import Header, decode_header, make_header
+from email.headerregistry import HeaderRegistry
from email.message import Message
from email.mime.application import MIMEApplication
from email.mime.audio import MIMEAudio
-from email.mime.text import MIMEText
-from email.mime.image import MIMEImage
from email.mime.base import MIMEBase
+from email.mime.image import MIMEImage
from email.mime.message import MIMEMessage
from email.mime.multipart import MIMEMultipart
from email.mime.nonmultipart import MIMENonMultipart
-from email import utils
-from email import errors
+from email.mime.text import MIMEText
+from email.parser import Parser, HeaderParser
+from email import base64mime
from email import encoders
+from email import errors
from email import iterators
-from email import base64mime
from email import quoprimime
+from email import utils
from test.support import threading_helper
from test.support.os_helper import unlink
@@ -3047,33 +3048,43 @@ def test_formatdate_usegmt(self):
# parsedate and parsedate_tz will become deprecated interfaces someday
def test_parsedate_returns_None_for_invalid_strings(self):
- self.assertIsNone(utils.parsedate(''))
- self.assertIsNone(utils.parsedate_tz(''))
- self.assertIsNone(utils.parsedate(' '))
- self.assertIsNone(utils.parsedate_tz(' '))
- self.assertIsNone(utils.parsedate('0'))
- self.assertIsNone(utils.parsedate_tz('0'))
- self.assertIsNone(utils.parsedate('A Complete Waste of Time'))
- self.assertIsNone(utils.parsedate_tz('A Complete Waste of Time'))
- self.assertIsNone(utils.parsedate_tz('Wed, 3 Apr 2002 12.34.56.78+0800'))
+ # See also test_parsedate_to_datetime_with_invalid_raises_valueerror
+ # in test_utils.
+ invalid_dates = [
+ '',
+ ' ',
+ '0',
+ 'A Complete Waste of Time',
+ 'Wed, 3 Apr 2002 12.34.56.78+0800',
+ '17 June , 2022',
+ 'Friday, -Nov-82 16:14:55 EST',
+ 'Friday, Nov--82 16:14:55 EST',
+ 'Friday, 19-Nov- 16:14:55 EST',
+ ]
+ for dtstr in invalid_dates:
+ with self.subTest(dtstr=dtstr):
+ self.assertIsNone(utils.parsedate(dtstr))
+ self.assertIsNone(utils.parsedate_tz(dtstr))
# Not a part of the spec but, but this has historically worked:
self.assertIsNone(utils.parsedate(None))
self.assertIsNone(utils.parsedate_tz(None))
def test_parsedate_compact(self):
+ self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58:26 +0800'),
+ (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
# The FWS after the comma is optional
- self.assertEqual(utils.parsedate('Wed,3 Apr 2002 14:58:26 +0800'),
- utils.parsedate('Wed, 3 Apr 2002 14:58:26 +0800'))
+ self.assertEqual(utils.parsedate_tz('Wed,3 Apr 2002 14:58:26 +0800'),
+ (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
+ # The comma is optional
+ self.assertEqual(utils.parsedate_tz('Wed 3 Apr 2002 14:58:26 +0800'),
+ (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
def test_parsedate_no_dayofweek(self):
- eq = self.assertEqual
- eq(utils.parsedate_tz('25 Feb 2003 13:47:26 -0800'),
- (2003, 2, 25, 13, 47, 26, 0, 1, -1, -28800))
-
- def test_parsedate_compact_no_dayofweek(self):
eq = self.assertEqual
eq(utils.parsedate_tz('5 Feb 2003 13:47:26 -0800'),
(2003, 2, 5, 13, 47, 26, 0, 1, -1, -28800))
+ eq(utils.parsedate_tz('February 5, 2003 13:47:26 -0800'),
+ (2003, 2, 5, 13, 47, 26, 0, 1, -1, -28800))
def test_parsedate_no_space_before_positive_offset(self):
self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58:26+0800'),
@@ -3084,7 +3095,6 @@ def test_parsedate_no_space_before_negative_offset(self):
self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58:26-0800'),
(2002, 4, 3, 14, 58, 26, 0, 1, -1, -28800))
-
def test_parsedate_accepts_time_with_dots(self):
eq = self.assertEqual
eq(utils.parsedate_tz('5 Feb 2003 13.47.26 -0800'),
@@ -3092,6 +3102,20 @@ def test_parsedate_accepts_time_with_dots(self):
eq(utils.parsedate_tz('5 Feb 2003 13.47 -0800'),
(2003, 2, 5, 13, 47, 0, 0, 1, -1, -28800))
+ def test_parsedate_rfc_850(self):
+ self.assertEqual(utils.parsedate_tz('Friday, 19-Nov-82 16:14:55 EST'),
+ (1982, 11, 19, 16, 14, 55, 0, 1, -1, -18000))
+
+ def test_parsedate_no_seconds(self):
+ self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14:58 +0800'),
+ (2002, 4, 3, 14, 58, 0, 0, 1, -1, 28800))
+
+ def test_parsedate_dot_time_delimiter(self):
+ self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14.58.26 +0800'),
+ (2002, 4, 3, 14, 58, 26, 0, 1, -1, 28800))
+ self.assertEqual(utils.parsedate_tz('Wed, 3 Apr 2002 14.58 +0800'),
+ (2002, 4, 3, 14, 58, 0, 0, 1, -1, 28800))
+
def test_parsedate_acceptable_to_time_functions(self):
eq = self.assertEqual
timetup = utils.parsedate('5 Feb 2003 13:47:26 -0800')
@@ -5541,7 +5565,12 @@ def test_long_headers_flatten(self):
result = fp.getvalue()
self._signed_parts_eq(original, result)
-
+class TestHeaderRegistry(TestEmailBase):
+ # See issue gh-93010.
+ def test_HeaderRegistry(self):
+ reg = HeaderRegistry()
+ a = reg('Content-Disposition', 'attachment; 0*00="foo"')
+ self.assertIsInstance(a.defects[0], errors.InvalidHeaderDefect)
if __name__ == '__main__':
unittest.main()
diff --git a/Lib/test/test_email/test_utils.py b/Lib/test/test_email/test_utils.py
index e3d3eaebc93693..78afb358035e81 100644
--- a/Lib/test/test_email/test_utils.py
+++ b/Lib/test/test_email/test_utils.py
@@ -49,12 +49,21 @@ def test_parsedate_to_datetime_naive(self):
self.naive_dt)
def test_parsedate_to_datetime_with_invalid_raises_valueerror(self):
- invalid_dates = ['',
- '0',
- 'A Complete Waste of Time'
- 'Tue, 06 Jun 2017 27:39:33 +0600',
- 'Tue, 06 Jun 2017 07:39:33 +2600',
- 'Tue, 06 Jun 2017 27:39:33']
+ # See also test_parsedate_returns_None_for_invalid_strings in test_email.
+ invalid_dates = [
+ '',
+ ' ',
+ '0',
+ 'A Complete Waste of Time',
+ 'Wed, 3 Apr 2002 12.34.56.78+0800'
+ 'Tue, 06 Jun 2017 27:39:33 +0600',
+ 'Tue, 06 Jun 2017 07:39:33 +2600',
+ 'Tue, 06 Jun 2017 27:39:33',
+ '17 June , 2022',
+ 'Friday, -Nov-82 16:14:55 EST',
+ 'Friday, Nov--82 16:14:55 EST',
+ 'Friday, 19-Nov- 16:14:55 EST',
+ ]
for dtstr in invalid_dates:
with self.subTest(dtstr=dtstr):
self.assertRaises(ValueError, utils.parsedate_to_datetime, dtstr)
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index 169ae5cb0a06eb..2affa17e800c07 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -68,18 +68,16 @@ def setUp(self):
ext = ("_d" if debug_build(sys.executable) else "") + ".exe"
exename += ext
exepath = builddir
- expecteddir = os.path.join(support.REPO_ROOT, builddir)
else:
exepath = os.path.join(builddir, 'Programs')
- expecteddir = os.path.join(support.REPO_ROOT, 'Programs')
self.test_exe = exe = os.path.join(exepath, exename)
- if exepath != expecteddir or not os.path.exists(exe):
+ if not os.path.exists(exe):
self.skipTest("%r doesn't exist" % exe)
# This is needed otherwise we get a fatal error:
# "Py_Initialize: Unable to get the locale encoding
# LookupError: no codec search functions registered: can't find encoding"
self.oldcwd = os.getcwd()
- os.chdir(support.REPO_ROOT)
+ os.chdir(builddir)
def tearDown(self):
os.chdir(self.oldcwd)
@@ -286,7 +284,7 @@ def test_pre_initialization_sys_options(self):
"test_pre_initialization_sys_options", env=env)
expected_output = (
"sys.warnoptions: ['once', 'module', 'default']\n"
- "sys._xoptions: {'dev': '2', 'utf8': '1'}\n"
+ "sys._xoptions: {'not_an_option': '1', 'also_not_an_option': '2'}\n"
"warnings.filters[:3]: ['default', 'module', 'once']\n"
)
self.assertIn(expected_output, out)
@@ -343,19 +341,45 @@ def test_finalize_structseq(self):
out, err = self.run_embedded_interpreter("test_repeated_init_exec", code)
self.assertEqual(out, 'Tests passed\n' * INIT_LOOPS)
- @support.skip_if_pgo_task
+ def test_simple_initialization_api(self):
+ # _testembed now uses Py_InitializeFromConfig by default
+ # This case specifically checks Py_Initialize(Ex) still works
+ out, err = self.run_embedded_interpreter("test_repeated_simple_init")
+ self.assertEqual(out, 'Finalized\n' * INIT_LOOPS)
+
def test_quickened_static_code_gets_unquickened_at_Py_FINALIZE(self):
# https://github.com/python/cpython/issues/92031
- code = """if 1:
- from importlib._bootstrap import _handle_fromlist
- import dis
- for name in dis.opmap:
- # quicken this frozen code object.
- _handle_fromlist(dis, [name], lambda *args: None)
- """
+
+ # Do these imports outside of the code string to avoid using
+ # importlib too much from within the code string, so that
+ # _handle_fromlist doesn't get quickened until we intend it to.
+ from dis import _all_opmap
+ resume = _all_opmap["RESUME"]
+ resume_quick = _all_opmap["RESUME_QUICK"]
+ from test.test_dis import QUICKENING_WARMUP_DELAY
+
+ code = textwrap.dedent(f"""\
+ import importlib._bootstrap
+ func = importlib._bootstrap._handle_fromlist
+ code = func.__code__
+
+ # Assert initially unquickened.
+ # Use sets to account for byte order.
+ if set(code._co_code_adaptive[:2]) != set([{resume}, 0]):
+ raise AssertionError()
+
+ for i in range({QUICKENING_WARMUP_DELAY}):
+ func(importlib._bootstrap, ["x"], lambda *args: None)
+
+ # Assert quickening worked
+ if set(code._co_code_adaptive[:2]) != set([{resume_quick}, 0]):
+ raise AssertionError()
+
+ print("Tests passed")
+ """)
run = self.run_embedded_interpreter
- for i in range(50):
- out, err = run("test_repeated_init_exec", code, timeout=60)
+ out, err = run("test_repeated_init_exec", code)
+ self.assertEqual(out, 'Tests passed\n' * INIT_LOOPS)
def test_ucnhash_capi_reset(self):
# bpo-47182: unicodeobject.c:ucnhash_capi was not reset on shutdown.
@@ -610,7 +634,7 @@ def _get_expected_config(self):
return configs
def get_expected_config(self, expected_preconfig, expected,
- env, api, modify_path_cb=None, cwd=None):
+ env, api, modify_path_cb=None):
configs = self._get_expected_config()
pre_config = configs['pre_config']
@@ -653,14 +677,6 @@ def get_expected_config(self, expected_preconfig, expected,
expected['base_executable'] = default_executable
if expected['program_name'] is self.GET_DEFAULT_CONFIG:
expected['program_name'] = './_testembed'
- if MS_WINDOWS:
- # follow the calculation in getpath.py
- tmpname = expected['program_name'] + '.exe'
- if cwd:
- tmpname = os.path.join(cwd, tmpname)
- if os.path.isfile(tmpname):
- expected['program_name'] += '.exe'
- del tmpname
config = configs['config']
for key, value in expected.items():
@@ -690,6 +706,13 @@ def check_pre_config(self, configs, expected):
def check_config(self, configs, expected):
config = dict(configs['config'])
+ if MS_WINDOWS:
+ value = config.get(key := 'program_name')
+ if value and isinstance(value, str):
+ value = value[:len(value.lower().removesuffix('.exe'))]
+ if debug_build(sys.executable):
+ value = value[:len(value.lower().removesuffix('_d'))]
+ config[key] = value
for key, value in list(expected.items()):
if value is self.IGNORE_CONFIG:
config.pop(key, None)
@@ -754,7 +777,7 @@ def check_all_configs(self, testname, expected_config=None,
self.get_expected_config(expected_preconfig,
expected_config,
env,
- api, modify_path_cb, cwd)
+ api, modify_path_cb)
out, err = self.run_embedded_interpreter(testname,
env=env, cwd=cwd)
@@ -827,14 +850,15 @@ def test_init_from_config(self):
'argv': ['-c', 'arg2'],
'orig_argv': ['python3',
'-W', 'cmdline_warnoption',
- '-X', 'dev',
+ '-X', 'cmdline_xoption',
'-c', 'pass',
'arg2'],
'parse_argv': 2,
'xoptions': [
- 'dev=3',
- 'utf8',
- 'dev',
+ 'config_xoption1=3',
+ 'config_xoption2=',
+ 'config_xoption3',
+ 'cmdline_xoption',
],
'warnoptions': [
'cmdline_warnoption',
@@ -1062,8 +1086,9 @@ def test_init_sys_add(self):
config = {
'faulthandler': 1,
'xoptions': [
- 'dev',
- 'utf8',
+ 'config_xoption',
+ 'cmdline_xoption',
+ 'sysadd_xoption',
'faulthandler',
],
'warnoptions': [
@@ -1073,12 +1098,9 @@ def test_init_sys_add(self):
],
'orig_argv': ['python3',
'-W', 'ignore:::cmdline_warnoption',
- '-X', 'utf8'],
+ '-X', 'cmdline_xoption'],
}
- preconfig = {'utf8_mode': 1}
- self.check_all_configs("test_init_sys_add", config,
- expected_preconfig=preconfig,
- api=API_PYTHON)
+ self.check_all_configs("test_init_sys_add", config, api=API_PYTHON)
def test_init_run_main(self):
code = ('import _testinternalcapi, json; '
@@ -1263,7 +1285,7 @@ def test_init_setpythonhome(self):
stdlib = os.path.join(home, "Lib")
# Because we are specifying 'home', module search paths
# are fairly static
- expected_paths = [paths[0], stdlib, os.path.join(home, 'DLLs')]
+ expected_paths = [paths[0], os.path.join(home, 'DLLs'), stdlib]
else:
version = f'{sys.version_info.major}.{sys.version_info.minor}'
stdlib = os.path.join(home, sys.platlibdir, f'python{version}')
@@ -1284,6 +1306,66 @@ def test_init_setpythonhome(self):
self.check_all_configs("test_init_setpythonhome", config,
api=API_COMPAT, env=env)
+ def test_init_is_python_build_with_home(self):
+ # Test _Py_path_config._is_python_build configuration (gh-91985)
+ config = self._get_expected_config()
+ paths = config['config']['module_search_paths']
+ paths_str = os.path.pathsep.join(paths)
+
+ for path in paths:
+ if not os.path.isdir(path):
+ continue
+ if os.path.exists(os.path.join(path, 'os.py')):
+ home = os.path.dirname(path)
+ break
+ else:
+ self.fail(f"Unable to find home in {paths!r}")
+
+ prefix = exec_prefix = home
+ if MS_WINDOWS:
+ stdlib = os.path.join(home, "Lib")
+ # Because we are specifying 'home', module search paths
+ # are fairly static
+ expected_paths = [paths[0], os.path.join(home, 'DLLs'), stdlib]
+ else:
+ version = f'{sys.version_info.major}.{sys.version_info.minor}'
+ stdlib = os.path.join(home, sys.platlibdir, f'python{version}')
+ expected_paths = self.module_search_paths(prefix=home, exec_prefix=home)
+
+ config = {
+ 'home': home,
+ 'module_search_paths': expected_paths,
+ 'prefix': prefix,
+ 'base_prefix': prefix,
+ 'exec_prefix': exec_prefix,
+ 'base_exec_prefix': exec_prefix,
+ 'pythonpath_env': paths_str,
+ 'stdlib_dir': stdlib,
+ }
+ # The code above is taken from test_init_setpythonhome()
+ env = {'TESTHOME': home, 'PYTHONPATH': paths_str}
+
+ env['NEGATIVE_ISPYTHONBUILD'] = '1'
+ config['_is_python_build'] = 0
+ self.check_all_configs("test_init_is_python_build", config,
+ api=API_COMPAT, env=env)
+
+ env['NEGATIVE_ISPYTHONBUILD'] = '0'
+ config['_is_python_build'] = 1
+ exedir = os.path.dirname(sys.executable)
+ with open(os.path.join(exedir, 'pybuilddir.txt'), encoding='utf8') as f:
+ expected_paths[1 if MS_WINDOWS else 2] = os.path.normpath(
+ os.path.join(exedir, f'{f.read()}\n$'.splitlines()[0]))
+ if not MS_WINDOWS:
+ # PREFIX (default) is set when running in build directory
+ prefix = exec_prefix = sys.prefix
+ # stdlib calculation (/Lib) is not yet supported
+ expected_paths[0] = self.module_search_paths(prefix=prefix)[0]
+ config.update(prefix=prefix, base_prefix=prefix,
+ exec_prefix=exec_prefix, base_exec_prefix=exec_prefix)
+ self.check_all_configs("test_init_is_python_build", config,
+ api=API_COMPAT, env=env)
+
def copy_paths_by_env(self, config):
all_configs = self._get_expected_config()
paths = all_configs['config']['module_search_paths']
@@ -1299,10 +1381,11 @@ def test_init_pybuilddir(self):
with self.tmpdir_with_python() as tmpdir:
# pybuilddir.txt is a sub-directory relative to the current
# directory (tmpdir)
+ vpath = sysconfig.get_config_var("VPATH") or ''
subdir = 'libdir'
libdir = os.path.join(tmpdir, subdir)
# The stdlib dir is dirname(executable) + VPATH + 'Lib'
- stdlibdir = os.path.join(tmpdir, 'Lib')
+ stdlibdir = os.path.normpath(os.path.join(tmpdir, vpath, 'Lib'))
os.mkdir(libdir)
filename = os.path.join(tmpdir, 'pybuilddir.txt')
@@ -1348,8 +1431,8 @@ def test_init_pybuilddir_win32(self):
module_search_paths = self.module_search_paths()
module_search_paths[-3] = os.path.join(tmpdir, os.path.basename(module_search_paths[-3]))
- module_search_paths[-2] = stdlibdir
- module_search_paths[-1] = tmpdir
+ module_search_paths[-2] = tmpdir
+ module_search_paths[-1] = stdlibdir
executable = self.test_exe
config = {
@@ -1398,17 +1481,11 @@ def test_init_pyvenv_cfg(self):
if not MS_WINDOWS:
paths[-1] = lib_dynload
else:
- # Include DLLs directory as well
- paths.insert(1, '.\\DLLs')
- for index, path in enumerate(paths):
- if index == 0:
- # Because we copy the DLLs into tmpdir as well, the zip file
- # entry in sys.path will be there. For a regular venv, it will
- # usually be in the home directory.
- paths[index] = os.path.join(tmpdir, os.path.basename(path))
- else:
- paths[index] = os.path.join(pyvenv_home, os.path.basename(path))
- paths[-1] = pyvenv_home
+ paths = [
+ os.path.join(tmpdir, os.path.basename(paths[0])),
+ pyvenv_home,
+ os.path.join(pyvenv_home, "Lib"),
+ ]
executable = self.test_exe
base_executable = os.path.join(pyvenv_home, os.path.basename(executable))
@@ -1425,12 +1502,12 @@ def test_init_pyvenv_cfg(self):
config['base_prefix'] = pyvenv_home
config['prefix'] = pyvenv_home
config['stdlib_dir'] = os.path.join(pyvenv_home, 'Lib')
- config['use_frozen_modules'] = not Py_DEBUG
+ config['use_frozen_modules'] = int(not Py_DEBUG)
else:
# cannot reliably assume stdlib_dir here because it
# depends too much on our build. But it ought to be found
config['stdlib_dir'] = self.IGNORE_CONFIG
- config['use_frozen_modules'] = not Py_DEBUG
+ config['use_frozen_modules'] = int(not Py_DEBUG)
env = self.copy_paths_by_env(config)
self.check_all_configs("test_init_compat_config", config,
@@ -1634,6 +1711,9 @@ def test_audit_run_stdin(self):
timeout=support.SHORT_TIMEOUT,
returncode=1)
+ def test_get_incomplete_frame(self):
+ self.run_embedded_interpreter("test_get_incomplete_frame")
+
class MiscTests(EmbeddingTestsMixin, unittest.TestCase):
def test_unicode_id_init(self):
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
index f9e09027228b4e..f5cefa2f352026 100644
--- a/Lib/test/test_enum.py
+++ b/Lib/test/test_enum.py
@@ -1,3 +1,4 @@
+import copy
import enum
import doctest
import inspect
@@ -6,13 +7,14 @@
import sys
import unittest
import threading
+import typing
import builtins as bltns
from collections import OrderedDict
from datetime import date
-from enum import Enum, IntEnum, StrEnum, EnumType, Flag, IntFlag, unique, auto
+from enum import Enum, EnumMeta, IntEnum, StrEnum, EnumType, Flag, IntFlag, unique, auto
from enum import STRICT, CONFORM, EJECT, KEEP, _simple_enum, _test_simple_enum
from enum import verify, UNIQUE, CONTINUOUS, NAMED_FLAGS, ReprEnum
-from enum import member, nonmember
+from enum import member, nonmember, _iter_bits_lsb
from io import StringIO
from pickle import dumps, loads, PicklingError, HIGHEST_PROTOCOL
from test import support
@@ -64,10 +66,27 @@ class FloatStooges(float, Enum):
class FlagStooges(Flag):
LARRY = 1
CURLY = 2
- MOE = 3
+ MOE = 4
except Exception as exc:
FlagStooges = exc
+class FlagStoogesWithZero(Flag):
+ NOFLAG = 0
+ LARRY = 1
+ CURLY = 2
+ MOE = 4
+
+class IntFlagStooges(IntFlag):
+ LARRY = 1
+ CURLY = 2
+ MOE = 4
+
+class IntFlagStoogesWithZero(IntFlag):
+ NOFLAG = 0
+ LARRY = 1
+ CURLY = 2
+ MOE = 4
+
# for pickle test and subclass tests
class Name(StrEnum):
BDFL = 'Guido van Rossum'
@@ -155,6 +174,10 @@ def test_is_private(self):
for name in self.sunder_names + self.dunder_names + self.random_names:
self.assertFalse(enum._is_private('MyEnum', name), '%r is a private name?')
+ def test_iter_bits_lsb(self):
+ self.assertEqual(list(_iter_bits_lsb(7)), [1, 2, 4])
+ self.assertRaisesRegex(ValueError, '-8 is not a positive integer', list, _iter_bits_lsb(-8))
+
# for subclassing tests
@@ -189,6 +212,12 @@ class HeadlightsC(IntFlag, boundary=enum.CONFORM):
FOG_C = auto()
+@enum.global_enum
+class NoName(Flag):
+ ONE = 1
+ TWO = 2
+
+
# tests
class _EnumTests:
@@ -603,6 +632,13 @@ class MySubEnum(MyEnum):
theother = auto()
self.assertEqual(repr(MySubEnum.that), "My name is that.")
+ def test_multiple_superclasses_repr(self):
+ class _EnumSuperClass(metaclass=EnumMeta):
+ pass
+ class E(_EnumSuperClass, Enum):
+ A = 1
+ self.assertEqual(repr(E.A), "")
+
def test_reversed_iteration_order(self):
self.assertEqual(
list(reversed(self.MainEnum)),
@@ -614,6 +650,7 @@ class _PlainOutputTests:
def test_str(self):
TE = self.MainEnum
if self.is_flag:
+ self.assertEqual(str(TE(0)), "MainEnum(0)")
self.assertEqual(str(TE.dupe), "MainEnum.dupe")
self.assertEqual(str(self.dupe2), "MainEnum.first|third")
else:
@@ -725,13 +762,20 @@ def test_format_specs(self):
self.assertFormatIsValue('{:5.2}', TE.third)
self.assertFormatIsValue('{:f}', TE.third)
+ def test_copy(self):
+ TE = self.MainEnum
+ copied = copy.copy(TE)
+ self.assertEqual(copied, TE)
+ deep = copy.deepcopy(TE)
+ self.assertEqual(deep, TE)
+
class _FlagTests:
def test_default_missing_with_wrong_type_value(self):
with self.assertRaisesRegex(
ValueError,
- "'RED' is not a valid TestFlag.Color",
+ "'RED' is not a valid ",
) as ctx:
self.MainEnum('RED')
self.assertIs(ctx.exception.__context__, None)
@@ -740,7 +784,7 @@ class TestPlainEnum(_EnumTests, _PlainOutputTests, unittest.TestCase):
enum_type = Enum
-class TestPlainFlag(_EnumTests, _PlainOutputTests, unittest.TestCase):
+class TestPlainFlag(_EnumTests, _PlainOutputTests, _FlagTests, unittest.TestCase):
enum_type = Flag
@@ -752,7 +796,7 @@ class TestStrEnum(_EnumTests, _MinimalOutputTests, unittest.TestCase):
enum_type = StrEnum
-class TestIntFlag(_EnumTests, _MinimalOutputTests, unittest.TestCase):
+class TestIntFlag(_EnumTests, _MinimalOutputTests, _FlagTests, unittest.TestCase):
enum_type = IntFlag
@@ -764,7 +808,7 @@ class TestMixedStr(_EnumTests, _MixedOutputTests, unittest.TestCase):
class enum_type(str, Enum): pass
-class TestMixedIntFlag(_EnumTests, _MixedOutputTests, unittest.TestCase):
+class TestMixedIntFlag(_EnumTests, _MixedOutputTests, _FlagTests, unittest.TestCase):
class enum_type(int, Flag): pass
@@ -963,6 +1007,15 @@ class SpamEnum(Enum):
spam = SpamEnumNotInner
self.assertEqual(SpamEnum.spam.value, SpamEnumNotInner)
+ def test_enum_of_generic_aliases(self):
+ class E(Enum):
+ a = typing.List[int]
+ b = list[int]
+ self.assertEqual(E.a.value, typing.List[int])
+ self.assertEqual(E.b.value, list[int])
+ self.assertEqual(repr(E.a), '')
+ self.assertEqual(repr(E.b), '')
+
@unittest.skipIf(
python_version >= (3, 13),
'inner classes are not members',
@@ -1268,7 +1321,6 @@ def repr(self):
class Huh(MyStr, MyInt, Enum):
One = 1
-
def test_pickle_enum(self):
if isinstance(Stooges, Exception):
raise Stooges
@@ -2569,13 +2621,15 @@ class Private(Enum):
self.assertEqual(Private._Private__corporal, 'Radar')
self.assertEqual(Private._Private__major_, 'Hoolihan')
- def test_exception_for_member_from_member_access(self):
- with self.assertRaisesRegex(AttributeError, " member has no attribute .NO."):
- class Di(Enum):
- YES = 1
- NO = 0
- nope = Di.YES.NO
-
+ def test_member_from_member_access(self):
+ class Di(Enum):
+ YES = 1
+ NO = 0
+ name = 3
+ warn = Di.YES.NO
+ self.assertIs(warn, Di.NO)
+ self.assertIs(Di.name, Di['name'])
+ self.assertEqual(Di.name.name, 'name')
def test_dynamic_members_with_static_methods(self):
#
@@ -2610,22 +2664,37 @@ def test_repr_with_dataclass(self):
@dataclass
class Foo:
__qualname__ = 'Foo'
- a: int = 0
+ a: int
class Entries(Foo, Enum):
- ENTRY1 = Foo(1)
+ ENTRY1 = 1
+ self.assertTrue(isinstance(Entries.ENTRY1, Foo))
+ self.assertTrue(Entries._member_type_ is Foo, Entries._member_type_)
+ self.assertTrue(Entries.ENTRY1.value == Foo(1), Entries.ENTRY1.value)
self.assertEqual(repr(Entries.ENTRY1), '')
- def test_repr_with_non_data_type_mixin(self):
- # non-data_type is a mixin that doesn't define __new__
+ def test_repr_with_init_mixin(self):
class Foo:
def __init__(self, a):
self.a = a
def __repr__(self):
- return f'Foo(a={self.a!r})'
+ return 'Foo(a=%r)' % self._value_
class Entries(Foo, Enum):
- ENTRY1 = Foo(1)
+ ENTRY1 = 1
+ #
+ self.assertEqual(repr(Entries.ENTRY1), 'Foo(a=1)')
- self.assertEqual(repr(Entries.ENTRY1), '')
+ def test_repr_and_str_with_no_init_mixin(self):
+ # non-data_type is a mixin that doesn't define __new__
+ class Foo:
+ def __repr__(self):
+ return 'Foo'
+ def __str__(self):
+ return 'ooF'
+ class Entries(Foo, Enum):
+ ENTRY1 = 1
+ #
+ self.assertEqual(repr(Entries.ENTRY1), 'Foo')
+ self.assertEqual(str(Entries.ENTRY1), 'ooF')
def test_value_backup_assign(self):
# check that enum will add missing values when custom __new__ does not
@@ -2645,6 +2714,107 @@ class MyIntFlag(int, Flag):
self.assertTrue(isinstance(MyIntFlag.ONE | MyIntFlag.TWO, MyIntFlag), MyIntFlag.ONE | MyIntFlag.TWO)
self.assertTrue(isinstance(MyIntFlag.ONE | 2, MyIntFlag))
+ def test_int_flags_copy(self):
+ class MyIntFlag(IntFlag):
+ ONE = 1
+ TWO = 2
+ FOUR = 4
+
+ flags = MyIntFlag.ONE | MyIntFlag.TWO
+ copied = copy.copy(flags)
+ deep = copy.deepcopy(flags)
+ self.assertEqual(copied, flags)
+ self.assertEqual(deep, flags)
+
+ flags = MyIntFlag.ONE | MyIntFlag.TWO | 8
+ copied = copy.copy(flags)
+ deep = copy.deepcopy(flags)
+ self.assertEqual(copied, flags)
+ self.assertEqual(deep, flags)
+ self.assertEqual(copied.value, 1 | 2 | 8)
+
+ def test_namedtuple_as_value(self):
+ from collections import namedtuple
+ TTuple = namedtuple('TTuple', 'id a blist')
+ class NTEnum(Enum):
+ NONE = TTuple(0, 0, [])
+ A = TTuple(1, 2, [4])
+ B = TTuple(2, 4, [0, 1, 2])
+ self.assertEqual(repr(NTEnum.NONE), "")
+ self.assertEqual(NTEnum.NONE.value, TTuple(id=0, a=0, blist=[]))
+ self.assertEqual(
+ [x.value for x in NTEnum],
+ [TTuple(id=0, a=0, blist=[]), TTuple(id=1, a=2, blist=[4]), TTuple(id=2, a=4, blist=[0, 1, 2])],
+ )
+
+ def test_flag_with_custom_new(self):
+ class FlagFromChar(IntFlag):
+ def __new__(cls, c):
+ value = 1 << c
+ self = int.__new__(cls, value)
+ self._value_ = value
+ return self
+ #
+ a = ord('a')
+ #
+ self.assertEqual(FlagFromChar._all_bits_, 316912650057057350374175801343)
+ self.assertEqual(FlagFromChar._flag_mask_, 158456325028528675187087900672)
+ self.assertEqual(FlagFromChar.a, 158456325028528675187087900672)
+ self.assertEqual(FlagFromChar.a|1, 158456325028528675187087900673)
+ #
+ #
+ class FlagFromChar(Flag):
+ def __new__(cls, c):
+ value = 1 << c
+ self = object.__new__(cls)
+ self._value_ = value
+ return self
+ #
+ a = ord('a')
+ z = 1
+ #
+ self.assertEqual(FlagFromChar._all_bits_, 316912650057057350374175801343)
+ self.assertEqual(FlagFromChar._flag_mask_, 158456325028528675187087900674)
+ self.assertEqual(FlagFromChar.a.value, 158456325028528675187087900672)
+ self.assertEqual((FlagFromChar.a|FlagFromChar.z).value, 158456325028528675187087900674)
+ #
+ #
+ class FlagFromChar(int, Flag, boundary=KEEP):
+ def __new__(cls, c):
+ value = 1 << c
+ self = int.__new__(cls, value)
+ self._value_ = value
+ return self
+ #
+ a = ord('a')
+ #
+ self.assertEqual(FlagFromChar._all_bits_, 316912650057057350374175801343)
+ self.assertEqual(FlagFromChar._flag_mask_, 158456325028528675187087900672)
+ self.assertEqual(FlagFromChar.a, 158456325028528675187087900672)
+ self.assertEqual(FlagFromChar.a|1, 158456325028528675187087900673)
+
+ def test_init_exception(self):
+ class Base:
+ def __new__(cls, *args):
+ return object.__new__(cls)
+ def __init__(self, x):
+ raise ValueError("I don't like", x)
+ with self.assertRaises(TypeError):
+ class MyEnum(Base, enum.Enum):
+ A = 'a'
+ def __init__(self, y):
+ self.y = y
+ with self.assertRaises(ValueError):
+ class MyEnum(Base, enum.Enum):
+ A = 'a'
+ def __init__(self, y):
+ self.y = y
+ def __new__(cls, value):
+ member = Base.__new__(cls)
+ member._value_ = Base(value)
+ return member
+
+
class TestOrder(unittest.TestCase):
"test usage of the `_order_` attribute"
@@ -2800,17 +2970,17 @@ def test_bool(self):
def test_boundary(self):
self.assertIs(enum.Flag._boundary_, STRICT)
- class Iron(Flag, boundary=STRICT):
+ class Iron(Flag, boundary=CONFORM):
ONE = 1
TWO = 2
EIGHT = 8
- self.assertIs(Iron._boundary_, STRICT)
+ self.assertIs(Iron._boundary_, CONFORM)
#
- class Water(Flag, boundary=CONFORM):
+ class Water(Flag, boundary=STRICT):
ONE = 1
TWO = 2
EIGHT = 8
- self.assertIs(Water._boundary_, CONFORM)
+ self.assertIs(Water._boundary_, STRICT)
#
class Space(Flag, boundary=EJECT):
ONE = 1
@@ -2823,10 +2993,10 @@ class Bizarre(Flag, boundary=KEEP):
c = 4
d = 6
#
- self.assertRaisesRegex(ValueError, 'invalid value 7', Iron, 7)
+ self.assertRaisesRegex(ValueError, 'invalid value 7', Water, 7)
#
- self.assertIs(Water(7), Water.ONE|Water.TWO)
- self.assertIs(Water(~9), Water.TWO)
+ self.assertIs(Iron(7), Iron.ONE|Iron.TWO)
+ self.assertIs(Iron(~9), Iron.TWO)
#
self.assertEqual(Space(7), 7)
self.assertTrue(type(Space(7)) is int)
@@ -2834,6 +3004,31 @@ class Bizarre(Flag, boundary=KEEP):
self.assertEqual(list(Bizarre), [Bizarre.c])
self.assertIs(Bizarre(3), Bizarre.b)
self.assertIs(Bizarre(6), Bizarre.d)
+ #
+ class SkipFlag(enum.Flag):
+ A = 1
+ B = 2
+ C = 4 | B
+ #
+ self.assertTrue(SkipFlag.C in (SkipFlag.A|SkipFlag.C))
+ self.assertRaisesRegex(ValueError, 'SkipFlag.. invalid value 42', SkipFlag, 42)
+ #
+ class SkipIntFlag(enum.IntFlag):
+ A = 1
+ B = 2
+ C = 4 | B
+ #
+ self.assertTrue(SkipIntFlag.C in (SkipIntFlag.A|SkipIntFlag.C))
+ self.assertEqual(SkipIntFlag(42).value, 42)
+ #
+ class MethodHint(Flag):
+ HiddenText = 0x10
+ DigitsOnly = 0x01
+ LettersOnly = 0x02
+ OnlyMask = 0x0f
+ #
+ self.assertEqual(str(MethodHint.HiddenText|MethodHint.OnlyMask), 'MethodHint.HiddenText|DigitsOnly|LettersOnly|OnlyMask')
+
def test_iter(self):
Color = self.Color
@@ -2919,9 +3114,32 @@ def test_programatic_function_from_dict(self):
def test_pickle(self):
if isinstance(FlagStooges, Exception):
raise FlagStooges
- test_pickle_dump_load(self.assertIs, FlagStooges.CURLY|FlagStooges.MOE)
+ test_pickle_dump_load(self.assertIs, FlagStooges.CURLY)
+ test_pickle_dump_load(self.assertEqual,
+ FlagStooges.CURLY|FlagStooges.MOE)
+ test_pickle_dump_load(self.assertEqual,
+ FlagStooges.CURLY&~FlagStooges.CURLY)
test_pickle_dump_load(self.assertIs, FlagStooges)
+ test_pickle_dump_load(self.assertIs, FlagStoogesWithZero.CURLY)
+ test_pickle_dump_load(self.assertEqual,
+ FlagStoogesWithZero.CURLY|FlagStoogesWithZero.MOE)
+ test_pickle_dump_load(self.assertIs, FlagStoogesWithZero.NOFLAG)
+
+ test_pickle_dump_load(self.assertIs, IntFlagStooges.CURLY)
+ test_pickle_dump_load(self.assertEqual,
+ IntFlagStooges.CURLY|IntFlagStooges.MOE)
+ test_pickle_dump_load(self.assertEqual,
+ IntFlagStooges.CURLY|IntFlagStooges.MOE|0x30)
+ test_pickle_dump_load(self.assertEqual, IntFlagStooges(0))
+ test_pickle_dump_load(self.assertEqual, IntFlagStooges(0x30))
+ test_pickle_dump_load(self.assertIs, IntFlagStooges)
+
+ test_pickle_dump_load(self.assertIs, IntFlagStoogesWithZero.CURLY)
+ test_pickle_dump_load(self.assertEqual,
+ IntFlagStoogesWithZero.CURLY|IntFlagStoogesWithZero.MOE)
+ test_pickle_dump_load(self.assertIs, IntFlagStoogesWithZero.NOFLAG)
+
@unittest.skipIf(
python_version >= (3, 12),
'__contains__ now returns True/False for all inputs',
@@ -3238,6 +3456,10 @@ def test_global_repr_conform1(self):
'%(m)s.OFF_C' % {'m': SHORT_MODULE},
)
+ def test_global_enum_str(self):
+ self.assertEqual(str(NoName.ONE & NoName.TWO), 'NoName(0)')
+ self.assertEqual(str(NoName(0)), 'NoName(0)')
+
def test_format(self):
Perm = self.Perm
self.assertEqual(format(Perm.R, ''), '4')
@@ -3338,7 +3560,10 @@ def test_invert(self):
self.assertIs((Open.WO|Open.CE) & ~Open.WO, Open.CE)
def test_boundary(self):
- self.assertIs(enum.IntFlag._boundary_, EJECT)
+ self.assertIs(enum.IntFlag._boundary_, KEEP)
+ class Simple(IntFlag, boundary=KEEP):
+ SINGLE = 1
+ #
class Iron(IntFlag, boundary=STRICT):
ONE = 1
TWO = 2
@@ -3357,7 +3582,6 @@ class Space(IntFlag, boundary=EJECT):
EIGHT = 8
self.assertIs(Space._boundary_, EJECT)
#
- #
class Bizarre(IntFlag, boundary=KEEP):
b = 3
c = 4
@@ -3374,6 +3598,12 @@ class Bizarre(IntFlag, boundary=KEEP):
self.assertEqual(list(Bizarre), [Bizarre.c])
self.assertIs(Bizarre(3), Bizarre.b)
self.assertIs(Bizarre(6), Bizarre.d)
+ #
+ simple = Simple.SINGLE | Iron.TWO
+ self.assertEqual(simple, 3)
+ self.assertIsInstance(simple, Simple)
+ self.assertEqual(repr(simple), ': 3>')
+ self.assertEqual(str(simple), '3')
def test_iter(self):
Color = self.Color
@@ -3851,6 +4081,16 @@ class Sillier(IntEnum):
triple = 3
value = 4
+ def test_negative_alias(self):
+ @verify(NAMED_FLAGS)
+ class Color(Flag):
+ RED = 1
+ GREEN = 2
+ BLUE = 4
+ WHITE = -1
+ # no error means success
+
+
class TestInternals(unittest.TestCase):
sunder_names = '_bad_', '_good_', '_what_ho_'
@@ -3915,22 +4155,56 @@ class Color(AutoNameEnum):
self.assertEqual(Color.blue.value, 'blue')
self.assertEqual(Color.green.value, 'green')
- def test_auto_garbage(self):
- class Color(Enum):
- red = 'red'
- blue = auto()
+ @unittest.skipIf(
+ python_version >= (3, 13),
+ 'mixed types with auto() no longer supported',
+ )
+ def test_auto_garbage_ok(self):
+ with self.assertWarnsRegex(DeprecationWarning, 'will require all values to be sortable'):
+ class Color(Enum):
+ red = 'red'
+ blue = auto()
self.assertEqual(Color.blue.value, 1)
- def test_auto_garbage_corrected(self):
- class Color(Enum):
- red = 'red'
- blue = 2
- green = auto()
+ @unittest.skipIf(
+ python_version >= (3, 13),
+ 'mixed types with auto() no longer supported',
+ )
+ def test_auto_garbage_corrected_ok(self):
+ with self.assertWarnsRegex(DeprecationWarning, 'will require all values to be sortable'):
+ class Color(Enum):
+ red = 'red'
+ blue = 2
+ green = auto()
+ yellow = auto()
- self.assertEqual(list(Color), [Color.red, Color.blue, Color.green])
+ self.assertEqual(list(Color),
+ [Color.red, Color.blue, Color.green, Color.yellow])
self.assertEqual(Color.red.value, 'red')
self.assertEqual(Color.blue.value, 2)
self.assertEqual(Color.green.value, 3)
+ self.assertEqual(Color.yellow.value, 4)
+
+ @unittest.skipIf(
+ python_version < (3, 13),
+ 'mixed types with auto() will raise in 3.13',
+ )
+ def test_auto_garbage_fail(self):
+ with self.assertRaisesRegex(TypeError, 'will require all values to be sortable'):
+ class Color(Enum):
+ red = 'red'
+ blue = auto()
+
+ @unittest.skipIf(
+ python_version < (3, 13),
+ 'mixed types with auto() will raise in 3.13',
+ )
+ def test_auto_garbage_corrected_fail(self):
+ with self.assertRaisesRegex(TypeError, 'will require all values to be sortable'):
+ class Color(Enum):
+ red = 'red'
+ blue = 2
+ green = auto()
def test_auto_order(self):
with self.assertRaises(TypeError):
@@ -3953,6 +4227,22 @@ def _generate_next_value_(name, start, count, last):
self.assertEqual(Color.red.value, 'pathological case')
self.assertEqual(Color.blue.value, 'blue')
+ @unittest.skipIf(
+ python_version < (3, 13),
+ 'auto() will return highest value + 1 in 3.13',
+ )
+ def test_auto_with_aliases(self):
+ class Color(Enum):
+ red = auto()
+ blue = auto()
+ oxford = blue
+ crimson = red
+ green = auto()
+ self.assertIs(Color.crimson, Color.red)
+ self.assertIs(Color.oxford, Color.blue)
+ self.assertIsNot(Color.green, Color.red)
+ self.assertIsNot(Color.green, Color.blue)
+
def test_duplicate_auto(self):
class Dupes(Enum):
first = primero = auto()
@@ -3960,6 +4250,50 @@ class Dupes(Enum):
third = auto()
self.assertEqual([Dupes.first, Dupes.second, Dupes.third], list(Dupes))
+ def test_multiple_auto_on_line(self):
+ class Huh(Enum):
+ ONE = auto()
+ TWO = auto(), auto()
+ THREE = auto(), auto(), auto()
+ self.assertEqual(Huh.ONE.value, 1)
+ self.assertEqual(Huh.TWO.value, (2, 3))
+ self.assertEqual(Huh.THREE.value, (4, 5, 6))
+ #
+ class Hah(Enum):
+ def __new__(cls, value, abbr=None):
+ member = object.__new__(cls)
+ member._value_ = value
+ member.abbr = abbr or value[:3].lower()
+ return member
+ def _generate_next_value_(name, start, count, last):
+ return name
+ #
+ MONDAY = auto()
+ TUESDAY = auto()
+ WEDNESDAY = auto(), 'WED'
+ THURSDAY = auto(), 'Thu'
+ FRIDAY = auto()
+ self.assertEqual(Hah.MONDAY.value, 'MONDAY')
+ self.assertEqual(Hah.MONDAY.abbr, 'mon')
+ self.assertEqual(Hah.TUESDAY.value, 'TUESDAY')
+ self.assertEqual(Hah.TUESDAY.abbr, 'tue')
+ self.assertEqual(Hah.WEDNESDAY.value, 'WEDNESDAY')
+ self.assertEqual(Hah.WEDNESDAY.abbr, 'WED')
+ self.assertEqual(Hah.THURSDAY.value, 'THURSDAY')
+ self.assertEqual(Hah.THURSDAY.abbr, 'Thu')
+ self.assertEqual(Hah.FRIDAY.value, 'FRIDAY')
+ self.assertEqual(Hah.FRIDAY.abbr, 'fri')
+ #
+ class Huh(Enum):
+ def _generate_next_value_(name, start, count, last):
+ return count+1
+ ONE = auto()
+ TWO = auto(), auto()
+ THREE = auto(), auto(), auto()
+ self.assertEqual(Huh.ONE.value, 1)
+ self.assertEqual(Huh.TWO.value, (2, 2))
+ self.assertEqual(Huh.THREE.value, (3, 3, 3))
+
class TestEnumTypeSubclassing(unittest.TestCase):
pass
@@ -3969,36 +4303,6 @@ class TestEnumTypeSubclassing(unittest.TestCase):
class Color(enum.Enum)
| Color(value, names=None, *, module=None, qualname=None, type=None, start=1, boundary=None)
|\x20\x20
- | A collection of name/value pairs.
- |\x20\x20
- | Access them by:
- |\x20\x20
- | - attribute access::
- |\x20\x20
- | >>> Color.CYAN
- |
- |\x20\x20
- | - value lookup:
- |\x20\x20
- | >>> Color(1)
- |
- |\x20\x20
- | - name lookup:
- |\x20\x20
- | >>> Color['CYAN']
- |
- |\x20\x20
- | Enumerations can be iterated over, and know how many members they have:
- |\x20\x20
- | >>> len(Color)
- | 3
- |\x20\x20
- | >>> list(Color)
- | [, , ]
- |\x20\x20
- | Methods can be added to enumerations, and members can have their own
- | attributes -- see the documentation for details.
- |\x20\x20
| Method resolution order:
| Color
| enum.Enum
@@ -4206,10 +4510,16 @@ class SimpleColor:
CYAN = 1
MAGENTA = 2
YELLOW = 3
+ @bltns.property
+ def zeroth(self):
+ return 'zeroed %s' % self.name
class CheckedColor(Enum):
CYAN = 1
MAGENTA = 2
YELLOW = 3
+ @bltns.property
+ def zeroth(self):
+ return 'zeroed %s' % self.name
self.assertTrue(_test_simple_enum(CheckedColor, SimpleColor) is None)
SimpleColor.MAGENTA._value_ = 9
self.assertRaisesRegex(
@@ -4244,157 +4554,28 @@ def test__all__(self):
def test_doc_1(self):
class Single(Enum):
ONE = 1
- self.assertEqual(
- Single.__doc__,
- dedent("""\
- A collection of name/value pairs.
-
- Access them by:
-
- - attribute access::
-
- >>> Single.ONE
-
-
- - value lookup:
-
- >>> Single(1)
-
-
- - name lookup:
-
- >>> Single['ONE']
-
-
- Enumerations can be iterated over, and know how many members they have:
-
- >>> len(Single)
- 1
-
- >>> list(Single)
- []
-
- Methods can be added to enumerations, and members can have their own
- attributes -- see the documentation for details.
- """))
+ self.assertEqual(Single.__doc__, None)
def test_doc_2(self):
class Double(Enum):
ONE = 1
TWO = 2
- self.assertEqual(
- Double.__doc__,
- dedent("""\
- A collection of name/value pairs.
-
- Access them by:
-
- - attribute access::
-
- >>> Double.ONE
-
+ self.assertEqual(Double.__doc__, None)
- - value lookup:
-
- >>> Double(1)
-
-
- - name lookup:
-
- >>> Double['ONE']
-
-
- Enumerations can be iterated over, and know how many members they have:
-
- >>> len(Double)
- 2
-
- >>> list(Double)
- [, ]
-
- Methods can be added to enumerations, and members can have their own
- attributes -- see the documentation for details.
- """))
-
-
- def test_doc_1(self):
+ def test_doc_3(self):
class Triple(Enum):
ONE = 1
TWO = 2
THREE = 3
- self.assertEqual(
- Triple.__doc__,
- dedent("""\
- A collection of name/value pairs.
-
- Access them by:
+ self.assertEqual(Triple.__doc__, None)
- - attribute access::
-
- >>> Triple.ONE
-
-
- - value lookup:
-
- >>> Triple(1)
-
-
- - name lookup:
-
- >>> Triple['ONE']
-
-
- Enumerations can be iterated over, and know how many members they have:
-
- >>> len(Triple)
- 3
-
- >>> list(Triple)
- [, , ]
-
- Methods can be added to enumerations, and members can have their own
- attributes -- see the documentation for details.
- """))
-
- def test_doc_1(self):
+ def test_doc_4(self):
class Quadruple(Enum):
ONE = 1
TWO = 2
THREE = 3
FOUR = 4
- self.assertEqual(
- Quadruple.__doc__,
- dedent("""\
- A collection of name/value pairs.
-
- Access them by:
-
- - attribute access::
-
- >>> Quadruple.ONE
-
-
- - value lookup:
-
- >>> Quadruple(1)
-
-
- - name lookup:
-
- >>> Quadruple['ONE']
-
-
- Enumerations can be iterated over, and know how many members they have:
-
- >>> len(Quadruple)
- 4
-
- >>> list(Quadruple)[:3]
- [, , ]
-
- Methods can be added to enumerations, and members can have their own
- attributes -- see the documentation for details.
- """))
+ self.assertEqual(Quadruple.__doc__, None)
# These are unordered here on purpose to ensure that declaration order
diff --git a/Lib/test/test_except_star.py b/Lib/test/test_except_star.py
index 490b159e3b71b2..6d6f6043b83b2f 100644
--- a/Lib/test/test_except_star.py
+++ b/Lib/test/test_except_star.py
@@ -208,44 +208,38 @@ def assertMetadataNotEqual(self, e1, e2):
class TestExceptStarSplitSemantics(ExceptStarTest):
def doSplitTestNamed(self, exc, T, match_template, rest_template):
- initial_exc_info = sys.exc_info()
- exc_info = match = rest = None
+ initial_sys_exception = sys.exception()
+ sys_exception = match = rest = None
try:
try:
raise exc
except* T as e:
- exc_info = sys.exc_info()
+ sys_exception = sys.exception()
match = e
except BaseException as e:
rest = e
- if match_template:
- self.assertEqual(exc_info[1], match)
- else:
- self.assertIsNone(exc_info)
+ self.assertEqual(sys_exception, match)
self.assertExceptionIsLike(match, match_template)
self.assertExceptionIsLike(rest, rest_template)
- self.assertEqual(sys.exc_info(), initial_exc_info)
+ self.assertEqual(sys.exception(), initial_sys_exception)
def doSplitTestUnnamed(self, exc, T, match_template, rest_template):
- initial_exc_info = sys.exc_info()
- exc_info = match = rest = None
+ initial_sys_exception = sys.exception()
+ sys_exception = match = rest = None
try:
try:
raise exc
except* T:
- exc_info = sys.exc_info()
- match = sys.exc_info()[1]
+ sys_exception = match = sys.exception()
else:
if rest_template:
self.fail("Exception not raised")
except BaseException as e:
rest = e
self.assertExceptionIsLike(match, match_template)
- if match_template:
- self.assertEqual(exc_info[0], type(match_template))
self.assertExceptionIsLike(rest, rest_template)
- self.assertEqual(sys.exc_info(), initial_exc_info)
+ self.assertEqual(sys.exception(), initial_sys_exception)
def doSplitTestInExceptHandler(self, exc, T, match_template, rest_template):
try:
@@ -409,11 +403,11 @@ def test_multiple_matches_unnamed(self):
try:
raise ExceptionGroup("mmu", [OSError("os"), BlockingIOError("io")])
except* BlockingIOError:
- e = sys.exc_info()[1]
+ e = sys.exception()
self.assertExceptionIsLike(e,
ExceptionGroup("mmu", [BlockingIOError("io")]))
except* OSError:
- e = sys.exc_info()[1]
+ e = sys.exception()
self.assertExceptionIsLike(e,
ExceptionGroup("mmu", [OSError("os")]))
else:
@@ -434,7 +428,7 @@ def test_first_match_wins_unnamed(self):
try:
raise ExceptionGroup("fstu", [BlockingIOError("io")])
except* OSError:
- e = sys.exc_info()[1]
+ e = sys.exception()
self.assertExceptionIsLike(e,
ExceptionGroup("fstu", [BlockingIOError("io")]))
except* BlockingIOError:
@@ -452,7 +446,7 @@ def test_nested_except_stars(self):
pass
else:
self.fail("Exception not raised")
- e = sys.exc_info()[1]
+ e = sys.exception()
self.assertExceptionIsLike(e,
ExceptionGroup("n", [BlockingIOError("io")]))
else:
@@ -642,18 +636,17 @@ def test_raise_handle_all_raise_one_named(self):
raise orig
except* (TypeError, ValueError) as e:
raise SyntaxError(3)
- except BaseException as e:
+ except SyntaxError as e:
exc = e
- self.assertExceptionIsLike(
- exc, ExceptionGroup("", [SyntaxError(3)]))
+ self.assertExceptionIsLike(exc, SyntaxError(3))
self.assertExceptionIsLike(
- exc.exceptions[0].__context__,
+ exc.__context__,
ExceptionGroup("eg", [TypeError(1), ValueError(2)]))
self.assertMetadataNotEqual(orig, exc)
- self.assertMetadataEqual(orig, exc.exceptions[0].__context__)
+ self.assertMetadataEqual(orig, exc.__context__)
def test_raise_handle_all_raise_one_unnamed(self):
orig = ExceptionGroup("eg", [TypeError(1), ValueError(2)])
@@ -662,18 +655,17 @@ def test_raise_handle_all_raise_one_unnamed(self):
raise orig
except* (TypeError, ValueError) as e:
raise SyntaxError(3)
- except ExceptionGroup as e:
+ except SyntaxError as e:
exc = e
- self.assertExceptionIsLike(
- exc, ExceptionGroup("", [SyntaxError(3)]))
+ self.assertExceptionIsLike(exc, SyntaxError(3))
self.assertExceptionIsLike(
- exc.exceptions[0].__context__,
+ exc.__context__,
ExceptionGroup("eg", [TypeError(1), ValueError(2)]))
self.assertMetadataNotEqual(orig, exc)
- self.assertMetadataEqual(orig, exc.exceptions[0].__context__)
+ self.assertMetadataEqual(orig, exc.__context__)
def test_raise_handle_all_raise_two_named(self):
orig = ExceptionGroup("eg", [TypeError(1), ValueError(2)])
@@ -766,7 +758,7 @@ def test_raise_unnamed(self):
try:
raise orig
except* OSError:
- e = sys.exc_info()[1]
+ e = sys.exception()
raise TypeError(3) from e
except ExceptionGroup as e:
exc = e
@@ -797,23 +789,22 @@ def test_raise_handle_all_raise_one_named(self):
raise orig
except* (TypeError, ValueError) as e:
raise SyntaxError(3) from e
- except BaseException as e:
+ except SyntaxError as e:
exc = e
- self.assertExceptionIsLike(
- exc, ExceptionGroup("", [SyntaxError(3)]))
+ self.assertExceptionIsLike(exc, SyntaxError(3))
self.assertExceptionIsLike(
- exc.exceptions[0].__context__,
+ exc.__context__,
ExceptionGroup("eg", [TypeError(1), ValueError(2)]))
self.assertExceptionIsLike(
- exc.exceptions[0].__cause__,
+ exc.__cause__,
ExceptionGroup("eg", [TypeError(1), ValueError(2)]))
self.assertMetadataNotEqual(orig, exc)
- self.assertMetadataEqual(orig, exc.exceptions[0].__context__)
- self.assertMetadataEqual(orig, exc.exceptions[0].__cause__)
+ self.assertMetadataEqual(orig, exc.__context__)
+ self.assertMetadataEqual(orig, exc.__cause__)
def test_raise_handle_all_raise_one_unnamed(self):
orig = ExceptionGroup("eg", [TypeError(1), ValueError(2)])
@@ -821,25 +812,24 @@ def test_raise_handle_all_raise_one_unnamed(self):
try:
raise orig
except* (TypeError, ValueError) as e:
- e = sys.exc_info()[1]
+ e = sys.exception()
raise SyntaxError(3) from e
- except ExceptionGroup as e:
+ except SyntaxError as e:
exc = e
- self.assertExceptionIsLike(
- exc, ExceptionGroup("", [SyntaxError(3)]))
+ self.assertExceptionIsLike(exc, SyntaxError(3))
self.assertExceptionIsLike(
- exc.exceptions[0].__context__,
+ exc.__context__,
ExceptionGroup("eg", [TypeError(1), ValueError(2)]))
self.assertExceptionIsLike(
- exc.exceptions[0].__cause__,
+ exc.__cause__,
ExceptionGroup("eg", [TypeError(1), ValueError(2)]))
self.assertMetadataNotEqual(orig, exc)
- self.assertMetadataEqual(orig, exc.exceptions[0].__context__)
- self.assertMetadataEqual(orig, exc.exceptions[0].__cause__)
+ self.assertMetadataEqual(orig, exc.__context__)
+ self.assertMetadataEqual(orig, exc.__cause__)
def test_raise_handle_all_raise_two_named(self):
orig = ExceptionGroup("eg", [TypeError(1), ValueError(2)])
@@ -882,10 +872,10 @@ def test_raise_handle_all_raise_two_unnamed(self):
try:
raise orig
except* TypeError:
- e = sys.exc_info()[1]
+ e = sys.exception()
raise SyntaxError(3) from e
except* ValueError:
- e = sys.exc_info()[1]
+ e = sys.exception()
raise SyntaxError(4) from e
except ExceptionGroup as e:
exc = e
@@ -955,7 +945,7 @@ def derive(self, excs):
def test_falsy_exception_group_subclass(self):
class FalsyEG(ExceptionGroup):
def __bool__(self):
- return False
+ return False
def derive(self, excs):
return FalsyEG(self.message, excs)
@@ -982,7 +972,7 @@ def derive(self, excs):
class TestExceptStarCleanup(ExceptStarTest):
- def test_exc_info_restored(self):
+ def test_sys_exception_restored(self):
try:
try:
raise ValueError(42)
@@ -997,7 +987,206 @@ def test_exc_info_restored(self):
self.assertExceptionIsLike(exc, ZeroDivisionError('division by zero'))
self.assertExceptionIsLike(exc.__context__, ValueError(42))
- self.assertEqual(sys.exc_info(), (None, None, None))
+ self.assertEqual(sys.exception(), None)
+
+
+class TestExceptStar_WeirdLeafExceptions(ExceptStarTest):
+ # Test that except* works when leaf exceptions are
+ # unhashable or have a bad custom __eq__
+
+ class UnhashableExc(ValueError):
+ __hash__ = None
+
+ class AlwaysEqualExc(ValueError):
+ def __eq__(self, other):
+ return True
+
+ class NeverEqualExc(ValueError):
+ def __eq__(self, other):
+ return False
+
+ class BrokenEqualExc(ValueError):
+ def __eq__(self, other):
+ raise RuntimeError()
+
+ def setUp(self):
+ self.bad_types = [self.UnhashableExc,
+ self.AlwaysEqualExc,
+ self.NeverEqualExc,
+ self.BrokenEqualExc]
+
+ def except_type(self, eg, type):
+ match, rest = None, None
+ try:
+ try:
+ raise eg
+ except* type as e:
+ match = e
+ except Exception as e:
+ rest = e
+ return match, rest
+
+ def test_catch_unhashable_leaf_exception(self):
+ for Bad in self.bad_types:
+ with self.subTest(Bad):
+ eg = ExceptionGroup("eg", [TypeError(1), Bad(2)])
+ match, rest = self.except_type(eg, Bad)
+ self.assertExceptionIsLike(
+ match, ExceptionGroup("eg", [Bad(2)]))
+ self.assertExceptionIsLike(
+ rest, ExceptionGroup("eg", [TypeError(1)]))
+
+ def test_propagate_unhashable_leaf(self):
+ for Bad in self.bad_types:
+ with self.subTest(Bad):
+ eg = ExceptionGroup("eg", [TypeError(1), Bad(2)])
+ match, rest = self.except_type(eg, TypeError)
+ self.assertExceptionIsLike(
+ match, ExceptionGroup("eg", [TypeError(1)]))
+ self.assertExceptionIsLike(
+ rest, ExceptionGroup("eg", [Bad(2)]))
+
+ def test_catch_nothing_unhashable_leaf(self):
+ for Bad in self.bad_types:
+ with self.subTest(Bad):
+ eg = ExceptionGroup("eg", [TypeError(1), Bad(2)])
+ match, rest = self.except_type(eg, OSError)
+ self.assertIsNone(match)
+ self.assertExceptionIsLike(rest, eg)
+
+ def test_catch_everything_unhashable_leaf(self):
+ for Bad in self.bad_types:
+ with self.subTest(Bad):
+ eg = ExceptionGroup("eg", [TypeError(1), Bad(2)])
+ match, rest = self.except_type(eg, Exception)
+ self.assertExceptionIsLike(match, eg)
+ self.assertIsNone(rest)
+
+ def test_reraise_unhashable_leaf(self):
+ for Bad in self.bad_types:
+ with self.subTest(Bad):
+ eg = ExceptionGroup(
+ "eg", [TypeError(1), Bad(2), ValueError(3)])
+
+ try:
+ try:
+ raise eg
+ except* TypeError:
+ pass
+ except* Bad:
+ raise
+ except Exception as e:
+ exc = e
+
+ self.assertExceptionIsLike(
+ exc, ExceptionGroup("eg", [Bad(2), ValueError(3)]))
+
+
+class TestExceptStar_WeirdExceptionGroupSubclass(ExceptStarTest):
+ # Test that except* works with exception groups that are
+ # unhashable or have a bad custom __eq__
+
+ class UnhashableEG(ExceptionGroup):
+ __hash__ = None
+
+ def derive(self, excs):
+ return type(self)(self.message, excs)
+
+ class AlwaysEqualEG(ExceptionGroup):
+ def __eq__(self, other):
+ return True
+
+ def derive(self, excs):
+ return type(self)(self.message, excs)
+
+ class NeverEqualEG(ExceptionGroup):
+ def __eq__(self, other):
+ return False
+
+ def derive(self, excs):
+ return type(self)(self.message, excs)
+
+ class BrokenEqualEG(ExceptionGroup):
+ def __eq__(self, other):
+ raise RuntimeError()
+
+ def derive(self, excs):
+ return type(self)(self.message, excs)
+
+ def setUp(self):
+ self.bad_types = [self.UnhashableEG,
+ self.AlwaysEqualEG,
+ self.NeverEqualEG,
+ self.BrokenEqualEG]
+
+ def except_type(self, eg, type):
+ match, rest = None, None
+ try:
+ try:
+ raise eg
+ except* type as e:
+ match = e
+ except Exception as e:
+ rest = e
+ return match, rest
+
+ def test_catch_some_unhashable_exception_group_subclass(self):
+ for BadEG in self.bad_types:
+ with self.subTest(BadEG):
+ eg = BadEG("eg",
+ [TypeError(1),
+ BadEG("nested", [ValueError(2)])])
+
+ match, rest = self.except_type(eg, TypeError)
+ self.assertExceptionIsLike(match, BadEG("eg", [TypeError(1)]))
+ self.assertExceptionIsLike(rest,
+ BadEG("eg", [BadEG("nested", [ValueError(2)])]))
+
+ def test_catch_none_unhashable_exception_group_subclass(self):
+ for BadEG in self.bad_types:
+ with self.subTest(BadEG):
+
+ eg = BadEG("eg",
+ [TypeError(1),
+ BadEG("nested", [ValueError(2)])])
+
+ match, rest = self.except_type(eg, OSError)
+ self.assertIsNone(match)
+ self.assertExceptionIsLike(rest, eg)
+
+ def test_catch_all_unhashable_exception_group_subclass(self):
+ for BadEG in self.bad_types:
+ with self.subTest(BadEG):
+
+ eg = BadEG("eg",
+ [TypeError(1),
+ BadEG("nested", [ValueError(2)])])
+
+ match, rest = self.except_type(eg, Exception)
+ self.assertExceptionIsLike(match, eg)
+ self.assertIsNone(rest)
+
+ def test_reraise_unhashable_eg(self):
+ for BadEG in self.bad_types:
+ with self.subTest(BadEG):
+
+ eg = BadEG("eg",
+ [TypeError(1), ValueError(2),
+ BadEG("nested", [ValueError(3), OSError(4)])])
+
+ try:
+ try:
+ raise eg
+ except* ValueError:
+ pass
+ except* OSError:
+ raise
+ except Exception as e:
+ exc = e
+
+ self.assertExceptionIsLike(
+ exc, BadEG("eg", [TypeError(1),
+ BadEG("nested", [OSError(4)])]))
if __name__ == '__main__':
diff --git a/Lib/test/test_exception_group.py b/Lib/test/test_exception_group.py
index 2cfd8738304d1c..a61af067cb2a30 100644
--- a/Lib/test/test_exception_group.py
+++ b/Lib/test/test_exception_group.py
@@ -79,16 +79,44 @@ def test_BEG_wraps_BaseException__creates_BEG(self):
beg = BaseExceptionGroup("beg", [ValueError(1), KeyboardInterrupt(2)])
self.assertIs(type(beg), BaseExceptionGroup)
- def test_EG_subclass_wraps_anything(self):
+ def test_EG_subclass_wraps_non_base_exceptions(self):
class MyEG(ExceptionGroup):
pass
self.assertIs(
type(MyEG("eg", [ValueError(12), TypeError(42)])),
MyEG)
- self.assertIs(
- type(MyEG("eg", [ValueError(12), KeyboardInterrupt(42)])),
- MyEG)
+
+ def test_EG_subclass_does_not_wrap_base_exceptions(self):
+ class MyEG(ExceptionGroup):
+ pass
+
+ msg = "Cannot nest BaseExceptions in 'MyEG'"
+ with self.assertRaisesRegex(TypeError, msg):
+ MyEG("eg", [ValueError(12), KeyboardInterrupt(42)])
+
+ def test_BEG_and_E_subclass_does_not_wrap_base_exceptions(self):
+ class MyEG(BaseExceptionGroup, ValueError):
+ pass
+
+ msg = "Cannot nest BaseExceptions in 'MyEG'"
+ with self.assertRaisesRegex(TypeError, msg):
+ MyEG("eg", [ValueError(12), KeyboardInterrupt(42)])
+
+ def test_EG_and_specific_subclass_can_wrap_any_nonbase_exception(self):
+ class MyEG(ExceptionGroup, ValueError):
+ pass
+
+ # The restriction is specific to Exception, not "the other base class"
+ MyEG("eg", [ValueError(12), Exception()])
+
+ def test_BEG_and_specific_subclass_can_wrap_any_nonbase_exception(self):
+ class MyEG(BaseExceptionGroup, ValueError):
+ pass
+
+ # The restriction is specific to Exception, not "the other base class"
+ MyEG("eg", [ValueError(12), Exception()])
+
def test_BEG_subclass_wraps_anything(self):
class MyBEG(BaseExceptionGroup):
diff --git a/Lib/test/test_exception_hierarchy.py b/Lib/test/test_exception_hierarchy.py
index 89fe9ddcefba3e..3318fa8e7746f7 100644
--- a/Lib/test/test_exception_hierarchy.py
+++ b/Lib/test/test_exception_hierarchy.py
@@ -63,7 +63,7 @@ def test_select_error(self):
+-- InterruptedError EINTR
+-- IsADirectoryError EISDIR
+-- NotADirectoryError ENOTDIR
- +-- PermissionError EACCES, EPERM
+ +-- PermissionError EACCES, EPERM, ENOTCAPABLE
+-- ProcessLookupError ESRCH
+-- TimeoutError ETIMEDOUT
"""
@@ -75,6 +75,8 @@ def _make_map(s):
continue
excname, _, errnames = line.partition(' ')
for errname in filter(None, errnames.strip().split(', ')):
+ if errname == "ENOTCAPABLE" and not hasattr(errno, errname):
+ continue
_map[getattr(errno, errname)] = getattr(builtins, excname)
return _map
_map = _make_map(_pep_map)
@@ -91,7 +93,7 @@ def test_errno_mapping(self):
othercodes = set(errno.errorcode) - set(self._map)
for errcode in othercodes:
e = OSError(errcode, "Some message")
- self.assertIs(type(e), OSError)
+ self.assertIs(type(e), OSError, repr(e))
def test_try_except(self):
filename = "some_hopefully_non_existing_file"
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index ff1a02821a58fc..d7133adf058920 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -2058,6 +2058,11 @@ class A:
except AttributeError as exc:
self.assertEqual("bluch", exc.name)
self.assertEqual(obj, exc.obj)
+ try:
+ object.__getattribute__(obj, "bluch")
+ except AttributeError as exc:
+ self.assertEqual("bluch", exc.name)
+ self.assertEqual(obj, exc.obj)
def test_getattr_has_name_and_obj_for_method(self):
class A:
diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py
index fc8c39365f12b7..8e98256a62c6d6 100644
--- a/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@ -200,7 +200,7 @@ def test_fcntl_f_pipesize(self):
pipesize_default = fcntl.fcntl(test_pipe_w, fcntl.F_GETPIPE_SZ)
pipesize = pipesize_default // 2 # A new value to detect change.
if pipesize < 512: # the POSIX minimum
- raise unittest.SkitTest(
+ raise unittest.SkipTest(
'default pipesize too small to perform test.')
fcntl.fcntl(test_pipe_w, fcntl.F_SETPIPE_SZ, pipesize)
self.assertEqual(fcntl.fcntl(test_pipe_w, fcntl.F_GETPIPE_SZ),
diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py
index 819200010a2230..786d9186634305 100644
--- a/Lib/test/test_fileinput.py
+++ b/Lib/test/test_fileinput.py
@@ -326,6 +326,16 @@ def test_inplace_binary_write_mode(self):
with open(temp_file, 'rb') as f:
self.assertEqual(f.read(), b'New line.')
+ def test_inplace_encoding_errors(self):
+ temp_file = self.writeTmp(b'Initial text \x88', mode='wb')
+ with FileInput(temp_file, inplace=True,
+ encoding="ascii", errors="replace") as fobj:
+ line = fobj.readline()
+ self.assertEqual(line, 'Initial text \ufffd')
+ print("New line \x88")
+ with open(temp_file, 'rb') as f:
+ self.assertEqual(f.read().rstrip(b'\r\n'), b'New line ?')
+
def test_file_hook_backward_compatibility(self):
def old_hook(filename, mode):
return io.StringIO("I used to receive only filename and mode")
@@ -845,29 +855,29 @@ def setUp(self):
self.fake_open = InvocationRecorder()
def test_empty_string(self):
- self.do_test_use_builtin_open("", 1)
+ self.do_test_use_builtin_open_text("", "r")
def test_no_ext(self):
- self.do_test_use_builtin_open("abcd", 2)
+ self.do_test_use_builtin_open_text("abcd", "r")
@unittest.skipUnless(gzip, "Requires gzip and zlib")
def test_gz_ext_fake(self):
original_open = gzip.open
gzip.open = self.fake_open
try:
- result = fileinput.hook_compressed("test.gz", "3")
+ result = fileinput.hook_compressed("test.gz", "r")
finally:
gzip.open = original_open
self.assertEqual(self.fake_open.invocation_count, 1)
- self.assertEqual(self.fake_open.last_invocation, (("test.gz", "3"), {}))
+ self.assertEqual(self.fake_open.last_invocation, (("test.gz", "r"), {}))
@unittest.skipUnless(gzip, "Requires gzip and zlib")
def test_gz_with_encoding_fake(self):
original_open = gzip.open
gzip.open = lambda filename, mode: io.BytesIO(b'Ex-binary string')
try:
- result = fileinput.hook_compressed("test.gz", "3", encoding="utf-8")
+ result = fileinput.hook_compressed("test.gz", "r", encoding="utf-8")
finally:
gzip.open = original_open
self.assertEqual(list(result), ['Ex-binary string'])
@@ -877,23 +887,40 @@ def test_bz2_ext_fake(self):
original_open = bz2.BZ2File
bz2.BZ2File = self.fake_open
try:
- result = fileinput.hook_compressed("test.bz2", "4")
+ result = fileinput.hook_compressed("test.bz2", "r")
finally:
bz2.BZ2File = original_open
self.assertEqual(self.fake_open.invocation_count, 1)
- self.assertEqual(self.fake_open.last_invocation, (("test.bz2", "4"), {}))
+ self.assertEqual(self.fake_open.last_invocation, (("test.bz2", "r"), {}))
def test_blah_ext(self):
- self.do_test_use_builtin_open("abcd.blah", "5")
+ self.do_test_use_builtin_open_binary("abcd.blah", "rb")
def test_gz_ext_builtin(self):
- self.do_test_use_builtin_open("abcd.Gz", "6")
+ self.do_test_use_builtin_open_binary("abcd.Gz", "rb")
def test_bz2_ext_builtin(self):
- self.do_test_use_builtin_open("abcd.Bz2", "7")
+ self.do_test_use_builtin_open_binary("abcd.Bz2", "rb")
+
+ def test_binary_mode_encoding(self):
+ self.do_test_use_builtin_open_binary("abcd", "rb")
+
+ def test_text_mode_encoding(self):
+ self.do_test_use_builtin_open_text("abcd", "r")
+
+ def do_test_use_builtin_open_binary(self, filename, mode):
+ original_open = self.replace_builtin_open(self.fake_open)
+ try:
+ result = fileinput.hook_compressed(filename, mode)
+ finally:
+ self.replace_builtin_open(original_open)
+
+ self.assertEqual(self.fake_open.invocation_count, 1)
+ self.assertEqual(self.fake_open.last_invocation,
+ ((filename, mode), {'encoding': None, 'errors': None}))
- def do_test_use_builtin_open(self, filename, mode):
+ def do_test_use_builtin_open_text(self, filename, mode):
original_open = self.replace_builtin_open(self.fake_open)
try:
result = fileinput.hook_compressed(filename, mode)
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index e4984d3cd559e3..5cc3d4bf9f5db0 100644
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -9,8 +9,12 @@
from weakref import proxy
from functools import wraps
-from test.support import cpython_only, swap_attr, gc_collect, is_emscripten
-from test.support.os_helper import (TESTFN, TESTFN_UNICODE, make_bad_fd)
+from test.support import (
+ cpython_only, swap_attr, gc_collect, is_emscripten, is_wasi
+)
+from test.support.os_helper import (
+ TESTFN, TESTFN_ASCII, TESTFN_UNICODE, make_bad_fd,
+ )
from test.support.warnings_helper import check_warnings
from collections import UserList
@@ -65,6 +69,7 @@ def testAttributes(self):
self.assertRaises((AttributeError, TypeError),
setattr, f, attr, 'oops')
+ @unittest.skipIf(is_wasi, "WASI does not expose st_blksize.")
def testBlksize(self):
# test private _blksize attribute
blksize = io.DEFAULT_BUFFER_SIZE
@@ -428,18 +433,15 @@ def testUnicodeOpen(self):
def testBytesOpen(self):
# Opening a bytes filename
- try:
- fn = TESTFN.encode("ascii")
- except UnicodeEncodeError:
- self.skipTest('could not encode %r to ascii' % TESTFN)
+ fn = TESTFN_ASCII.encode("ascii")
f = self.FileIO(fn, "w")
try:
f.write(b"abc")
f.close()
- with open(TESTFN, "rb") as f:
+ with open(TESTFN_ASCII, "rb") as f:
self.assertEqual(f.read(), b"abc")
finally:
- os.unlink(TESTFN)
+ os.unlink(TESTFN_ASCII)
@unittest.skipIf(sys.getfilesystemencoding() != 'utf-8',
"test only works for utf-8 filesystems")
diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py
index d8c0fe1854eba5..304388e1f78c97 100644
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -138,6 +138,10 @@ def check(s):
check('123\xbd')
check(' 123 456 ')
check(b' 123 456 ')
+ # all whitespace (cf. https://github.com/python/cpython/issues/95605)
+ check('')
+ check(' ')
+ check('\t \n')
# non-ascii digits (error came from non-digit '!')
check('\u0663\u0661\u0664!')
@@ -832,6 +836,11 @@ def test_inf_nan(self):
self.assertRaises(TypeError, round, NAN, "ceci n'est pas un integer")
self.assertRaises(TypeError, round, -0.0, 1j)
+ def test_inf_nan_ndigits(self):
+ self.assertEqual(round(INF, 0), INF)
+ self.assertEqual(round(-INF, 0), -INF)
+ self.assertTrue(math.isnan(round(NAN, 0)))
+
def test_large_n(self):
for n in [324, 325, 400, 2**31-1, 2**31, 2**32, 2**100]:
self.assertEqual(round(123.456, n), 123.456)
diff --git a/Lib/test/test_fnmatch.py b/Lib/test/test_fnmatch.py
index ca695d6f3f019b..10ed496d4e2f37 100644
--- a/Lib/test/test_fnmatch.py
+++ b/Lib/test/test_fnmatch.py
@@ -2,6 +2,7 @@
import unittest
import os
+import string
import warnings
from fnmatch import fnmatch, fnmatchcase, translate, filter
@@ -91,6 +92,119 @@ def test_sep(self):
check('usr/bin', 'usr\\bin', normsep)
check('usr\\bin', 'usr\\bin')
+ def test_char_set(self):
+ ignorecase = os.path.normcase('ABC') == os.path.normcase('abc')
+ check = self.check_match
+ tescases = string.ascii_lowercase + string.digits + string.punctuation
+ for c in tescases:
+ check(c, '[az]', c in 'az')
+ check(c, '[!az]', c not in 'az')
+ # Case insensitive.
+ for c in tescases:
+ check(c, '[AZ]', (c in 'az') and ignorecase)
+ check(c, '[!AZ]', (c not in 'az') or not ignorecase)
+ for c in string.ascii_uppercase:
+ check(c, '[az]', (c in 'AZ') and ignorecase)
+ check(c, '[!az]', (c not in 'AZ') or not ignorecase)
+ # Repeated same character.
+ for c in tescases:
+ check(c, '[aa]', c == 'a')
+ # Special cases.
+ for c in tescases:
+ check(c, '[^az]', c in '^az')
+ check(c, '[[az]', c in '[az')
+ check(c, r'[!]]', c != ']')
+ check('[', '[')
+ check('[]', '[]')
+ check('[!', '[!')
+ check('[!]', '[!]')
+
+ def test_range(self):
+ ignorecase = os.path.normcase('ABC') == os.path.normcase('abc')
+ normsep = os.path.normcase('\\') == os.path.normcase('/')
+ check = self.check_match
+ tescases = string.ascii_lowercase + string.digits + string.punctuation
+ for c in tescases:
+ check(c, '[b-d]', c in 'bcd')
+ check(c, '[!b-d]', c not in 'bcd')
+ check(c, '[b-dx-z]', c in 'bcdxyz')
+ check(c, '[!b-dx-z]', c not in 'bcdxyz')
+ # Case insensitive.
+ for c in tescases:
+ check(c, '[B-D]', (c in 'bcd') and ignorecase)
+ check(c, '[!B-D]', (c not in 'bcd') or not ignorecase)
+ for c in string.ascii_uppercase:
+ check(c, '[b-d]', (c in 'BCD') and ignorecase)
+ check(c, '[!b-d]', (c not in 'BCD') or not ignorecase)
+ # Upper bound == lower bound.
+ for c in tescases:
+ check(c, '[b-b]', c == 'b')
+ # Special cases.
+ for c in tescases:
+ check(c, '[!-#]', c not in '-#')
+ check(c, '[!--.]', c not in '-.')
+ check(c, '[^-`]', c in '^_`')
+ if not (normsep and c == '/'):
+ check(c, '[[-^]', c in r'[\]^')
+ check(c, r'[\-^]', c in r'\]^')
+ check(c, '[b-]', c in '-b')
+ check(c, '[!b-]', c not in '-b')
+ check(c, '[-b]', c in '-b')
+ check(c, '[!-b]', c not in '-b')
+ check(c, '[-]', c in '-')
+ check(c, '[!-]', c not in '-')
+ # Upper bound is less that lower bound: error in RE.
+ for c in tescases:
+ check(c, '[d-b]', False)
+ check(c, '[!d-b]', True)
+ check(c, '[d-bx-z]', c in 'xyz')
+ check(c, '[!d-bx-z]', c not in 'xyz')
+ check(c, '[d-b^-`]', c in '^_`')
+ if not (normsep and c == '/'):
+ check(c, '[d-b[-^]', c in r'[\]^')
+
+ def test_sep_in_char_set(self):
+ normsep = os.path.normcase('\\') == os.path.normcase('/')
+ check = self.check_match
+ check('/', r'[/]')
+ check('\\', r'[\]')
+ check('/', r'[\]', normsep)
+ check('\\', r'[/]', normsep)
+ check('[/]', r'[/]', False)
+ check(r'[\\]', r'[/]', False)
+ check('\\', r'[\t]')
+ check('/', r'[\t]', normsep)
+ check('t', r'[\t]')
+ check('\t', r'[\t]', False)
+
+ def test_sep_in_range(self):
+ normsep = os.path.normcase('\\') == os.path.normcase('/')
+ check = self.check_match
+ check('a/b', 'a[.-0]b', not normsep)
+ check('a\\b', 'a[.-0]b', False)
+ check('a\\b', 'a[Z-^]b', not normsep)
+ check('a/b', 'a[Z-^]b', False)
+
+ check('a/b', 'a[/-0]b', not normsep)
+ check(r'a\b', 'a[/-0]b', False)
+ check('a[/-0]b', 'a[/-0]b', False)
+ check(r'a[\-0]b', 'a[/-0]b', False)
+
+ check('a/b', 'a[.-/]b')
+ check(r'a\b', 'a[.-/]b', normsep)
+ check('a[.-/]b', 'a[.-/]b', False)
+ check(r'a[.-\]b', 'a[.-/]b', False)
+
+ check(r'a\b', r'a[\-^]b')
+ check('a/b', r'a[\-^]b', normsep)
+ check(r'a[\-^]b', r'a[\-^]b', False)
+ check('a[/-^]b', r'a[\-^]b', False)
+
+ check(r'a\b', r'a[Z-\]b', not normsep)
+ check('a/b', r'a[Z-\]b', False)
+ check(r'a[Z-\]b', r'a[Z-\]b', False)
+ check('a[Z-/]b', r'a[Z-\]b', False)
+
def test_warnings(self):
with warnings.catch_warnings():
warnings.simplefilter('error', Warning)
diff --git a/Lib/test/test_format.py b/Lib/test/test_format.py
index 69b0d5f1c5a515..6fa49dbc0b730c 100644
--- a/Lib/test/test_format.py
+++ b/Lib/test/test_format.py
@@ -619,6 +619,8 @@ def test_specifier_z_error(self):
error_msg = re.escape("unsupported format character 'z'")
with self.assertRaisesRegex(ValueError, error_msg):
"%z.1f" % 0 # not allowed in old style string interpolation
+ with self.assertRaisesRegex(ValueError, error_msg):
+ b"%z.1f" % 0
if __name__ == "__main__":
diff --git a/Lib/test/test_frame.py b/Lib/test/test_frame.py
index a715e725a7e45b..9cb2686f17597a 100644
--- a/Lib/test/test_frame.py
+++ b/Lib/test/test_frame.py
@@ -1,10 +1,15 @@
+import gc
import re
import sys
+import textwrap
+import threading
import types
import unittest
import weakref
from test import support
+from test.support import threading_helper
+from test.support.script_helper import assert_python_ok
class ClearTest(unittest.TestCase):
@@ -235,6 +240,133 @@ def inner():
r"^.MyList[int]'))
self.assertEqual(repr(list[str]()), '[]') # instances should keep their normal repr
@@ -273,42 +261,24 @@ def test_parameters(self):
self.assertEqual(L5.__args__, (Callable[[K, V], K],))
self.assertEqual(L5.__parameters__, (K, V))
- T1 = tuple[
- tuple( # Ditto TODO
- tuple[int]
- )
- ]
+ T1 = tuple[*tuple[int]]
self.assertEqual(
T1.__args__,
- tuple( # Ditto TODO
- tuple[int]
- )
+ (*tuple[int],),
)
self.assertEqual(T1.__parameters__, ())
- T2 = tuple[
- tuple( # Ditto TODO
- tuple[T]
- )
- ]
+ T2 = tuple[*tuple[T]]
self.assertEqual(
T2.__args__,
- tuple( # Ditto TODO
- tuple[T]
- )
+ (*tuple[T],),
)
self.assertEqual(T2.__parameters__, (T,))
- T4 = tuple[
- tuple( # Ditto TODO
- tuple[int, str]
- )
- ]
+ T4 = tuple[*tuple[int, str]]
self.assertEqual(
T4.__args__,
- tuple( # Ditto TODO
- tuple[int, str]
- )
+ (*tuple[int, str],),
)
self.assertEqual(T4.__parameters__, ())
@@ -335,26 +305,18 @@ def test_parameter_chaining(self):
with self.assertRaises(TypeError):
list[int][int]
+ with self.assertRaises(TypeError):
dict[T, int][str, int]
+ with self.assertRaises(TypeError):
dict[str, T][str, int]
+ with self.assertRaises(TypeError):
dict[T, T][str, int]
def test_equality(self):
self.assertEqual(list[int], list[int])
self.assertEqual(dict[str, int], dict[str, int])
self.assertEqual((*tuple[int],)[0], (*tuple[int],)[0])
- self.assertEqual(
- tuple[
- tuple( # Effectively the same as starring; TODO
- tuple[int]
- )
- ],
- tuple[
- tuple( # Ditto TODO
- tuple[int]
- )
- ]
- )
+ self.assertEqual(tuple[*tuple[int]], tuple[*tuple[int]])
self.assertNotEqual(dict[str, int], dict[str, str])
self.assertNotEqual(list, list[int])
self.assertNotEqual(list[int], list)
@@ -487,5 +449,25 @@ def test_del_iter(self):
del iter_x
+class TypeIterationTests(unittest.TestCase):
+ _UNITERABLE_TYPES = (list, tuple)
+
+ def test_cannot_iterate(self):
+ for test_type in self._UNITERABLE_TYPES:
+ with self.subTest(type=test_type):
+ expected_error_regex = "object is not iterable"
+ with self.assertRaisesRegex(TypeError, expected_error_regex):
+ iter(test_type)
+ with self.assertRaisesRegex(TypeError, expected_error_regex):
+ list(test_type)
+ with self.assertRaisesRegex(TypeError, expected_error_regex):
+ for _ in test_type:
+ pass
+
+ def test_is_not_instance_of_iterable(self):
+ for type_to_test in self._UNITERABLE_TYPES:
+ self.assertNotIsInstance(type_to_test, Iterable)
+
+
if __name__ == "__main__":
unittest.main()
diff --git a/Lib/test/test_genericpath.py b/Lib/test/test_genericpath.py
index 2741adc139bcf6..489044f8090d3b 100644
--- a/Lib/test/test_genericpath.py
+++ b/Lib/test/test_genericpath.py
@@ -484,7 +484,7 @@ def test_nonascii_abspath(self):
# invalid UTF-8 name. Windows allows creating a directory with an
# arbitrary bytes name, but fails to enter this directory
# (when the bytes name is used).
- and sys.platform not in ('win32', 'darwin', 'emscripten')):
+ and sys.platform not in ('win32', 'darwin', 'emscripten', 'wasi')):
name = os_helper.TESTFN_UNDECODABLE
elif os_helper.TESTFN_NONASCII:
name = os_helper.TESTFN_NONASCII
diff --git a/Lib/test/test_getopt.py b/Lib/test/test_getopt.py
index 9261276ebb9726..64b9ce01e05ea2 100644
--- a/Lib/test/test_getopt.py
+++ b/Lib/test/test_getopt.py
@@ -11,14 +11,10 @@
class GetoptTests(unittest.TestCase):
def setUp(self):
- self.env = EnvironmentVarGuard()
+ self.env = self.enterContext(EnvironmentVarGuard())
if "POSIXLY_CORRECT" in self.env:
del self.env["POSIXLY_CORRECT"]
- def tearDown(self):
- self.env.__exit__()
- del self.env
-
def assertError(self, *args, **kwargs):
self.assertRaises(getopt.GetoptError, *args, **kwargs)
diff --git a/Lib/test/test_getpath.py b/Lib/test/test_getpath.py
index 5208374e20013c..8d5b4265f269ee 100644
--- a/Lib/test/test_getpath.py
+++ b/Lib/test/test_getpath.py
@@ -38,8 +38,9 @@ def test_normal_win32(self):
module_search_paths_set=1,
module_search_paths=[
r"C:\Python\python98.zip",
- r"C:\Python\Lib",
r"C:\Python\DLLs",
+ r"C:\Python\Lib",
+ r"C:\Python",
],
)
actual = getpath(ns, expected)
@@ -64,8 +65,8 @@ def test_buildtree_win32(self):
module_search_paths_set=1,
module_search_paths=[
r"C:\CPython\PCbuild\amd64\python98.zip",
- r"C:\CPython\Lib",
r"C:\CPython\PCbuild\amd64",
+ r"C:\CPython\Lib",
],
)
actual = getpath(ns, expected)
@@ -134,8 +135,9 @@ def test_registry_win32(self):
r"C:\Python\python98.zip",
"path1-dir",
# should not contain not-subdirs
- r"C:\Python\Lib",
r"C:\Python\DLLs",
+ r"C:\Python\Lib",
+ r"C:\Python",
],
)
actual = getpath(ns, expected)
@@ -148,8 +150,9 @@ def test_registry_win32(self):
module_search_paths_set=1,
module_search_paths=[
r"C:\Python\python98.zip",
- r"C:\Python\Lib",
r"C:\Python\DLLs",
+ r"C:\Python\Lib",
+ r"C:\Python",
],
)
actual = getpath(ns, expected)
@@ -174,8 +177,9 @@ def test_symlink_normal_win32(self):
module_search_paths_set=1,
module_search_paths=[
r"C:\Python\python98.zip",
- r"C:\Python\Lib",
r"C:\Python\DLLs",
+ r"C:\Python\Lib",
+ r"C:\Python",
],
)
actual = getpath(ns, expected)
@@ -202,8 +206,8 @@ def test_symlink_buildtree_win32(self):
module_search_paths_set=1,
module_search_paths=[
r"C:\CPython\PCbuild\amd64\python98.zip",
- r"C:\CPython\Lib",
r"C:\CPython\PCbuild\amd64",
+ r"C:\CPython\Lib",
],
)
actual = getpath(ns, expected)
@@ -232,8 +236,31 @@ def test_buildtree_pythonhome_win32(self):
module_search_paths_set=1,
module_search_paths=[
r"C:\Out\python98.zip",
- r"C:\CPython\Lib",
r"C:\Out",
+ r"C:\CPython\Lib",
+ ],
+ )
+ actual = getpath(ns, expected)
+ self.assertEqual(expected, actual)
+
+ def test_no_dlls_win32(self):
+ "Test a layout on Windows with no DLLs directory."
+ ns = MockNTNamespace(
+ argv0=r"C:\Python\python.exe",
+ real_executable=r"C:\Python\python.exe",
+ )
+ ns.add_known_xfile(r"C:\Python\python.exe")
+ ns.add_known_file(r"C:\Python\Lib\os.py")
+ expected = dict(
+ executable=r"C:\Python\python.exe",
+ base_executable=r"C:\Python\python.exe",
+ prefix=r"C:\Python",
+ exec_prefix=r"C:\Python",
+ module_search_paths_set=1,
+ module_search_paths=[
+ r"C:\Python\python98.zip",
+ r"C:\Python",
+ r"C:\Python\Lib",
],
)
actual = getpath(ns, expected)
@@ -360,6 +387,70 @@ def test_venv_changed_name_posix(self):
actual = getpath(ns, expected)
self.assertEqual(expected, actual)
+ def test_venv_non_installed_zip_path_posix(self):
+ "Test a venv created from non-installed python has correct zip path."""
+ ns = MockPosixNamespace(
+ argv0="/venv/bin/python",
+ PREFIX="/usr",
+ ENV_PATH="/venv/bin:/usr/bin",
+ )
+ ns.add_known_xfile("/path/to/non-installed/bin/python")
+ ns.add_known_xfile("/venv/bin/python")
+ ns.add_known_link("/venv/bin/python",
+ "/path/to/non-installed/bin/python")
+ ns.add_known_file("/path/to/non-installed/lib/python9.8/os.py")
+ ns.add_known_dir("/path/to/non-installed/lib/python9.8/lib-dynload")
+ ns.add_known_file("/venv/pyvenv.cfg", [
+ r"home = /path/to/non-installed"
+ ])
+ expected = dict(
+ executable="/venv/bin/python",
+ prefix="/path/to/non-installed",
+ exec_prefix="/path/to/non-installed",
+ base_executable="/path/to/non-installed/bin/python",
+ base_prefix="/path/to/non-installed",
+ base_exec_prefix="/path/to/non-installed",
+ module_search_paths_set=1,
+ module_search_paths=[
+ "/path/to/non-installed/lib/python98.zip",
+ "/path/to/non-installed/lib/python9.8",
+ "/path/to/non-installed/lib/python9.8/lib-dynload",
+ ],
+ )
+ actual = getpath(ns, expected)
+ self.assertEqual(expected, actual)
+
+ def test_venv_changed_name_copy_posix(self):
+ "Test a venv --copies layout on *nix that lacks a distributed 'python'"
+ ns = MockPosixNamespace(
+ argv0="python",
+ PREFIX="/usr",
+ ENV_PATH="/venv/bin:/usr/bin",
+ )
+ ns.add_known_xfile("/usr/bin/python9")
+ ns.add_known_xfile("/venv/bin/python")
+ ns.add_known_file("/usr/lib/python9.8/os.py")
+ ns.add_known_dir("/usr/lib/python9.8/lib-dynload")
+ ns.add_known_file("/venv/pyvenv.cfg", [
+ r"home = /usr/bin"
+ ])
+ expected = dict(
+ executable="/venv/bin/python",
+ prefix="/usr",
+ exec_prefix="/usr",
+ base_executable="/usr/bin/python9",
+ base_prefix="/usr",
+ base_exec_prefix="/usr",
+ module_search_paths_set=1,
+ module_search_paths=[
+ "/usr/lib/python98.zip",
+ "/usr/lib/python9.8",
+ "/usr/lib/python9.8/lib-dynload",
+ ],
+ )
+ actual = getpath(ns, expected)
+ self.assertEqual(expected, actual)
+
def test_symlink_normal_posix(self):
"Test a 'standard' install layout via symlink on *nix"
ns = MockPosixNamespace(
diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
index 467652a41f0cd6..1608d1b18e98fb 100644
--- a/Lib/test/test_gettext.py
+++ b/Lib/test/test_gettext.py
@@ -117,6 +117,7 @@
class GettextBaseTest(unittest.TestCase):
def setUp(self):
+ self.addCleanup(os_helper.rmtree, os.path.split(LOCALEDIR)[0])
if not os.path.isdir(LOCALEDIR):
os.makedirs(LOCALEDIR)
with open(MOFILE, 'wb') as fp:
@@ -129,14 +130,10 @@ def setUp(self):
fp.write(base64.decodebytes(UMO_DATA))
with open(MMOFILE, 'wb') as fp:
fp.write(base64.decodebytes(MMO_DATA))
- self.env = os_helper.EnvironmentVarGuard()
+ self.env = self.enterContext(os_helper.EnvironmentVarGuard())
self.env['LANGUAGE'] = 'xx'
gettext._translations.clear()
- def tearDown(self):
- self.env.__exit__()
- del self.env
- os_helper.rmtree(os.path.split(LOCALEDIR)[0])
GNU_MO_DATA_ISSUE_17898 = b'''\
3hIElQAAAAABAAAAHAAAACQAAAAAAAAAAAAAAAAAAAAsAAAAggAAAC0AAAAAUGx1cmFsLUZvcm1z
diff --git a/Lib/test/test_global.py b/Lib/test/test_global.py
index d0bde3fd040e60..f5b38c25ea0728 100644
--- a/Lib/test/test_global.py
+++ b/Lib/test/test_global.py
@@ -9,14 +9,9 @@
class GlobalTests(unittest.TestCase):
def setUp(self):
- self._warnings_manager = check_warnings()
- self._warnings_manager.__enter__()
+ self.enterContext(check_warnings())
warnings.filterwarnings("error", module="")
- def tearDown(self):
- self._warnings_manager.__exit__(None, None, None)
-
-
def test1(self):
prog_text_1 = """\
def wrong1():
@@ -54,9 +49,7 @@ def test4(self):
def setUpModule():
- cm = warnings.catch_warnings()
- cm.__enter__()
- unittest.addModuleCleanup(cm.__exit__, None, None, None)
+ unittest.enterModuleContext(warnings.catch_warnings())
warnings.filterwarnings("error", module="")
diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py
index da88519862712a..bcd8d584b0f51b 100644
--- a/Lib/test/test_grammar.py
+++ b/Lib/test/test_grammar.py
@@ -415,6 +415,28 @@ class Cbad2(C):
x: int
x.y: list = []
+ def test_annotations_inheritance(self):
+ # Check that annotations are not inherited by derived classes
+ class A:
+ attr: int
+ class B(A):
+ pass
+ class C(A):
+ attr: str
+ class D:
+ attr2: int
+ class E(A, D):
+ pass
+ class F(C, A):
+ pass
+ self.assertEqual(A.__annotations__, {"attr": int})
+ self.assertEqual(B.__annotations__, {})
+ self.assertEqual(C.__annotations__, {"attr" : str})
+ self.assertEqual(D.__annotations__, {"attr2" : int})
+ self.assertEqual(E.__annotations__, {})
+ self.assertEqual(F.__annotations__, {})
+
+
def test_var_annot_metaclass_semantics(self):
class CMeta(type):
@classmethod
diff --git a/Lib/test/test_grp.py b/Lib/test/test_grp.py
index c7ec03ec0e4388..e52e17b8dc7366 100644
--- a/Lib/test/test_grp.py
+++ b/Lib/test/test_grp.py
@@ -49,10 +49,12 @@ def test_values_extended(self):
def test_errors(self):
self.assertRaises(TypeError, grp.getgrgid)
+ self.assertRaises(TypeError, grp.getgrgid, 3.14)
self.assertRaises(TypeError, grp.getgrnam)
+ self.assertRaises(TypeError, grp.getgrnam, 42)
self.assertRaises(TypeError, grp.getgrall, 42)
# embedded null character
- self.assertRaises(ValueError, grp.getgrnam, 'a\x00b')
+ self.assertRaisesRegex(ValueError, 'null', grp.getgrnam, 'a\x00b')
# try to get some errors
bynames = {}
diff --git a/Lib/test/test_hmac.py b/Lib/test/test_hmac.py
index 7cf99735ca39f0..a39a2c45ebc2e2 100644
--- a/Lib/test/test_hmac.py
+++ b/Lib/test/test_hmac.py
@@ -373,6 +373,16 @@ def test_with_digestmod_no_default(self):
with self.assertRaisesRegex(TypeError, r'required.*digestmod'):
hmac.HMAC(key, msg=data, digestmod='')
+ def test_with_fallback(self):
+ cache = getattr(hashlib, '__builtin_constructor_cache')
+ try:
+ cache['foo'] = hashlib.sha256
+ hexdigest = hmac.digest(b'key', b'message', 'foo').hex()
+ expected = '6e9ef29b75fffc5b7abae527d58fdadb2fe42e7219011976917343065f58ed4a'
+ self.assertEqual(hexdigest, expected)
+ finally:
+ cache.pop('foo')
+
class ConstructorTestCase(unittest.TestCase):
diff --git a/Lib/test/test_http_cookiejar.py b/Lib/test/test_http_cookiejar.py
index ad2b121fdaf5a1..b90612867fef59 100644
--- a/Lib/test/test_http_cookiejar.py
+++ b/Lib/test/test_http_cookiejar.py
@@ -1,6 +1,8 @@
"""Tests for http/cookiejar.py."""
import os
+import stat
+import sys
import re
import test.support
from test.support import os_helper
@@ -17,6 +19,7 @@
reach, is_HDN, domain_match, user_domain_match, request_path,
request_port, request_host)
+mswindows = (sys.platform == "win32")
class DateTimeTests(unittest.TestCase):
@@ -364,10 +367,63 @@ def test_lwp_valueless_cookie(self):
c = LWPCookieJar()
c.load(filename, ignore_discard=True)
finally:
- try: os.unlink(filename)
- except OSError: pass
+ os_helper.unlink(filename)
self.assertEqual(c._cookies["www.acme.com"]["/"]["boo"].value, None)
+ @unittest.skipIf(mswindows, "windows file permissions are incompatible with file modes")
+ @os_helper.skip_unless_working_chmod
+ def test_lwp_filepermissions(self):
+ # Cookie file should only be readable by the creator
+ filename = os_helper.TESTFN
+ c = LWPCookieJar()
+ interact_netscape(c, "http://www.acme.com/", 'boo')
+ try:
+ c.save(filename, ignore_discard=True)
+ st = os.stat(filename)
+ self.assertEqual(stat.S_IMODE(st.st_mode), 0o600)
+ finally:
+ os_helper.unlink(filename)
+
+ @unittest.skipIf(mswindows, "windows file permissions are incompatible with file modes")
+ @os_helper.skip_unless_working_chmod
+ def test_mozilla_filepermissions(self):
+ # Cookie file should only be readable by the creator
+ filename = os_helper.TESTFN
+ c = MozillaCookieJar()
+ interact_netscape(c, "http://www.acme.com/", 'boo')
+ try:
+ c.save(filename, ignore_discard=True)
+ st = os.stat(filename)
+ self.assertEqual(stat.S_IMODE(st.st_mode), 0o600)
+ finally:
+ os_helper.unlink(filename)
+
+ @unittest.skipIf(mswindows, "windows file permissions are incompatible with file modes")
+ @os_helper.skip_unless_working_chmod
+ def test_cookie_files_are_truncated(self):
+ filename = os_helper.TESTFN
+ for cookiejar_class in (LWPCookieJar, MozillaCookieJar):
+ c = cookiejar_class(filename)
+
+ req = urllib.request.Request("http://www.acme.com/")
+ headers = ["Set-Cookie: pll_lang=en; Max-Age=31536000; path=/"]
+ res = FakeResponse(headers, "http://www.acme.com/")
+ c.extract_cookies(res, req)
+ self.assertEqual(len(c), 1)
+
+ try:
+ # Save the first version with contents:
+ c.save()
+ # Now, clear cookies and re-save:
+ c.clear()
+ c.save()
+ # Check that file was truncated:
+ c.load()
+ finally:
+ os_helper.unlink(filename)
+
+ self.assertEqual(len(c), 0)
+
def test_bad_magic(self):
# OSErrors (eg. file doesn't exist) are allowed to propagate
filename = os_helper.TESTFN
@@ -391,8 +447,7 @@ def test_bad_magic(self):
c = cookiejar_class()
self.assertRaises(LoadError, c.load, filename)
finally:
- try: os.unlink(filename)
- except OSError: pass
+ os_helper.unlink(filename)
class CookieTests(unittest.TestCase):
# XXX
@@ -496,7 +551,7 @@ def test_missing_value(self):
c = MozillaCookieJar(filename)
c.revert(ignore_expires=True, ignore_discard=True)
finally:
- os.unlink(c.filename)
+ os_helper.unlink(c.filename)
# cookies unchanged apart from lost info re. whether path was specified
self.assertEqual(
repr(c),
@@ -1766,8 +1821,7 @@ def test_rejection(self):
c = LWPCookieJar(policy=pol)
c.load(filename, ignore_discard=True)
finally:
- try: os.unlink(filename)
- except OSError: pass
+ os_helper.unlink(filename)
self.assertEqual(old, repr(c))
@@ -1826,8 +1880,7 @@ def save_and_restore(cj, ignore_discard):
DefaultCookiePolicy(rfc2965=True))
new_c.load(ignore_discard=ignore_discard)
finally:
- try: os.unlink(filename)
- except OSError: pass
+ os_helper.unlink(filename)
return new_c
new_c = save_and_restore(c, True)
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 15dab0356f5e35..acae0127a13f4b 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -2249,6 +2249,29 @@ def test_tunnel_debuglog(self):
lines = output.getvalue().splitlines()
self.assertIn('header: {}'.format(expected_header), lines)
+ def test_tunnel_leak(self):
+ sock = None
+
+ def _create_connection(address, timeout=None, source_address=None):
+ nonlocal sock
+ sock = FakeSocket(
+ 'HTTP/1.1 404 NOT FOUND\r\n\r\n',
+ host=address[0],
+ port=address[1],
+ )
+ return sock
+
+ self.conn._create_connection = _create_connection
+ self.conn.set_tunnel('destination.com')
+ exc = None
+ try:
+ self.conn.request('HEAD', '/', '')
+ except OSError as e:
+ # keeping a reference to exc keeps response alive in the traceback
+ exc = e
+ self.assertIsNotNone(exc)
+ self.assertTrue(sock.file_closed)
+
if __name__ == '__main__':
unittest.main(verbosity=2)
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 1f041aa121f974..cdd1bea754a020 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -26,7 +26,7 @@
import datetime
import threading
from unittest import mock
-from io import BytesIO
+from io import BytesIO, StringIO
import unittest
from test import support
@@ -164,6 +164,27 @@ def test_version_digits(self):
res = self.con.getresponse()
self.assertEqual(res.status, HTTPStatus.BAD_REQUEST)
+ def test_version_signs_and_underscores(self):
+ self.con._http_vsn_str = 'HTTP/-9_9_9.+9_9_9'
+ self.con.putrequest('GET', '/')
+ self.con.endheaders()
+ res = self.con.getresponse()
+ self.assertEqual(res.status, HTTPStatus.BAD_REQUEST)
+
+ def test_major_version_number_too_long(self):
+ self.con._http_vsn_str = 'HTTP/909876543210.0'
+ self.con.putrequest('GET', '/')
+ self.con.endheaders()
+ res = self.con.getresponse()
+ self.assertEqual(res.status, HTTPStatus.BAD_REQUEST)
+
+ def test_minor_version_number_too_long(self):
+ self.con._http_vsn_str = 'HTTP/1.909876543210'
+ self.con.putrequest('GET', '/')
+ self.con.endheaders()
+ res = self.con.getresponse()
+ self.assertEqual(res.status, HTTPStatus.BAD_REQUEST)
+
def test_version_none_get(self):
self.con._http_vsn_str = ''
self.con.putrequest('GET', '/')
@@ -334,7 +355,7 @@ class request_handler(NoLogRequestHandler, SimpleHTTPRequestHandler):
pass
def setUp(self):
- BaseTestCase.setUp(self)
+ super().setUp()
self.cwd = os.getcwd()
basetempdir = tempfile.gettempdir()
os.chdir(basetempdir)
@@ -362,7 +383,7 @@ def tearDown(self):
except:
pass
finally:
- BaseTestCase.tearDown(self)
+ super().tearDown()
def check_status_and_reason(self, response, status, data=None):
def close_conn():
@@ -418,6 +439,63 @@ def test_undecodable_filename(self):
self.check_status_and_reason(response, HTTPStatus.OK,
data=os_helper.TESTFN_UNDECODABLE)
+ def test_undecodable_parameter(self):
+ # sanity check using a valid parameter
+ response = self.request(self.base_url + '/?x=123').read()
+ self.assertRegex(response, f'listing for {self.base_url}/\?x=123'.encode('latin1'))
+ # now the bogus encoding
+ response = self.request(self.base_url + '/?x=%bb').read()
+ self.assertRegex(response, f'listing for {self.base_url}/\?x=\xef\xbf\xbd'.encode('latin1'))
+
+ def test_get_dir_redirect_location_domain_injection_bug(self):
+ """Ensure //evil.co/..%2f../../X does not put //evil.co/ in Location.
+
+ //netloc/ in a Location header is a redirect to a new host.
+ https://github.com/python/cpython/issues/87389
+
+ This checks that a path resolving to a directory on our server cannot
+ resolve into a redirect to another server.
+ """
+ os.mkdir(os.path.join(self.tempdir, 'existing_directory'))
+ url = f'/python.org/..%2f..%2f..%2f..%2f..%2f../%0a%0d/../{self.tempdir_name}/existing_directory'
+ expected_location = f'{url}/' # /python.org.../ single slash single prefix, trailing slash
+ # Canonicalizes to /tmp/tempdir_name/existing_directory which does
+ # exist and is a dir, triggering the 301 redirect logic.
+ response = self.request(url)
+ self.check_status_and_reason(response, HTTPStatus.MOVED_PERMANENTLY)
+ location = response.getheader('Location')
+ self.assertEqual(location, expected_location, msg='non-attack failed!')
+
+ # //python.org... multi-slash prefix, no trailing slash
+ attack_url = f'/{url}'
+ response = self.request(attack_url)
+ self.check_status_and_reason(response, HTTPStatus.MOVED_PERMANENTLY)
+ location = response.getheader('Location')
+ self.assertFalse(location.startswith('//'), msg=location)
+ self.assertEqual(location, expected_location,
+ msg='Expected Location header to start with a single / and '
+ 'end with a / as this is a directory redirect.')
+
+ # ///python.org... triple-slash prefix, no trailing slash
+ attack3_url = f'//{url}'
+ response = self.request(attack3_url)
+ self.check_status_and_reason(response, HTTPStatus.MOVED_PERMANENTLY)
+ self.assertEqual(response.getheader('Location'), expected_location)
+
+ # If the second word in the http request (Request-URI for the http
+ # method) is a full URI, we don't worry about it, as that'll be parsed
+ # and reassembled as a full URI within BaseHTTPRequestHandler.send_head
+ # so no errant scheme-less //netloc//evil.co/ domain mixup can happen.
+ attack_scheme_netloc_2slash_url = f'https://pypi.org/{url}'
+ expected_scheme_netloc_location = f'{attack_scheme_netloc_2slash_url}/'
+ response = self.request(attack_scheme_netloc_2slash_url)
+ self.check_status_and_reason(response, HTTPStatus.MOVED_PERMANENTLY)
+ location = response.getheader('Location')
+ # We're just ensuring that the scheme and domain make it through, if
+ # there are or aren't multiple slashes at the start of the path that
+ # follows that isn't important in this Location: header.
+ self.assertTrue(location.startswith('https://pypi.org/'), msg=location)
+
def test_get(self):
#constructs the path relative to the root directory of the HTTPServer
response = self.request(self.base_url + '/test')
@@ -440,6 +518,9 @@ def test_get(self):
self.check_status_and_reason(response, HTTPStatus.NOT_FOUND)
response = self.request('/' + 'ThisDoesNotExist' + '/')
self.check_status_and_reason(response, HTTPStatus.NOT_FOUND)
+ os.makedirs(os.path.join(self.tempdir, 'spam', 'index.html'))
+ response = self.request(self.base_url + '/spam/')
+ self.check_status_and_reason(response, HTTPStatus.OK)
data = b"Dummy index file\r\n"
with open(os.path.join(self.tempdir_name, 'index.html'), 'wb') as f:
@@ -941,6 +1022,27 @@ def verify_http_server_response(self, response):
match = self.HTTPResponseMatch.search(response)
self.assertIsNotNone(match)
+ def test_unprintable_not_logged(self):
+ # We call the method from the class directly as our Socketless
+ # Handler subclass overrode it... nice for everything BUT this test.
+ self.handler.client_address = ('127.0.0.1', 1337)
+ log_message = BaseHTTPRequestHandler.log_message
+ with mock.patch.object(sys, 'stderr', StringIO()) as fake_stderr:
+ log_message(self.handler, '/foo')
+ log_message(self.handler, '/\033bar\000\033')
+ log_message(self.handler, '/spam %s.', 'a')
+ log_message(self.handler, '/spam %s.', '\033\x7f\x9f\xa0beans')
+ log_message(self.handler, '"GET /foo\\b"ar\007 HTTP/1.0"')
+ stderr = fake_stderr.getvalue()
+ self.assertNotIn('\033', stderr) # non-printable chars are caught.
+ self.assertNotIn('\000', stderr) # non-printable chars are caught.
+ lines = stderr.splitlines()
+ self.assertIn('/foo', lines[0])
+ self.assertIn(r'/\x1bbar\x00\x1b', lines[1])
+ self.assertIn('/spam a.', lines[2])
+ self.assertIn('/spam \\x1b\\x7f\\x9f\xa0beans.', lines[3])
+ self.assertIn(r'"GET /foo\\b"ar\x07 HTTP/1.0"', lines[4])
+
def test_http_1_1(self):
result = self.send_typical_request(b'GET / HTTP/1.1\r\n\r\n')
self.verify_http_server_response(result[0])
diff --git a/Lib/test/test_idle.py b/Lib/test/test_idle.py
index b94b18a541a701..7cf3a93dd5b134 100644
--- a/Lib/test/test_idle.py
+++ b/Lib/test/test_idle.py
@@ -5,12 +5,8 @@
if check_sanitizer(address=True, memory=True):
raise unittest.SkipTest("Tests involvin libX11 can SEGFAULT on ASAN/MSAN builds")
-# Skip test_idle if _tkinter wasn't built, if tkinter is missing,
-# if tcl/tk is not the 8.5+ needed for ttk widgets,
-# or if idlelib is missing (not installed).
+# Skip test_idle if _tkinter, tkinter, or idlelib are missing.
tk = import_module('tkinter') # Also imports _tkinter.
-if tk.TkVersion < 8.5:
- raise unittest.SkipTest("IDLE requires tk 8.5 or later.")
idlelib = import_module('idlelib')
# Before importing and executing more of idlelib,
diff --git a/Lib/test/test_imaplib.py b/Lib/test/test_imaplib.py
index ff13edea2d1e4a..ed26fa16d6ea8b 100644
--- a/Lib/test/test_imaplib.py
+++ b/Lib/test/test_imaplib.py
@@ -939,6 +939,7 @@ def test_with_statement_logout(self):
@threading_helper.reap_threads
@cpython_only
+ @unittest.skipUnless(__debug__, "Won't work if __debug__ is False")
def test_dump_ur(self):
# See: http://bugs.python.org/issue26543
untagged_resp_dict = {'READ-WRITE': [b'']}
diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
index d44dc6b49f2935..4bb03908fc2bb2 100644
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -1,3 +1,4 @@
+import gc
import importlib
import importlib.util
import os
@@ -383,6 +384,35 @@ def test_find_and_load_checked_pyc(self):
self.assertEqual(mod.x, 42)
+ @support.cpython_only
+ def test_create_builtin_subinterp(self):
+ # gh-99578: create_builtin() behavior changes after the creation of the
+ # first sub-interpreter. Test both code paths, before and after the
+ # creation of a sub-interpreter. Previously, create_builtin() had
+ # a reference leak after the creation of the first sub-interpreter.
+
+ import builtins
+ create_builtin = support.get_attribute(_imp, "create_builtin")
+ class Spec:
+ name = "builtins"
+ spec = Spec()
+
+ def check_get_builtins():
+ refcnt = sys.getrefcount(builtins)
+ mod = _imp.create_builtin(spec)
+ self.assertIs(mod, builtins)
+ self.assertEqual(sys.getrefcount(builtins), refcnt + 1)
+ # Check that a GC collection doesn't crash
+ gc.collect()
+
+ check_get_builtins()
+
+ ret = support.run_in_subinterp("import builtins")
+ self.assertEqual(ret, 0)
+
+ check_get_builtins()
+
+
class ReloadTests(unittest.TestCase):
"""Very basic tests to make sure that imp.reload() operates just like
diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
index be88677dc697ee..6c5b80bcee6c24 100644
--- a/Lib/test/test_import/__init__.py
+++ b/Lib/test/test_import/__init__.py
@@ -20,7 +20,8 @@
from test.support import os_helper
from test.support import (
- STDLIB_DIR, is_jython, swap_attr, swap_item, cpython_only, is_emscripten)
+ STDLIB_DIR, is_jython, swap_attr, swap_item, cpython_only, is_emscripten,
+ is_wasi)
from test.support.import_helper import (
forget, make_legacy_pyc, unlink, unload, DirsOnSysPath, CleanImport)
from test.support.os_helper import (
@@ -535,7 +536,10 @@ class FilePermissionTests(unittest.TestCase):
@unittest.skipUnless(os.name == 'posix',
"test meaningful only on posix systems")
- @unittest.skipIf(is_emscripten, "Emscripten's umask is a stub.")
+ @unittest.skipIf(
+ is_emscripten or is_wasi,
+ "Emscripten's/WASI's umask is a stub."
+ )
def test_creation_mode(self):
mask = 0o022
with temp_umask(mask), _ready_to_import() as (name, path):
@@ -553,6 +557,7 @@ def test_creation_mode(self):
@unittest.skipUnless(os.name == 'posix',
"test meaningful only on posix systems")
+ @os_helper.skip_unless_working_chmod
def test_cached_mode_issue_2051(self):
# permissions of .pyc should match those of .py, regardless of mask
mode = 0o600
@@ -569,6 +574,7 @@ def test_cached_mode_issue_2051(self):
@unittest.skipUnless(os.name == 'posix',
"test meaningful only on posix systems")
+ @os_helper.skip_unless_working_chmod
def test_cached_readonly(self):
mode = 0o400
with temp_umask(0o022), _ready_to_import() as (name, path):
@@ -879,9 +885,10 @@ def test_import_pyc_path(self):
@unittest.skipUnless(os.name == 'posix',
"test meaningful only on posix systems")
- @unittest.skipIf(hasattr(os, 'geteuid') and os.geteuid() == 0,
- "due to varying filesystem permission semantics (issue #11956)")
@skip_if_dont_write_bytecode
+ @os_helper.skip_unless_working_chmod
+ @os_helper.skip_if_dac_override
+ @unittest.skipIf(is_emscripten, "umask is a stub")
def test_unwritable_directory(self):
# When the umask causes the new __pycache__ directory to be
# unwritable, the import still succeeds but no .pyc file is written.
@@ -920,7 +927,7 @@ def test_missing_source_legacy(self):
m = __import__(TESTFN)
try:
self.assertEqual(m.__file__,
- os.path.join(os.getcwd(), os.curdir, os.path.relpath(pyc_file)))
+ os.path.join(os.getcwd(), os.path.relpath(pyc_file)))
finally:
os.remove(pyc_file)
@@ -928,7 +935,7 @@ def test___cached__(self):
# Modules now also have an __cached__ that points to the pyc file.
m = __import__(TESTFN)
pyc_file = importlib.util.cache_from_source(TESTFN + '.py')
- self.assertEqual(m.__cached__, os.path.join(os.getcwd(), os.curdir, pyc_file))
+ self.assertEqual(m.__cached__, os.path.join(os.getcwd(), pyc_file))
@skip_if_dont_write_bytecode
def test___cached___legacy_pyc(self):
@@ -944,7 +951,7 @@ def test___cached___legacy_pyc(self):
importlib.invalidate_caches()
m = __import__(TESTFN)
self.assertEqual(m.__cached__,
- os.path.join(os.getcwd(), os.curdir, os.path.relpath(pyc_file)))
+ os.path.join(os.getcwd(), os.path.relpath(pyc_file)))
@skip_if_dont_write_bytecode
def test_package___cached__(self):
@@ -964,10 +971,10 @@ def cleanup():
m = __import__('pep3147.foo')
init_pyc = importlib.util.cache_from_source(
os.path.join('pep3147', '__init__.py'))
- self.assertEqual(m.__cached__, os.path.join(os.getcwd(), os.curdir, init_pyc))
+ self.assertEqual(m.__cached__, os.path.join(os.getcwd(), init_pyc))
foo_pyc = importlib.util.cache_from_source(os.path.join('pep3147', 'foo.py'))
self.assertEqual(sys.modules['pep3147.foo'].__cached__,
- os.path.join(os.getcwd(), os.curdir, foo_pyc))
+ os.path.join(os.getcwd(), foo_pyc))
def test_package___cached___from_pyc(self):
# Like test___cached__ but ensuring __cached__ when imported from a
@@ -991,10 +998,10 @@ def cleanup():
m = __import__('pep3147.foo')
init_pyc = importlib.util.cache_from_source(
os.path.join('pep3147', '__init__.py'))
- self.assertEqual(m.__cached__, os.path.join(os.getcwd(), os.curdir, init_pyc))
+ self.assertEqual(m.__cached__, os.path.join(os.getcwd(), init_pyc))
foo_pyc = importlib.util.cache_from_source(os.path.join('pep3147', 'foo.py'))
self.assertEqual(sys.modules['pep3147.foo'].__cached__,
- os.path.join(os.getcwd(), os.curdir, foo_pyc))
+ os.path.join(os.getcwd(), foo_pyc))
def test_recompute_pyc_same_second(self):
# Even when the source file doesn't change timestamp, a change in
diff --git a/Lib/test/test_importlib/builtin/test_finder.py b/Lib/test/test_importlib/builtin/test_finder.py
index a4869e07b9c0c2..81dc5a3699d952 100644
--- a/Lib/test/test_importlib/builtin/test_finder.py
+++ b/Lib/test/test_importlib/builtin/test_finder.py
@@ -37,13 +37,6 @@ def test_failure(self):
spec = self.machinery.BuiltinImporter.find_spec(name)
self.assertIsNone(spec)
- def test_ignore_path(self):
- # The value for 'path' should always trigger a failed import.
- with util.uncache(util.BUILTINS.good_name):
- spec = self.machinery.BuiltinImporter.find_spec(util.BUILTINS.good_name,
- ['pkg'])
- self.assertIsNone(spec)
-
(Frozen_FindSpecTests,
Source_FindSpecTests
@@ -77,16 +70,6 @@ def test_failure(self):
loader = self.machinery.BuiltinImporter.find_module('importlib')
self.assertIsNone(loader)
- def test_ignore_path(self):
- # The value for 'path' should always trigger a failed import.
- with util.uncache(util.BUILTINS.good_name):
- with warnings.catch_warnings():
- warnings.simplefilter("ignore", DeprecationWarning)
- loader = self.machinery.BuiltinImporter.find_module(
- util.BUILTINS.good_name,
- ['pkg'])
- self.assertIsNone(loader)
-
(Frozen_FinderTests,
Source_FinderTests
diff --git a/Lib/test/test_importlib/extension/test_finder.py b/Lib/test/test_importlib/extension/test_finder.py
index b6663a44845502..1d5b6e7a5de94b 100644
--- a/Lib/test/test_importlib/extension/test_finder.py
+++ b/Lib/test/test_importlib/extension/test_finder.py
@@ -3,7 +3,7 @@
machinery = util.import_importlib('importlib.machinery')
import unittest
-import warnings
+import sys
class FinderTests(abc.FinderTests):
@@ -13,6 +13,10 @@ class FinderTests(abc.FinderTests):
def setUp(self):
if not self.machinery.EXTENSION_SUFFIXES:
raise unittest.SkipTest("Requires dynamic loading support.")
+ if util.EXTENSIONS.name in sys.builtin_module_names:
+ raise unittest.SkipTest(
+ f"{util.EXTENSIONS.name} is a builtin module"
+ )
def find_spec(self, fullname):
importer = self.machinery.FileFinder(util.EXTENSIONS.path,
diff --git a/Lib/test/test_importlib/extension/test_loader.py b/Lib/test/test_importlib/extension/test_loader.py
index 5080009bee32ee..8e2b58d12a39a3 100644
--- a/Lib/test/test_importlib/extension/test_loader.py
+++ b/Lib/test/test_importlib/extension/test_loader.py
@@ -20,6 +20,10 @@ class LoaderTests(abc.LoaderTests):
def setUp(self):
if not self.machinery.EXTENSION_SUFFIXES:
raise unittest.SkipTest("Requires dynamic loading support.")
+ if util.EXTENSIONS.name in sys.builtin_module_names:
+ raise unittest.SkipTest(
+ f"{util.EXTENSIONS.name} is a builtin module"
+ )
self.loader = self.machinery.ExtensionFileLoader(util.EXTENSIONS.name,
util.EXTENSIONS.file_path)
@@ -97,6 +101,10 @@ def setUp(self):
if not self.machinery.EXTENSION_SUFFIXES:
raise unittest.SkipTest("Requires dynamic loading support.")
self.name = '_testmultiphase'
+ if self.name in sys.builtin_module_names:
+ raise unittest.SkipTest(
+ f"{self.name} is a builtin module"
+ )
finder = self.machinery.FileFinder(None)
self.spec = importlib.util.find_spec(self.name)
assert self.spec
@@ -171,15 +179,16 @@ def test_reload(self):
def test_try_registration(self):
# Assert that the PyState_{Find,Add,Remove}Module C API doesn't work.
- module = self.load_module()
- with self.subTest('PyState_FindModule'):
- self.assertEqual(module.call_state_registration_func(0), None)
- with self.subTest('PyState_AddModule'):
- with self.assertRaises(SystemError):
- module.call_state_registration_func(1)
- with self.subTest('PyState_RemoveModule'):
- with self.assertRaises(SystemError):
- module.call_state_registration_func(2)
+ with util.uncache(self.name):
+ module = self.load_module()
+ with self.subTest('PyState_FindModule'):
+ self.assertEqual(module.call_state_registration_func(0), None)
+ with self.subTest('PyState_AddModule'):
+ with self.assertRaises(SystemError):
+ module.call_state_registration_func(1)
+ with self.subTest('PyState_RemoveModule'):
+ with self.assertRaises(SystemError):
+ module.call_state_registration_func(2)
def test_load_submodule(self):
# Test loading a simulated submodule.
diff --git a/Lib/test/test_importlib/fixtures.py b/Lib/test/test_importlib/fixtures.py
index 803d3738d263f4..e7be77b3957c67 100644
--- a/Lib/test/test_importlib/fixtures.py
+++ b/Lib/test/test_importlib/fixtures.py
@@ -5,6 +5,7 @@
import pathlib
import tempfile
import textwrap
+import functools
import contextlib
from test.support.os_helper import FS_NONASCII
@@ -296,3 +297,18 @@ def setUp(self):
# Add self.zip_name to the front of sys.path.
self.resources = contextlib.ExitStack()
self.addCleanup(self.resources.close)
+
+
+def parameterize(*args_set):
+ """Run test method with a series of parameters."""
+
+ def wrapper(func):
+ @functools.wraps(func)
+ def _inner(self):
+ for args in args_set:
+ with self.subTest(**args):
+ func(self, **args)
+
+ return _inner
+
+ return wrapper
diff --git a/Lib/test/test_importlib/import_/test_path.py b/Lib/test/test_importlib/import_/test_path.py
index 6f1d0cabd28a62..de620842bbc52b 100644
--- a/Lib/test/test_importlib/import_/test_path.py
+++ b/Lib/test/test_importlib/import_/test_path.py
@@ -202,10 +202,11 @@ def __init__(self):
def invalidate_caches(self):
self.called = True
- cache = {'leave_alone': object(), 'finder_to_invalidate': FakeFinder()}
+ key = os.path.abspath('finder_to_invalidate')
+ cache = {'leave_alone': object(), key: FakeFinder()}
with util.import_state(path_importer_cache=cache):
self.machinery.PathFinder.invalidate_caches()
- self.assertTrue(cache['finder_to_invalidate'].called)
+ self.assertTrue(cache[key].called)
def test_invalidate_caches_clear_out_None(self):
# Clear out None in sys.path_importer_cache() when invalidating caches.
@@ -214,6 +215,16 @@ def test_invalidate_caches_clear_out_None(self):
self.machinery.PathFinder.invalidate_caches()
self.assertEqual(len(cache), 0)
+ def test_invalidate_caches_clear_out_relative_path(self):
+ class FakeFinder:
+ def invalidate_caches(self):
+ pass
+
+ cache = {'relative_path': FakeFinder()}
+ with util.import_state(path_importer_cache=cache):
+ self.machinery.PathFinder.invalidate_caches()
+ self.assertEqual(cache, {})
+
class FindModuleTests(FinderTests):
def find(self, *args, **kwargs):
diff --git a/Lib/test/test_importlib/source/test_finder.py b/Lib/test/test_importlib/source/test_finder.py
index 6a23e9d50f6ffd..bed9d56dca84ee 100644
--- a/Lib/test/test_importlib/source/test_finder.py
+++ b/Lib/test/test_importlib/source/test_finder.py
@@ -157,21 +157,12 @@ def test_dir_removal_handling(self):
def test_no_read_directory(self):
# Issue #16730
tempdir = tempfile.TemporaryDirectory()
+ self.enterContext(tempdir)
+ # Since we muck with the permissions, we want to set them back to
+ # their original values to make sure the directory can be properly
+ # cleaned up.
original_mode = os.stat(tempdir.name).st_mode
- def cleanup(tempdir):
- """Cleanup function for the temporary directory.
-
- Since we muck with the permissions, we want to set them back to
- their original values to make sure the directory can be properly
- cleaned up.
-
- """
- os.chmod(tempdir.name, original_mode)
- # If this is not explicitly called then the __del__ method is used,
- # but since already mucking around might as well explicitly clean
- # up.
- tempdir.__exit__(None, None, None)
- self.addCleanup(cleanup, tempdir)
+ self.addCleanup(os.chmod, tempdir.name, original_mode)
os.chmod(tempdir.name, stat.S_IWUSR | stat.S_IXUSR)
finder = self.get_finder(tempdir.name)
found = self._find(finder, 'doesnotexist')
diff --git a/Lib/test/test_importlib/test_api.py b/Lib/test/test_importlib/test_api.py
index 1f8f7c00bda536..1beb7835d4f168 100644
--- a/Lib/test/test_importlib/test_api.py
+++ b/Lib/test/test_importlib/test_api.py
@@ -395,7 +395,7 @@ def find_module(self, *args):
def invalidate_caches(self):
self.called = True
- key = 'gobledeegook'
+ key = os.path.abspath('gobledeegook')
meta_ins = InvalidatingNullFinder()
path_ins = InvalidatingNullFinder()
sys.meta_path.insert(0, meta_ins)
diff --git a/Lib/test/test_importlib/test_main.py b/Lib/test/test_importlib/test_main.py
index c80a0e4a5a9f91..d9d067c4b23d66 100644
--- a/Lib/test/test_importlib/test_main.py
+++ b/Lib/test/test_importlib/test_main.py
@@ -1,7 +1,6 @@
import re
import json
import pickle
-import textwrap
import unittest
import warnings
import importlib.metadata
@@ -16,6 +15,7 @@
Distribution,
EntryPoint,
PackageNotFoundError,
+ _unique,
distributions,
entry_points,
metadata,
@@ -51,6 +51,14 @@ def test_package_not_found_mentions_metadata(self):
def test_new_style_classes(self):
self.assertIsInstance(Distribution, type)
+ @fixtures.parameterize(
+ dict(name=None),
+ dict(name=''),
+ )
+ def test_invalid_inputs_to_from_name(self, name):
+ with self.assertRaises(Exception):
+ Distribution.from_name(name)
+
class ImportTests(fixtures.DistInfoPkg, unittest.TestCase):
def test_import_nonexistent_module(self):
@@ -78,48 +86,50 @@ def test_resolve_without_attr(self):
class NameNormalizationTests(fixtures.OnSysPath, fixtures.SiteDir, unittest.TestCase):
@staticmethod
- def pkg_with_dashes(site_dir):
+ def make_pkg(name):
"""
- Create minimal metadata for a package with dashes
- in the name (and thus underscores in the filename).
+ Create minimal metadata for a dist-info package with
+ the indicated name on the file system.
"""
- metadata_dir = site_dir / 'my_pkg.dist-info'
- metadata_dir.mkdir()
- metadata = metadata_dir / 'METADATA'
- with metadata.open('w', encoding='utf-8') as strm:
- strm.write('Version: 1.0\n')
- return 'my-pkg'
+ return {
+ f'{name}.dist-info': {
+ 'METADATA': 'VERSION: 1.0\n',
+ },
+ }
def test_dashes_in_dist_name_found_as_underscores(self):
"""
For a package with a dash in the name, the dist-info metadata
uses underscores in the name. Ensure the metadata loads.
"""
- pkg_name = self.pkg_with_dashes(self.site_dir)
- assert version(pkg_name) == '1.0'
-
- @staticmethod
- def pkg_with_mixed_case(site_dir):
- """
- Create minimal metadata for a package with mixed case
- in the name.
- """
- metadata_dir = site_dir / 'CherryPy.dist-info'
- metadata_dir.mkdir()
- metadata = metadata_dir / 'METADATA'
- with metadata.open('w', encoding='utf-8') as strm:
- strm.write('Version: 1.0\n')
- return 'CherryPy'
+ fixtures.build_files(self.make_pkg('my_pkg'), self.site_dir)
+ assert version('my-pkg') == '1.0'
def test_dist_name_found_as_any_case(self):
"""
Ensure the metadata loads when queried with any case.
"""
- pkg_name = self.pkg_with_mixed_case(self.site_dir)
+ pkg_name = 'CherryPy'
+ fixtures.build_files(self.make_pkg(pkg_name), self.site_dir)
assert version(pkg_name) == '1.0'
assert version(pkg_name.lower()) == '1.0'
assert version(pkg_name.upper()) == '1.0'
+ def test_unique_distributions(self):
+ """
+ Two distributions varying only by non-normalized name on
+ the file system should resolve as the same.
+ """
+ fixtures.build_files(self.make_pkg('abc'), self.site_dir)
+ before = list(_unique(distributions()))
+
+ alt_site_dir = self.fixtures.enter_context(fixtures.tempdir())
+ self.fixtures.enter_context(self.add_sys_path(alt_site_dir))
+ fixtures.build_files(self.make_pkg('ABC'), alt_site_dir)
+ after = list(_unique(distributions()))
+
+ assert len(after) == len(before)
+
class NonASCIITests(fixtures.OnSysPath, fixtures.SiteDir, unittest.TestCase):
@staticmethod
@@ -128,11 +138,12 @@ def pkg_with_non_ascii_description(site_dir):
Create minimal metadata for a package with non-ASCII in
the description.
"""
- metadata_dir = site_dir / 'portend.dist-info'
- metadata_dir.mkdir()
- metadata = metadata_dir / 'METADATA'
- with metadata.open('w', encoding='utf-8') as fp:
- fp.write('Description: pôrˈtend')
+ contents = {
+ 'portend.dist-info': {
+ 'METADATA': 'Description: pôrˈtend',
+ },
+ }
+ fixtures.build_files(contents, site_dir)
return 'portend'
@staticmethod
@@ -141,19 +152,15 @@ def pkg_with_non_ascii_description_egg_info(site_dir):
Create minimal metadata for an egg-info package with
non-ASCII in the description.
"""
- metadata_dir = site_dir / 'portend.dist-info'
- metadata_dir.mkdir()
- metadata = metadata_dir / 'METADATA'
- with metadata.open('w', encoding='utf-8') as fp:
- fp.write(
- textwrap.dedent(
- """
+ contents = {
+ 'portend.dist-info': {
+ 'METADATA': """
Name: portend
- pôrˈtend
- """
- ).strip()
- )
+ pôrˈtend""",
+ },
+ }
+ fixtures.build_files(contents, site_dir)
return 'portend'
def test_metadata_loads(self):
diff --git a/Lib/test/test_importlib/test_metadata_api.py b/Lib/test/test_importlib/test_metadata_api.py
index c86bb4df19c5eb..69c78e9820c044 100644
--- a/Lib/test/test_importlib/test_metadata_api.py
+++ b/Lib/test/test_importlib/test_metadata_api.py
@@ -89,15 +89,15 @@ def test_entry_points_distribution(self):
self.assertIn(ep.dist.name, ('distinfo-pkg', 'egginfo-pkg'))
self.assertEqual(ep.dist.version, "1.0.0")
- def test_entry_points_unique_packages(self):
+ def test_entry_points_unique_packages_normalized(self):
"""
Entry points should only be exposed for the first package
- on sys.path with a given name.
+ on sys.path with a given name (even when normalized).
"""
alt_site_dir = self.fixtures.enter_context(fixtures.tempdir())
self.fixtures.enter_context(self.add_sys_path(alt_site_dir))
alt_pkg = {
- "distinfo_pkg-1.1.0.dist-info": {
+ "DistInfo_pkg-1.1.0.dist-info": {
"METADATA": """
Name: distinfo-pkg
Version: 1.1.0
diff --git a/Lib/test/test_importlib/test_namespace_pkgs.py b/Lib/test/test_importlib/test_namespace_pkgs.py
index 2ea41b7a4c5c33..cd08498545e802 100644
--- a/Lib/test/test_importlib/test_namespace_pkgs.py
+++ b/Lib/test/test_importlib/test_namespace_pkgs.py
@@ -65,12 +65,7 @@ def setUp(self):
self.resolved_paths = [
os.path.join(self.root, path) for path in self.paths
]
- self.ctx = namespace_tree_context(path=self.resolved_paths)
- self.ctx.__enter__()
-
- def tearDown(self):
- # TODO: will we ever want to pass exc_info to __exit__?
- self.ctx.__exit__(None, None, None)
+ self.enterContext(namespace_tree_context(path=self.resolved_paths))
class SingleNamespacePackage(NamespacePackageTest):
diff --git a/Lib/test/test_importlib/test_threaded_import.py b/Lib/test/test_importlib/test_threaded_import.py
index cc1d804f35f913..16c0513b585a86 100644
--- a/Lib/test/test_importlib/test_threaded_import.py
+++ b/Lib/test/test_importlib/test_threaded_import.py
@@ -244,7 +244,8 @@ def target():
self.addCleanup(forget, TESTFN)
self.addCleanup(rmtree, '__pycache__')
importlib.invalidate_caches()
- __import__(TESTFN)
+ with threading_helper.wait_threads_exit():
+ __import__(TESTFN)
del sys.modules[TESTFN]
def test_concurrent_futures_circular_import(self):
@@ -272,4 +273,4 @@ def setUpModule():
if __name__ == "__main__":
- unittets.main()
+ unittest.main()
diff --git a/Lib/test/test_importlib/test_util.py b/Lib/test/test_importlib/test_util.py
index c77c7814a9ccd3..a62d68fcd8b333 100644
--- a/Lib/test/test_importlib/test_util.py
+++ b/Lib/test/test_importlib/test_util.py
@@ -860,7 +860,7 @@ def test_magic_number(self):
# stakeholders such as OS package maintainers must be notified
# in advance. Such exceptional releases will then require an
# adjustment to this test case.
- EXPECTED_MAGIC_NUMBER = 3413
+ EXPECTED_MAGIC_NUMBER = 3495
actual = int.from_bytes(importlib.util.MAGIC_NUMBER[:2], 'little')
msg = (
diff --git a/Lib/test/test_importlib/util.py b/Lib/test/test_importlib/util.py
index c07ac2a64c289f..0b6dcc5eaf03d2 100644
--- a/Lib/test/test_importlib/util.py
+++ b/Lib/test/test_importlib/util.py
@@ -298,7 +298,7 @@ def writes_bytecode_files(fxn):
"""Decorator to protect sys.dont_write_bytecode from mutation and to skip
tests that require it to be set to False."""
if sys.dont_write_bytecode:
- return lambda *args, **kwargs: None
+ return unittest.skip("relies on writing bytecode")(fxn)
@functools.wraps(fxn)
def wrapper(*args, **kwargs):
original = sys.dont_write_bytecode
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index fe0259ab609c7f..2783f7f8a08e88 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -202,6 +202,10 @@ def test_iscoroutine(self):
gen_coroutine_function_example))))
self.assertTrue(inspect.isgenerator(gen_coro))
+ self.assertFalse(
+ inspect.iscoroutinefunction(unittest.mock.Mock()))
+ self.assertTrue(
+ inspect.iscoroutinefunction(unittest.mock.AsyncMock()))
self.assertTrue(
inspect.iscoroutinefunction(coroutine_function_example))
self.assertTrue(
@@ -210,6 +214,10 @@ def test_iscoroutine(self):
coroutine_function_example))))
self.assertTrue(inspect.iscoroutine(coro))
+ self.assertFalse(
+ inspect.isgeneratorfunction(unittest.mock.Mock()))
+ self.assertFalse(
+ inspect.isgeneratorfunction(unittest.mock.AsyncMock()))
self.assertFalse(
inspect.isgeneratorfunction(coroutine_function_example))
self.assertFalse(
@@ -218,6 +226,12 @@ def test_iscoroutine(self):
coroutine_function_example))))
self.assertFalse(inspect.isgenerator(coro))
+ self.assertFalse(
+ inspect.isasyncgenfunction(unittest.mock.Mock()))
+ self.assertFalse(
+ inspect.isasyncgenfunction(unittest.mock.AsyncMock()))
+ self.assertFalse(
+ inspect.isasyncgenfunction(coroutine_function_example))
self.assertTrue(
inspect.isasyncgenfunction(async_generator_function_example))
self.assertTrue(
@@ -842,7 +856,10 @@ def test_nested_class_definition_inside_function(self):
self.assertSourceEqual(mod2.cls213, 218, 222)
self.assertSourceEqual(mod2.cls213().func219(), 220, 221)
- @unittest.skipIf(support.is_emscripten, "socket.accept is broken")
+ @unittest.skipIf(
+ support.is_emscripten or support.is_wasi,
+ "socket.accept is broken"
+ )
def test_nested_class_definition_inside_async_function(self):
import asyncio
self.addCleanup(asyncio.set_event_loop_policy, None)
@@ -869,6 +886,12 @@ def test_class(self):
self.assertSourceEqual(self.fodderModule.X, 1, 2)
+class TestComplexDecorator(GetSourceBase):
+ fodderModule = mod2
+
+ def test_parens_in_decorator(self):
+ self.assertSourceEqual(self.fodderModule.complex_decorated, 273, 275)
+
class _BrokenDataDescriptor(object):
"""
A broken data descriptor. See bug #1785.
@@ -1404,6 +1427,13 @@ def wrapper(a, b):
self.assertEqual(inspect.get_annotations(isa.MyClassWithLocalAnnotations, eval_str=True), {'x': int})
+class TestFormatAnnotation(unittest.TestCase):
+ def test_typing_replacement(self):
+ from test.typinganndata.ann_module9 import ann, ann1
+ self.assertEqual(inspect.formatannotation(ann), 'Union[List[str], int]')
+ self.assertEqual(inspect.formatannotation(ann1), 'Union[List[testModule.typing.A], int]')
+
+
class TestIsDataDescriptor(unittest.TestCase):
def test_custom_descriptors(self):
@@ -1731,8 +1761,7 @@ def test_errors(self):
self.assertEqualException(f, '2, 3, 4')
self.assertEqualException(f, '1, 2, 3, a=1')
self.assertEqualException(f, '2, 3, 4, c=5')
- # XXX: success of this one depends on dict order
- ## self.assertEqualException(f, '2, 3, 4, a=1, c=5')
+ self.assertEqualException(f, '2, 3, 4, a=1, c=5')
# f got an unexpected keyword argument
self.assertEqualException(f, 'c=2')
self.assertEqualException(f, '2, c=3')
@@ -1743,17 +1772,19 @@ def test_errors(self):
self.assertEqualException(f, '1, a=2')
self.assertEqualException(f, '1, **{"a":2}')
self.assertEqualException(f, '1, 2, b=3')
- # XXX: Python inconsistency
- # - for functions and bound methods: unexpected keyword 'c'
- # - for unbound methods: multiple values for keyword 'a'
- #self.assertEqualException(f, '1, c=3, a=2')
+ self.assertEqualException(f, '1, c=3, a=2')
# issue11256:
f3 = self.makeCallable('**c')
self.assertEqualException(f3, '1, 2')
self.assertEqualException(f3, '1, 2, a=1, b=2')
f4 = self.makeCallable('*, a, b=0')
- self.assertEqualException(f3, '1, 2')
- self.assertEqualException(f3, '1, 2, a=1, b=2')
+ self.assertEqualException(f4, '1, 2')
+ self.assertEqualException(f4, '1, 2, a=1, b=2')
+ self.assertEqualException(f4, 'a=1, a=3')
+ self.assertEqualException(f4, 'a=1, c=3')
+ self.assertEqualException(f4, 'a=1, a=3, b=4')
+ self.assertEqualException(f4, 'a=1, b=2, a=3, b=4')
+ self.assertEqualException(f4, 'a=1, a=2, a=3, b=4')
# issue #20816: getcallargs() fails to iterate over non-existent
# kwonlydefaults and raises a wrong TypeError
@@ -1962,6 +1993,9 @@ class Foo(object):
descriptor.__set__ = lambda s, i, v: None
self.assertEqual(inspect.getattr_static(foo, 'd'), Foo.__dict__['d'])
+ del descriptor.__set__
+ descriptor.__delete__ = lambda s, i, o: None
+ self.assertEqual(inspect.getattr_static(foo, 'd'), Foo.__dict__['d'])
def test_metaclass_with_descriptor(self):
class descriptor(object):
@@ -2075,6 +2109,35 @@ class Thing(metaclass=Meta):
inspect.getattr_static(Thing, "spam")
self.assertFalse(Thing.executed)
+ def test_custom___getattr__(self):
+ test = self
+ test.called = False
+
+ class Foo:
+ def __getattr__(self, attr):
+ test.called = True
+ return {}
+
+ with self.assertRaises(AttributeError):
+ inspect.getattr_static(Foo(), 'whatever')
+
+ self.assertFalse(test.called)
+
+ def test_custom___getattribute__(self):
+ test = self
+ test.called = False
+
+ class Foo:
+ def __getattribute__(self, attr):
+ test.called = True
+ return {}
+
+ with self.assertRaises(AttributeError):
+ inspect.getattr_static(Foo(), 'really_could_be_anything')
+
+ self.assertFalse(test.called)
+
+
class TestGetGeneratorState(unittest.TestCase):
def setUp(self):
@@ -2270,18 +2333,43 @@ def test_signature_object(self):
self.assertEqual(str(S()), '()')
self.assertEqual(repr(S().parameters), 'mappingproxy(OrderedDict())')
- def test(po, pk, pod=42, pkd=100, *args, ko, **kwargs):
+ def test(po, /, pk, pkd=100, *args, ko, kod=10, **kwargs):
pass
+
sig = inspect.signature(test)
- po = sig.parameters['po'].replace(kind=P.POSITIONAL_ONLY)
- pod = sig.parameters['pod'].replace(kind=P.POSITIONAL_ONLY)
+ self.assertTrue(repr(sig).startswith(' {42:'ham'}: pass
foo_partial = functools.partial(foo, a=1)
@@ -2450,7 +2541,7 @@ def p(name): return signature.parameters[name].default
self.assertEqual(p('f'), False)
self.assertEqual(p('local'), 3)
self.assertEqual(p('sys'), sys.maxsize)
- self.assertNotIn('exp', signature.parameters)
+ self.assertEqual(p('exp'), sys.maxsize - 1)
test_callable(object)
@@ -2680,8 +2771,6 @@ def foo(cls, *, arg):
def test_signature_on_partial(self):
from functools import partial
- Parameter = inspect.Parameter
-
def test():
pass
@@ -2796,8 +2885,6 @@ def test(a, b, c:int) -> 42:
((('c', ..., int, "positional_or_keyword"),),
42))
- psig = inspect.signature(partial(partial(test, 1), 2))
-
def foo(a):
return a
_foo = partial(partial(foo, a=10), a=20)
@@ -2852,14 +2939,9 @@ def foo(a=1, b=2, c=3):
self.assertEqual(_foo(*ba.args, **ba.kwargs), (12, 10, 20))
- def foo(a, b, c, d, **kwargs):
+ def foo(a, b, /, c, d, **kwargs):
pass
sig = inspect.signature(foo)
- params = sig.parameters.copy()
- params['a'] = params['a'].replace(kind=Parameter.POSITIONAL_ONLY)
- params['b'] = params['b'].replace(kind=Parameter.POSITIONAL_ONLY)
- foo.__signature__ = inspect.Signature(params.values())
- sig = inspect.signature(foo)
self.assertEqual(str(sig), '(a, b, /, c, d, **kwargs)')
self.assertEqual(self.signature(partial(foo, 1)),
@@ -2936,8 +3018,6 @@ def foo(a): pass
self.assertEqual(str(inspect.signature(foo)), '(a)')
def test_signature_on_decorated(self):
- import functools
-
def decorator(func):
@functools.wraps(func)
def wrapper(*args, **kwargs) -> int:
@@ -2949,6 +3029,8 @@ class Foo:
def bar(self, a, b):
pass
+ bar = decorator(Foo().bar)
+
self.assertEqual(self.signature(Foo.bar),
((('self', ..., ..., "positional_or_keyword"),
('a', ..., ..., "positional_or_keyword"),
@@ -2967,6 +3049,11 @@ def bar(self, a, b):
# from "func" to "wrapper", hence no
# return_annotation
+ self.assertEqual(self.signature(bar),
+ ((('a', ..., ..., "positional_or_keyword"),
+ ('b', ..., ..., "positional_or_keyword")),
+ ...))
+
# Test that we handle method wrappers correctly
def decorator(func):
@functools.wraps(func)
@@ -3203,6 +3290,25 @@ def test_signature_on_lambdas(self):
((('a', 10, ..., "positional_or_keyword"),),
...))
+ def test_signature_on_mocks(self):
+ # https://github.com/python/cpython/issues/96127
+ for mock in (
+ unittest.mock.Mock(),
+ unittest.mock.AsyncMock(),
+ unittest.mock.MagicMock(),
+ ):
+ with self.subTest(mock=mock):
+ self.assertEqual(str(inspect.signature(mock)), '(*args, **kwargs)')
+
+ def test_signature_on_noncallable_mocks(self):
+ for mock in (
+ unittest.mock.NonCallableMock(),
+ unittest.mock.NonCallableMagicMock(),
+ ):
+ with self.subTest(mock=mock):
+ with self.assertRaises(TypeError):
+ inspect.signature(mock)
+
def test_signature_equality(self):
def foo(a, *, b:int) -> float: pass
self.assertFalse(inspect.signature(foo) == 42)
@@ -3340,14 +3446,9 @@ def test_signature_str_positional_only(self):
P = inspect.Parameter
S = inspect.Signature
- def test(a_po, *, b, **kwargs):
+ def test(a_po, /, *, b, **kwargs):
return a_po, kwargs
- sig = inspect.signature(test)
- new_params = list(sig.parameters.values())
- new_params[0] = new_params[0].replace(kind=P.POSITIONAL_ONLY)
- test.__signature__ = sig.replace(parameters=new_params)
-
self.assertEqual(str(inspect.signature(test)),
'(a_po, /, *, b, **kwargs)')
@@ -3377,6 +3478,14 @@ def test() -> 42:
self.assertEqual(sig.return_annotation, 42)
self.assertEqual(sig, inspect.signature(test))
+ def test_signature_replaced(self):
+ def test():
+ pass
+
+ spam_param = inspect.Parameter('spam', inspect.Parameter.POSITIONAL_ONLY)
+ sig = test.__signature__ = inspect.Signature(parameters=(spam_param,))
+ self.assertEqual(sig, inspect.signature(test))
+
def test_signature_on_mangled_parameters(self):
class Spam:
def foo(self, __p1:1=2, *, __p2:2=3):
@@ -3906,18 +4015,9 @@ def test(a, *args, b, z=100, **kwargs):
self.assertEqual(ba.args, (10, 20))
def test_signature_bind_positional_only(self):
- P = inspect.Parameter
-
- def test(a_po, b_po, c_po=3, foo=42, *, bar=50, **kwargs):
+ def test(a_po, b_po, c_po=3, /, foo=42, *, bar=50, **kwargs):
return a_po, b_po, c_po, foo, bar, kwargs
- sig = inspect.signature(test)
- new_params = collections.OrderedDict(tuple(sig.parameters.items()))
- for name in ('a_po', 'b_po', 'c_po'):
- new_params[name] = new_params[name].replace(kind=P.POSITIONAL_ONLY)
- new_sig = sig.replace(parameters=new_params.values())
- test.__signature__ = new_sig
-
self.assertEqual(self.call(test, 1, 2, 4, 5, bar=6),
(1, 2, 4, 5, 6, {}))
@@ -4210,10 +4310,29 @@ def func(*args, **kwargs):
sig = inspect.signature(func)
self.assertIsNotNone(sig)
self.assertEqual(str(sig), '(self, /, a, b=1, *args, c, d=2, **kwargs)')
+
func.__text_signature__ = '($self, a, b=1, /, *args, c, d=2, **kwargs)'
sig = inspect.signature(func)
self.assertEqual(str(sig), '(self, a, b=1, /, *args, c, d=2, **kwargs)')
+ func.__text_signature__ = '(self, a=1+2, b=4-3, c=1 | 3 | 16)'
+ sig = inspect.signature(func)
+ self.assertEqual(str(sig), '(self, a=3, b=1, c=19)')
+
+ func.__text_signature__ = '(self, a=1,\nb=2,\n\n\n c=3)'
+ sig = inspect.signature(func)
+ self.assertEqual(str(sig), '(self, a=1, b=2, c=3)')
+
+ func.__text_signature__ = '(self, x=does_not_exist)'
+ with self.assertRaises(ValueError):
+ inspect.signature(func)
+ func.__text_signature__ = '(self, x=sys, y=inspect)'
+ with self.assertRaises(ValueError):
+ inspect.signature(func)
+ func.__text_signature__ = '(self, 123)'
+ with self.assertRaises(ValueError):
+ inspect.signature(func)
+
def test_base_class_have_text_signature(self):
# see issue 43118
from test.ann_module7 import BufferedReader
@@ -4328,7 +4447,6 @@ def test_qualname_source(self):
self.assertEqual(err, b'')
def test_builtins(self):
- module = importlib.import_module('unittest')
_, out, err = assert_python_failure('-m', 'inspect',
'sys')
lines = err.decode().splitlines()
diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py
index a72699cc7506af..a1c4a04f5e087c 100644
--- a/Lib/test/test_int.py
+++ b/Lib/test/test_int.py
@@ -1,4 +1,5 @@
import sys
+import time
import unittest
from test import support
@@ -148,6 +149,8 @@ def test_basic(self):
self.assertEqual(int(' 0O123 ', 0), 83)
self.assertEqual(int(' 0X123 ', 0), 291)
self.assertEqual(int(' 0B100 ', 0), 4)
+ with self.assertRaises(ValueError):
+ int('010', 0)
# without base still base 10
self.assertEqual(int('0123'), 123)
@@ -214,6 +217,24 @@ def test_basic(self):
self.assertEqual(int('2br45qc', 35), 4294967297)
self.assertEqual(int('1z141z5', 36), 4294967297)
+ def test_invalid_signs(self):
+ with self.assertRaises(ValueError):
+ int('+')
+ with self.assertRaises(ValueError):
+ int('-')
+ with self.assertRaises(ValueError):
+ int('- 1')
+ with self.assertRaises(ValueError):
+ int('+ 1')
+ with self.assertRaises(ValueError):
+ int(' + 1 ')
+
+ def test_unicode(self):
+ self.assertEqual(int("१२३४५६७८९०1234567890"), 12345678901234567890)
+ self.assertEqual(int('١٢٣٤٥٦٧٨٩٠'), 1234567890)
+ self.assertEqual(int("१२३४५६७८९०1234567890", 0), 12345678901234567890)
+ self.assertEqual(int('١٢٣٤٥٦٧٨٩٠', 0), 1234567890)
+
def test_underscores(self):
for lit in VALID_UNDERSCORE_LITERALS:
if any(ch in lit for ch in '.eEjJ'):
@@ -577,5 +598,202 @@ def test_issue31619(self):
self.assertEqual(int('1_2_3_4_5_6_7', 32), 1144132807)
+class IntStrDigitLimitsTests(unittest.TestCase):
+
+ int_class = int # Override this in subclasses to reuse the suite.
+
+ def setUp(self):
+ super().setUp()
+ self._previous_limit = sys.get_int_max_str_digits()
+ sys.set_int_max_str_digits(2048)
+
+ def tearDown(self):
+ sys.set_int_max_str_digits(self._previous_limit)
+ super().tearDown()
+
+ def test_disabled_limit(self):
+ self.assertGreater(sys.get_int_max_str_digits(), 0)
+ self.assertLess(sys.get_int_max_str_digits(), 20_000)
+ with support.adjust_int_max_str_digits(0):
+ self.assertEqual(sys.get_int_max_str_digits(), 0)
+ i = self.int_class('1' * 20_000)
+ str(i)
+ self.assertGreater(sys.get_int_max_str_digits(), 0)
+
+ def test_max_str_digits_edge_cases(self):
+ """Ignore the +/- sign and space padding."""
+ int_class = self.int_class
+ maxdigits = sys.get_int_max_str_digits()
+
+ int_class('1' * maxdigits)
+ int_class(' ' + '1' * maxdigits)
+ int_class('1' * maxdigits + ' ')
+ int_class('+' + '1' * maxdigits)
+ int_class('-' + '1' * maxdigits)
+ self.assertEqual(len(str(10 ** (maxdigits - 1))), maxdigits)
+
+ def check(self, i, base=None):
+ with self.assertRaises(ValueError):
+ if base is None:
+ self.int_class(i)
+ else:
+ self.int_class(i, base)
+
+ def test_max_str_digits(self):
+ maxdigits = sys.get_int_max_str_digits()
+
+ self.check('1' * (maxdigits + 1))
+ self.check(' ' + '1' * (maxdigits + 1))
+ self.check('1' * (maxdigits + 1) + ' ')
+ self.check('+' + '1' * (maxdigits + 1))
+ self.check('-' + '1' * (maxdigits + 1))
+ self.check('1' * (maxdigits + 1))
+
+ i = 10 ** maxdigits
+ with self.assertRaises(ValueError):
+ str(i)
+
+ def test_denial_of_service_prevented_int_to_str(self):
+ """Regression test: ensure we fail before performing O(N**2) work."""
+ maxdigits = sys.get_int_max_str_digits()
+ assert maxdigits < 50_000, maxdigits # A test prerequisite.
+ get_time = time.process_time
+ if get_time() <= 0: # some platforms like WASM lack process_time()
+ get_time = time.monotonic
+
+ huge_int = int(f'0x{"c"*65_000}', base=16) # 78268 decimal digits.
+ digits = 78_268
+ with support.adjust_int_max_str_digits(digits):
+ start = get_time()
+ huge_decimal = str(huge_int)
+ seconds_to_convert = get_time() - start
+ self.assertEqual(len(huge_decimal), digits)
+ # Ensuring that we chose a slow enough conversion to measure.
+ # It takes 0.1 seconds on a Zen based cloud VM in an opt build.
+ # Some OSes have a low res 1/64s timer, skip if hard to measure.
+ if seconds_to_convert < 1/64:
+ raise unittest.SkipTest('"slow" conversion took only '
+ f'{seconds_to_convert} seconds.')
+
+ # We test with the limit almost at the size needed to check performance.
+ # The performant limit check is slightly fuzzy, give it a some room.
+ with support.adjust_int_max_str_digits(int(.995 * digits)):
+ with self.assertRaises(ValueError) as err:
+ start = get_time()
+ str(huge_int)
+ seconds_to_fail_huge = get_time() - start
+ self.assertIn('conversion', str(err.exception))
+ self.assertLessEqual(seconds_to_fail_huge, seconds_to_convert/2)
+
+ # Now we test that a conversion that would take 30x as long also fails
+ # in a similarly fast fashion.
+ extra_huge_int = int(f'0x{"c"*500_000}', base=16) # 602060 digits.
+ with self.assertRaises(ValueError) as err:
+ start = get_time()
+ # If not limited, 8 seconds said Zen based cloud VM.
+ str(extra_huge_int)
+ seconds_to_fail_extra_huge = get_time() - start
+ self.assertIn('conversion', str(err.exception))
+ self.assertLess(seconds_to_fail_extra_huge, seconds_to_convert/2)
+
+ def test_denial_of_service_prevented_str_to_int(self):
+ """Regression test: ensure we fail before performing O(N**2) work."""
+ maxdigits = sys.get_int_max_str_digits()
+ assert maxdigits < 100_000, maxdigits # A test prerequisite.
+ get_time = time.process_time
+ if get_time() <= 0: # some platforms like WASM lack process_time()
+ get_time = time.monotonic
+
+ digits = 133700
+ huge = '8'*digits
+ with support.adjust_int_max_str_digits(digits):
+ start = get_time()
+ int(huge)
+ seconds_to_convert = get_time() - start
+ # Ensuring that we chose a slow enough conversion to measure.
+ # It takes 0.1 seconds on a Zen based cloud VM in an opt build.
+ # Some OSes have a low res 1/64s timer, skip if hard to measure.
+ if seconds_to_convert < 1/64:
+ raise unittest.SkipTest('"slow" conversion took only '
+ f'{seconds_to_convert} seconds.')
+
+ with support.adjust_int_max_str_digits(digits - 1):
+ with self.assertRaises(ValueError) as err:
+ start = get_time()
+ int(huge)
+ seconds_to_fail_huge = get_time() - start
+ self.assertIn('conversion', str(err.exception))
+ self.assertLessEqual(seconds_to_fail_huge, seconds_to_convert/2)
+
+ # Now we test that a conversion that would take 30x as long also fails
+ # in a similarly fast fashion.
+ extra_huge = '7'*1_200_000
+ with self.assertRaises(ValueError) as err:
+ start = get_time()
+ # If not limited, 8 seconds in the Zen based cloud VM.
+ int(extra_huge)
+ seconds_to_fail_extra_huge = get_time() - start
+ self.assertIn('conversion', str(err.exception))
+ self.assertLessEqual(seconds_to_fail_extra_huge, seconds_to_convert/2)
+
+ def test_power_of_two_bases_unlimited(self):
+ """The limit does not apply to power of 2 bases."""
+ maxdigits = sys.get_int_max_str_digits()
+
+ for base in (2, 4, 8, 16, 32):
+ with self.subTest(base=base):
+ self.int_class('1' * (maxdigits + 1), base)
+ assert maxdigits < 100_000
+ self.int_class('1' * 100_000, base)
+
+ def test_underscores_ignored(self):
+ maxdigits = sys.get_int_max_str_digits()
+
+ triples = maxdigits // 3
+ s = '111' * triples
+ s_ = '1_11' * triples
+ self.int_class(s) # succeeds
+ self.int_class(s_) # succeeds
+ self.check(f'{s}111')
+ self.check(f'{s_}_111')
+
+ def test_sign_not_counted(self):
+ int_class = self.int_class
+ max_digits = sys.get_int_max_str_digits()
+ s = '5' * max_digits
+ i = int_class(s)
+ pos_i = int_class(f'+{s}')
+ assert i == pos_i
+ neg_i = int_class(f'-{s}')
+ assert -pos_i == neg_i
+ str(pos_i)
+ str(neg_i)
+
+ def _other_base_helper(self, base):
+ int_class = self.int_class
+ max_digits = sys.get_int_max_str_digits()
+ s = '2' * max_digits
+ i = int_class(s, base)
+ if base > 10:
+ with self.assertRaises(ValueError):
+ str(i)
+ elif base < 10:
+ str(i)
+ with self.assertRaises(ValueError) as err:
+ int_class(f'{s}1', base)
+
+ def test_int_from_other_bases(self):
+ base = 3
+ with self.subTest(base=base):
+ self._other_base_helper(base)
+ base = 36
+ with self.subTest(base=base):
+ self._other_base_helper(base)
+
+
+class IntSubclassStrDigitLimitsTests(IntStrDigitLimitsTests):
+ int_class = IntSubclass
+
+
if __name__ == "__main__":
unittest.main()
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 5528c461e58ae6..79aa2da58622b2 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -429,6 +429,7 @@ def test_invalid_operations(self):
@unittest.skipIf(
support.is_emscripten, "fstat() of a pipe fd is not supported"
)
+ @unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
def test_optional_abilities(self):
# Test for OSError when optional APIs are not supported
# The purpose of this test is to try fileno(), reading, writing and
@@ -887,6 +888,14 @@ def badopener(fname, flags):
open('non-existent', 'r', opener=badopener)
self.assertEqual(str(cm.exception), 'opener returned -2')
+ def test_opener_invalid_fd(self):
+ # Check that OSError is raised with error code EBADF if the
+ # opener returns an invalid file descriptor (see gh-82212).
+ fd = os_helper.make_bad_fd()
+ with self.assertRaises(OSError) as cm:
+ self.open('foo', opener=lambda name, flags: fd)
+ self.assertEqual(cm.exception.errno, errno.EBADF)
+
def test_fileio_closefd(self):
# Issue #4841
with self.open(__file__, 'rb') as f1, \
@@ -3569,6 +3578,10 @@ def seekable(self): return True
F.tell = lambda x: 0
t = self.TextIOWrapper(F(), encoding='utf-8')
+ def test_reconfigure_locale(self):
+ wrapper = io.TextIOWrapper(io.BytesIO(b"test"))
+ wrapper.reconfigure(encoding="locale")
+
def test_reconfigure_encoding_read(self):
# latin1 -> utf8
# (latin1 can decode utf-8 encoded string)
@@ -3918,7 +3931,15 @@ def test_translate(self):
self.assertEqual(decoder.decode(b"\r\r\n"), "\r\r\n")
class CIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest):
- pass
+ @support.cpython_only
+ def test_uninitialized(self):
+ uninitialized = self.IncrementalNewlineDecoder.__new__(
+ self.IncrementalNewlineDecoder)
+ self.assertRaises(ValueError, uninitialized.decode, b'bar')
+ self.assertRaises(ValueError, uninitialized.getstate)
+ self.assertRaises(ValueError, uninitialized.setstate, (b'foo', 0))
+ self.assertRaises(ValueError, uninitialized.reset)
+
class PyIncrementalNewlineDecoderTest(IncrementalNewlineDecoderTest):
pass
@@ -3970,6 +3991,7 @@ def test_removed_u_mode(self):
@unittest.skipIf(
support.is_emscripten, "fstat() of a pipe fd is not supported"
)
+ @unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
def test_open_pipe_with_append(self):
# bpo-27805: Ignore ESPIPE from lseek() in open().
r, w = os.pipe()
@@ -4108,6 +4130,7 @@ def cleanup_fds():
with warnings_helper.check_no_resource_warning(self):
open(r, *args, closefd=False, **kwargs)
+ @unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
def test_warn_on_dealloc_fd(self):
self._check_warn_on_dealloc_fd("rb", buffering=0)
self._check_warn_on_dealloc_fd("rb")
@@ -4147,6 +4170,7 @@ def test_nonblock_pipe_write_smallbuf(self):
@unittest.skipUnless(hasattr(os, 'set_blocking'),
'os.set_blocking() required for this test')
+ @unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
def _test_nonblock_pipe_write(self, bufsize):
sent = []
received = []
@@ -4458,14 +4482,17 @@ def _read():
raise
@requires_alarm
+ @unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
def test_interrupted_write_unbuffered(self):
self.check_interrupted_write(b"xy", b"xy", mode="wb", buffering=0)
@requires_alarm
+ @unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
def test_interrupted_write_buffered(self):
self.check_interrupted_write(b"xy", b"xy", mode="wb")
@requires_alarm
+ @unittest.skipUnless(hasattr(os, "pipe"), "requires os.pipe()")
def test_interrupted_write_text(self):
self.check_interrupted_write("xy", b"xy", mode="w", encoding="ascii")
diff --git a/Lib/test/test_ipaddress.py b/Lib/test/test_ipaddress.py
index c9ae7dab387ced..a5388b2e5debd8 100644
--- a/Lib/test/test_ipaddress.py
+++ b/Lib/test/test_ipaddress.py
@@ -1652,7 +1652,7 @@ def testNth(self):
self.assertRaises(IndexError, self.ipv6_scoped_network.__getitem__, 1 << 64)
def testGetitem(self):
- # http://code.google.com/p/ipaddr-py/issues/detail?id=15
+ # https://code.google.com/p/ipaddr-py/issues/detail?id=15
addr = ipaddress.IPv4Network('172.31.255.128/255.255.255.240')
self.assertEqual(28, addr.prefixlen)
addr_list = list(addr)
@@ -2277,6 +2277,39 @@ def testReservedIpv4(self):
self.assertEqual(False, ipaddress.ip_address('128.0.0.0').is_loopback)
self.assertEqual(True, ipaddress.ip_network('0.0.0.0').is_unspecified)
+ def testPrivateNetworks(self):
+ self.assertEqual(False, ipaddress.ip_network("0.0.0.0/0").is_private)
+ self.assertEqual(False, ipaddress.ip_network("1.0.0.0/8").is_private)
+
+ self.assertEqual(True, ipaddress.ip_network("0.0.0.0/8").is_private)
+ self.assertEqual(True, ipaddress.ip_network("10.0.0.0/8").is_private)
+ self.assertEqual(True, ipaddress.ip_network("127.0.0.0/8").is_private)
+ self.assertEqual(True, ipaddress.ip_network("169.254.0.0/16").is_private)
+ self.assertEqual(True, ipaddress.ip_network("172.16.0.0/12").is_private)
+ self.assertEqual(True, ipaddress.ip_network("192.0.0.0/29").is_private)
+ self.assertEqual(True, ipaddress.ip_network("192.0.0.170/31").is_private)
+ self.assertEqual(True, ipaddress.ip_network("192.0.2.0/24").is_private)
+ self.assertEqual(True, ipaddress.ip_network("192.168.0.0/16").is_private)
+ self.assertEqual(True, ipaddress.ip_network("198.18.0.0/15").is_private)
+ self.assertEqual(True, ipaddress.ip_network("198.51.100.0/24").is_private)
+ self.assertEqual(True, ipaddress.ip_network("203.0.113.0/24").is_private)
+ self.assertEqual(True, ipaddress.ip_network("240.0.0.0/4").is_private)
+ self.assertEqual(True, ipaddress.ip_network("255.255.255.255/32").is_private)
+
+ self.assertEqual(False, ipaddress.ip_network("::/0").is_private)
+ self.assertEqual(False, ipaddress.ip_network("::ff/128").is_private)
+
+ self.assertEqual(True, ipaddress.ip_network("::1/128").is_private)
+ self.assertEqual(True, ipaddress.ip_network("::/128").is_private)
+ self.assertEqual(True, ipaddress.ip_network("::ffff:0:0/96").is_private)
+ self.assertEqual(True, ipaddress.ip_network("100::/64").is_private)
+ self.assertEqual(True, ipaddress.ip_network("2001::/23").is_private)
+ self.assertEqual(True, ipaddress.ip_network("2001:2::/48").is_private)
+ self.assertEqual(True, ipaddress.ip_network("2001:db8::/32").is_private)
+ self.assertEqual(True, ipaddress.ip_network("2001:10::/28").is_private)
+ self.assertEqual(True, ipaddress.ip_network("fc00::/7").is_private)
+ self.assertEqual(True, ipaddress.ip_network("fe80::/10").is_private)
+
def testReservedIpv6(self):
self.assertEqual(True, ipaddress.ip_network('ffff::').is_multicast)
diff --git a/Lib/test/test_iter.py b/Lib/test/test_iter.py
index 554f602f6252c0..30aedb0db3bb3d 100644
--- a/Lib/test/test_iter.py
+++ b/Lib/test/test_iter.py
@@ -7,6 +7,9 @@
from test.support import check_free_after_iterating, ALWAYS_EQ, NEVER_EQ
import pickle
import collections.abc
+import functools
+import contextlib
+import builtins
# Test result of triple loop (too big to inline)
TRIPLETS = [(0, 0, 0), (0, 0, 1), (0, 0, 2),
@@ -81,6 +84,22 @@ class BadIterableClass:
def __iter__(self):
raise ZeroDivisionError
+class CallableIterClass:
+ def __init__(self):
+ self.i = 0
+ def __call__(self):
+ i = self.i
+ self.i = i + 1
+ if i > 100:
+ raise IndexError # Emergency stop
+ return i
+
+class EmptyIterClass:
+ def __len__(self):
+ return 0
+ def __getitem__(self, i):
+ raise StopIteration
+
# Main test suite
class TestCase(unittest.TestCase):
@@ -228,6 +247,78 @@ def test_mutating_seq_class_exhausted_iter(self):
self.assertEqual(list(empit), [5, 6])
self.assertEqual(list(a), [0, 1, 2, 3, 4, 5, 6])
+ def test_reduce_mutating_builtins_iter(self):
+ # This is a reproducer of issue #101765
+ # where iter `__reduce__` calls could lead to a segfault or SystemError
+ # depending on the order of C argument evaluation, which is undefined
+
+ # Backup builtins
+ builtins_dict = builtins.__dict__
+ orig = {"iter": iter, "reversed": reversed}
+
+ def run(builtin_name, item, sentinel=None):
+ it = iter(item) if sentinel is None else iter(item, sentinel)
+
+ class CustomStr:
+ def __init__(self, name, iterator):
+ self.name = name
+ self.iterator = iterator
+ def __hash__(self):
+ return hash(self.name)
+ def __eq__(self, other):
+ # Here we exhaust our iterator, possibly changing
+ # its `it_seq` pointer to NULL
+ # The `__reduce__` call should correctly get
+ # the pointers after this call
+ list(self.iterator)
+ return other == self.name
+
+ # del is required here
+ # to not prematurely call __eq__ from
+ # the hash collision with the old key
+ del builtins_dict[builtin_name]
+ builtins_dict[CustomStr(builtin_name, it)] = orig[builtin_name]
+
+ return it.__reduce__()
+
+ types = [
+ (EmptyIterClass(),),
+ (bytes(8),),
+ (bytearray(8),),
+ ((1, 2, 3),),
+ (lambda: 0, 0),
+ (tuple[int],) # GenericAlias
+ ]
+
+ try:
+ run_iter = functools.partial(run, "iter")
+ # The returned value of `__reduce__` should not only be valid
+ # but also *empty*, as `it` was exhausted during `__eq__`
+ # i.e "xyz" returns (iter, ("",))
+ self.assertEqual(run_iter("xyz"), (orig["iter"], ("",)))
+ self.assertEqual(run_iter([1, 2, 3]), (orig["iter"], ([],)))
+
+ # _PyEval_GetBuiltin is also called for `reversed` in a branch of
+ # listiter_reduce_general
+ self.assertEqual(
+ run("reversed", orig["reversed"](list(range(8)))),
+ (iter, ([],))
+ )
+
+ for case in types:
+ self.assertEqual(run_iter(*case), (orig["iter"], ((),)))
+ finally:
+ # Restore original builtins
+ for key, func in orig.items():
+ # need to suppress KeyErrors in case
+ # a failed test deletes the key without setting anything
+ with contextlib.suppress(KeyError):
+ # del is required here
+ # to not invoke our custom __eq__ from
+ # the hash collision with the old key
+ del builtins_dict[key]
+ builtins_dict[key] = func
+
# Test a new_style class with __iter__ but no next() method
def test_new_style_iter_class(self):
class IterClass(object):
@@ -237,16 +328,7 @@ def __iter__(self):
# Test two-argument iter() with callable instance
def test_iter_callable(self):
- class C:
- def __init__(self):
- self.i = 0
- def __call__(self):
- i = self.i
- self.i = i + 1
- if i > 100:
- raise IndexError # Emergency stop
- return i
- self.check_iterator(iter(C(), 10), list(range(10)), pickle=False)
+ self.check_iterator(iter(CallableIterClass(), 10), list(range(10)), pickle=True)
# Test two-argument iter() with function
def test_iter_function(self):
@@ -266,6 +348,31 @@ def spam(state=[0]):
return i
self.check_iterator(iter(spam, 20), list(range(10)), pickle=False)
+ def test_iter_function_concealing_reentrant_exhaustion(self):
+ # gh-101892: Test two-argument iter() with a function that
+ # exhausts its associated iterator but forgets to either return
+ # a sentinel value or raise StopIteration.
+ HAS_MORE = 1
+ NO_MORE = 2
+
+ def exhaust(iterator):
+ """Exhaust an iterator without raising StopIteration."""
+ list(iterator)
+
+ def spam():
+ # Touching the iterator with exhaust() below will call
+ # spam() once again so protect against recursion.
+ if spam.is_recursive_call:
+ return NO_MORE
+ spam.is_recursive_call = True
+ exhaust(spam.iterator)
+ return HAS_MORE
+
+ spam.is_recursive_call = False
+ spam.iterator = iter(spam, NO_MORE)
+ with self.assertRaises(StopIteration):
+ next(spam.iterator)
+
# Test exception propagation through function iterator
def test_exception_function(self):
def spam(state=[0]):
diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py
index 238afbbd883d3a..311c2a3288dc8c 100644
--- a/Lib/test/test_itertools.py
+++ b/Lib/test/test_itertools.py
@@ -636,6 +636,7 @@ def test_cycle(self):
self.assertRaises(TypeError, cycle, 5)
self.assertEqual(list(islice(cycle(gen3()),10)), [0,1,2,0,1,2,0,1,2,0])
+ def test_cycle_copy_pickle(self):
# check copy, deepcopy, pickle
c = cycle('abc')
self.assertEqual(next(c), 'a')
@@ -671,6 +672,37 @@ def test_cycle(self):
d = pickle.loads(p) # rebuild the cycle object
self.assertEqual(take(20, d), list('cdeabcdeabcdeabcdeab'))
+ def test_cycle_unpickle_compat(self):
+ testcases = [
+ b'citertools\ncycle\n(c__builtin__\niter\n((lI1\naI2\naI3\natRI1\nbtR((lI1\naI0\ntb.',
+ b'citertools\ncycle\n(c__builtin__\niter\n(](K\x01K\x02K\x03etRK\x01btR(]K\x01aK\x00tb.',
+ b'\x80\x02citertools\ncycle\nc__builtin__\niter\n](K\x01K\x02K\x03e\x85RK\x01b\x85R]K\x01aK\x00\x86b.',
+ b'\x80\x03citertools\ncycle\ncbuiltins\niter\n](K\x01K\x02K\x03e\x85RK\x01b\x85R]K\x01aK\x00\x86b.',
+ b'\x80\x04\x95=\x00\x00\x00\x00\x00\x00\x00\x8c\titertools\x8c\x05cycle\x93\x8c\x08builtins\x8c\x04iter\x93](K\x01K\x02K\x03e\x85RK\x01b\x85R]K\x01aK\x00\x86b.',
+
+ b'citertools\ncycle\n(c__builtin__\niter\n((lp0\nI1\naI2\naI3\natRI1\nbtR(g0\nI1\ntb.',
+ b'citertools\ncycle\n(c__builtin__\niter\n(]q\x00(K\x01K\x02K\x03etRK\x01btR(h\x00K\x01tb.',
+ b'\x80\x02citertools\ncycle\nc__builtin__\niter\n]q\x00(K\x01K\x02K\x03e\x85RK\x01b\x85Rh\x00K\x01\x86b.',
+ b'\x80\x03citertools\ncycle\ncbuiltins\niter\n]q\x00(K\x01K\x02K\x03e\x85RK\x01b\x85Rh\x00K\x01\x86b.',
+ b'\x80\x04\x95<\x00\x00\x00\x00\x00\x00\x00\x8c\titertools\x8c\x05cycle\x93\x8c\x08builtins\x8c\x04iter\x93]\x94(K\x01K\x02K\x03e\x85RK\x01b\x85Rh\x00K\x01\x86b.',
+
+ b'citertools\ncycle\n(c__builtin__\niter\n((lI1\naI2\naI3\natRI1\nbtR((lI1\naI00\ntb.',
+ b'citertools\ncycle\n(c__builtin__\niter\n(](K\x01K\x02K\x03etRK\x01btR(]K\x01aI00\ntb.',
+ b'\x80\x02citertools\ncycle\nc__builtin__\niter\n](K\x01K\x02K\x03e\x85RK\x01b\x85R]K\x01a\x89\x86b.',
+ b'\x80\x03citertools\ncycle\ncbuiltins\niter\n](K\x01K\x02K\x03e\x85RK\x01b\x85R]K\x01a\x89\x86b.',
+ b'\x80\x04\x95<\x00\x00\x00\x00\x00\x00\x00\x8c\titertools\x8c\x05cycle\x93\x8c\x08builtins\x8c\x04iter\x93](K\x01K\x02K\x03e\x85RK\x01b\x85R]K\x01a\x89\x86b.',
+
+ b'citertools\ncycle\n(c__builtin__\niter\n((lp0\nI1\naI2\naI3\natRI1\nbtR(g0\nI01\ntb.',
+ b'citertools\ncycle\n(c__builtin__\niter\n(]q\x00(K\x01K\x02K\x03etRK\x01btR(h\x00I01\ntb.',
+ b'\x80\x02citertools\ncycle\nc__builtin__\niter\n]q\x00(K\x01K\x02K\x03e\x85RK\x01b\x85Rh\x00\x88\x86b.',
+ b'\x80\x03citertools\ncycle\ncbuiltins\niter\n]q\x00(K\x01K\x02K\x03e\x85RK\x01b\x85Rh\x00\x88\x86b.',
+ b'\x80\x04\x95;\x00\x00\x00\x00\x00\x00\x00\x8c\titertools\x8c\x05cycle\x93\x8c\x08builtins\x8c\x04iter\x93]\x94(K\x01K\x02K\x03e\x85RK\x01b\x85Rh\x00\x88\x86b.',
+ ]
+ assert len(testcases) == 20
+ for t in testcases:
+ it = pickle.loads(t)
+ self.assertEqual(take(10, it), [2, 3, 1, 2, 3, 1, 2, 3, 1, 2])
+
def test_cycle_setstate(self):
# Verify both modes for restoring state
diff --git a/Lib/test/test_json/test_decode.py b/Lib/test/test_json/test_decode.py
index fdb9e62124ece1..124045b13184b3 100644
--- a/Lib/test/test_json/test_decode.py
+++ b/Lib/test/test_json/test_decode.py
@@ -2,6 +2,7 @@
from io import StringIO
from collections import OrderedDict
from test.test_json import PyTest, CTest
+from test import support
class TestDecode:
@@ -95,5 +96,13 @@ def test_negative_index(self):
d = self.json.JSONDecoder()
self.assertRaises(ValueError, d.raw_decode, 'a'*42, -50000)
+ def test_limit_int(self):
+ maxdigits = 5000
+ with support.adjust_int_max_str_digits(maxdigits):
+ self.loads('1' * maxdigits)
+ with self.assertRaises(ValueError):
+ self.loads('1' * (maxdigits + 1))
+
+
class TestPyDecode(TestDecode, PyTest): pass
class TestCDecode(TestDecode, CTest): pass
diff --git a/Lib/test/test_json/test_fail.py b/Lib/test/test_json/test_fail.py
index eb9064edea9115..efc982e8b0eb04 100644
--- a/Lib/test/test_json/test_fail.py
+++ b/Lib/test/test_json/test_fail.py
@@ -2,73 +2,73 @@
# 2007-10-05
JSONDOCS = [
- # http://json.org/JSON_checker/test/fail1.json
+ # https://json.org/JSON_checker/test/fail1.json
'"A JSON payload should be an object or array, not a string."',
- # http://json.org/JSON_checker/test/fail2.json
+ # https://json.org/JSON_checker/test/fail2.json
'["Unclosed array"',
- # http://json.org/JSON_checker/test/fail3.json
+ # https://json.org/JSON_checker/test/fail3.json
'{unquoted_key: "keys must be quoted"}',
- # http://json.org/JSON_checker/test/fail4.json
+ # https://json.org/JSON_checker/test/fail4.json
'["extra comma",]',
- # http://json.org/JSON_checker/test/fail5.json
+ # https://json.org/JSON_checker/test/fail5.json
'["double extra comma",,]',
- # http://json.org/JSON_checker/test/fail6.json
+ # https://json.org/JSON_checker/test/fail6.json
'[ , "<-- missing value"]',
- # http://json.org/JSON_checker/test/fail7.json
+ # https://json.org/JSON_checker/test/fail7.json
'["Comma after the close"],',
- # http://json.org/JSON_checker/test/fail8.json
+ # https://json.org/JSON_checker/test/fail8.json
'["Extra close"]]',
- # http://json.org/JSON_checker/test/fail9.json
+ # https://json.org/JSON_checker/test/fail9.json
'{"Extra comma": true,}',
- # http://json.org/JSON_checker/test/fail10.json
+ # https://json.org/JSON_checker/test/fail10.json
'{"Extra value after close": true} "misplaced quoted value"',
- # http://json.org/JSON_checker/test/fail11.json
+ # https://json.org/JSON_checker/test/fail11.json
'{"Illegal expression": 1 + 2}',
- # http://json.org/JSON_checker/test/fail12.json
+ # https://json.org/JSON_checker/test/fail12.json
'{"Illegal invocation": alert()}',
- # http://json.org/JSON_checker/test/fail13.json
+ # https://json.org/JSON_checker/test/fail13.json
'{"Numbers cannot have leading zeroes": 013}',
- # http://json.org/JSON_checker/test/fail14.json
+ # https://json.org/JSON_checker/test/fail14.json
'{"Numbers cannot be hex": 0x14}',
- # http://json.org/JSON_checker/test/fail15.json
+ # https://json.org/JSON_checker/test/fail15.json
'["Illegal backslash escape: \\x15"]',
- # http://json.org/JSON_checker/test/fail16.json
+ # https://json.org/JSON_checker/test/fail16.json
'[\\naked]',
- # http://json.org/JSON_checker/test/fail17.json
+ # https://json.org/JSON_checker/test/fail17.json
'["Illegal backslash escape: \\017"]',
- # http://json.org/JSON_checker/test/fail18.json
+ # https://json.org/JSON_checker/test/fail18.json
'[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]',
- # http://json.org/JSON_checker/test/fail19.json
+ # https://json.org/JSON_checker/test/fail19.json
'{"Missing colon" null}',
- # http://json.org/JSON_checker/test/fail20.json
+ # https://json.org/JSON_checker/test/fail20.json
'{"Double colon":: null}',
- # http://json.org/JSON_checker/test/fail21.json
+ # https://json.org/JSON_checker/test/fail21.json
'{"Comma instead of colon", null}',
- # http://json.org/JSON_checker/test/fail22.json
+ # https://json.org/JSON_checker/test/fail22.json
'["Colon instead of comma": false]',
- # http://json.org/JSON_checker/test/fail23.json
+ # https://json.org/JSON_checker/test/fail23.json
'["Bad value", truth]',
- # http://json.org/JSON_checker/test/fail24.json
+ # https://json.org/JSON_checker/test/fail24.json
"['single quote']",
- # http://json.org/JSON_checker/test/fail25.json
+ # https://json.org/JSON_checker/test/fail25.json
'["\ttab\tcharacter\tin\tstring\t"]',
- # http://json.org/JSON_checker/test/fail26.json
+ # https://json.org/JSON_checker/test/fail26.json
'["tab\\ character\\ in\\ string\\ "]',
- # http://json.org/JSON_checker/test/fail27.json
+ # https://json.org/JSON_checker/test/fail27.json
'["line\nbreak"]',
- # http://json.org/JSON_checker/test/fail28.json
+ # https://json.org/JSON_checker/test/fail28.json
'["line\\\nbreak"]',
- # http://json.org/JSON_checker/test/fail29.json
+ # https://json.org/JSON_checker/test/fail29.json
'[0e]',
- # http://json.org/JSON_checker/test/fail30.json
+ # https://json.org/JSON_checker/test/fail30.json
'[0e+]',
- # http://json.org/JSON_checker/test/fail31.json
+ # https://json.org/JSON_checker/test/fail31.json
'[0e+-1]',
- # http://json.org/JSON_checker/test/fail32.json
+ # https://json.org/JSON_checker/test/fail32.json
'{"Comma instead if closing brace": true,',
- # http://json.org/JSON_checker/test/fail33.json
+ # https://json.org/JSON_checker/test/fail33.json
'["mismatch"}',
- # http://code.google.com/p/simplejson/issues/detail?id=3
+ # https://code.google.com/archive/p/simplejson/issues/3
'["A\u001FZ control characters in string"]',
]
diff --git a/Lib/test/test_json/test_pass1.py b/Lib/test/test_json/test_pass1.py
index 15e64b0aeae709..26bf3cdbd77303 100644
--- a/Lib/test/test_json/test_pass1.py
+++ b/Lib/test/test_json/test_pass1.py
@@ -1,7 +1,7 @@
from test.test_json import PyTest, CTest
-# from http://json.org/JSON_checker/test/pass1.json
+# from https://json.org/JSON_checker/test/pass1.json
JSON = r'''
[
"JSON Test Pattern pass1",
diff --git a/Lib/test/test_json/test_pass2.py b/Lib/test/test_json/test_pass2.py
index 35075249e3bc6f..9340de665aabe5 100644
--- a/Lib/test/test_json/test_pass2.py
+++ b/Lib/test/test_json/test_pass2.py
@@ -1,7 +1,7 @@
from test.test_json import PyTest, CTest
-# from http://json.org/JSON_checker/test/pass2.json
+# from https://json.org/JSON_checker/test/pass2.json
JSON = r'''
[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]
'''
diff --git a/Lib/test/test_json/test_pass3.py b/Lib/test/test_json/test_pass3.py
index cd0cf170d275c5..0adccc1c2a5316 100644
--- a/Lib/test/test_json/test_pass3.py
+++ b/Lib/test/test_json/test_pass3.py
@@ -1,7 +1,7 @@
from test.test_json import PyTest, CTest
-# from http://json.org/JSON_checker/test/pass3.json
+# from https://json.org/JSON_checker/test/pass3.json
JSON = r'''
{
"JSON Test Pattern pass3": {
diff --git a/Lib/test/test_keyword.py b/Lib/test/test_keyword.py
index 3e2a8b3fb7f4c3..f329f88fa01d51 100644
--- a/Lib/test/test_keyword.py
+++ b/Lib/test/test_keyword.py
@@ -20,18 +20,36 @@ def test_changing_the_kwlist_does_not_affect_iskeyword(self):
keyword.kwlist = ['its', 'all', 'eggs', 'beans', 'and', 'a', 'slice']
self.assertFalse(keyword.iskeyword('eggs'))
+ def test_changing_the_softkwlist_does_not_affect_issoftkeyword(self):
+ oldlist = keyword.softkwlist
+ self.addCleanup(setattr, keyword, "softkwlist", oldlist)
+ keyword.softkwlist = ["foo", "bar", "spam", "egs", "case"]
+ self.assertFalse(keyword.issoftkeyword("spam"))
+
def test_all_keywords_fail_to_be_used_as_names(self):
for key in keyword.kwlist:
with self.assertRaises(SyntaxError):
exec(f"{key} = 42")
+ def test_all_soft_keywords_can_be_used_as_names(self):
+ for key in keyword.softkwlist:
+ exec(f"{key} = 42")
+
def test_async_and_await_are_keywords(self):
self.assertIn("async", keyword.kwlist)
self.assertIn("await", keyword.kwlist)
+ def test_match_and_case_are_soft_keywords(self):
+ self.assertIn("match", keyword.softkwlist)
+ self.assertIn("case", keyword.softkwlist)
+ self.assertIn("_", keyword.softkwlist)
+
def test_keywords_are_sorted(self):
self.assertListEqual(sorted(keyword.kwlist), keyword.kwlist)
+ def test_softkeywords_are_sorted(self):
+ self.assertListEqual(sorted(keyword.softkwlist), keyword.softkwlist)
+
if __name__ == "__main__":
unittest.main()
diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py
index 8f6bec16200534..3c11c59baef6e5 100644
--- a/Lib/test/test_largefile.py
+++ b/Lib/test/test_largefile.py
@@ -156,6 +156,8 @@ def test_seekable(self):
def skip_no_disk_space(path, required):
def decorator(fun):
def wrapper(*args, **kwargs):
+ if not hasattr(shutil, "disk_usage"):
+ raise unittest.SkipTest("requires shutil.disk_usage")
if shutil.disk_usage(os.path.realpath(path)).free < required:
hsize = int(required / 1024 / 1024)
raise unittest.SkipTest(
diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py
index 2e10c55e339d5c..d0a1f624564cb2 100644
--- a/Lib/test/test_launcher.py
+++ b/Lib/test/test_launcher.py
@@ -57,7 +57,17 @@
None: sys.prefix,
}
},
- }
+ },
+ "PythonTestSuite1": {
+ "DisplayName": "Python Test Suite Single",
+ "3.100": {
+ "DisplayName": "Single Interpreter",
+ "InstallPath": {
+ None: sys.prefix,
+ "ExecutablePath": sys.executable,
+ }
+ }
+ },
}
@@ -68,12 +78,17 @@
)
-TEST_PY_COMMANDS = "\n".join([
+TEST_PY_DEFAULTS = "\n".join([
"[defaults]",
- *[f"{k.lower()}={v}" for k, v in TEST_PY_ENV.items()]
+ *[f"{k[3:].lower()}={v}" for k, v in TEST_PY_ENV.items()],
])
+TEST_PY_COMMANDS = "\n".join([
+ "[commands]",
+ "test-command=TEST_EXE.exe",
+])
+
def create_registry_data(root, data):
def _create_registry_data(root, key, value):
if isinstance(value, dict):
@@ -150,7 +165,7 @@ class RunPyMixin:
@classmethod
def find_py(cls):
py_exe = None
- if sysconfig.is_python_build(True):
+ if sysconfig.is_python_build():
py_exe = Path(sys.executable).parent / PY_EXE
else:
for p in os.getenv("PATH").split(";"):
@@ -174,7 +189,7 @@ def find_py(cls):
errors="ignore",
) as p:
p.stdin.close()
- version = next(p.stdout).splitlines()[0].rpartition(" ")[2]
+ version = next(p.stdout, "\n").splitlines()[0].rpartition(" ")[2]
p.stdout.read()
p.wait(10)
if not sys.version.startswith(version):
@@ -188,20 +203,29 @@ def find_py(cls):
)
return py_exe
- def run_py(self, args, env=None, allow_fail=False, expect_returncode=0):
+ def get_py_exe(self):
+ if not self.py_exe:
+ self.py_exe = self.find_py()
+ return self.py_exe
+
+ def run_py(self, args, env=None, allow_fail=False, expect_returncode=0, argv=None):
if not self.py_exe:
self.py_exe = self.find_py()
ignore = {"VIRTUAL_ENV", "PY_PYTHON", "PY_PYTHON2", "PY_PYTHON3"}
env = {
**{k.upper(): v for k, v in os.environ.items() if k.upper() not in ignore},
- **{k.upper(): v for k, v in (env or {}).items()},
"PYLAUNCHER_DEBUG": "1",
"PYLAUNCHER_DRYRUN": "1",
+ "PYLAUNCHER_LIMIT_TO_COMPANY": "",
+ **{k.upper(): v for k, v in (env or {}).items()},
}
+ if not argv:
+ argv = [self.py_exe, *args]
with subprocess.Popen(
- [self.py_exe, *args],
+ argv,
env=env,
+ executable=self.py_exe,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
@@ -231,9 +255,11 @@ def run_py(self, args, env=None, allow_fail=False, expect_returncode=0):
return data
def py_ini(self, content):
- if not self.py_exe:
- self.py_exe = self.find_py()
- return PreservePyIni(self.py_exe.with_name("py.ini"), content)
+ local_appdata = os.environ.get("LOCALAPPDATA")
+ if not local_appdata:
+ raise unittest.SkipTest("LOCALAPPDATA environment variable is "
+ "missing or empty")
+ return PreservePyIni(Path(local_appdata) / "py.ini", content)
@contextlib.contextmanager
def script(self, content, encoding="utf-8"):
@@ -244,6 +270,17 @@ def script(self, content, encoding="utf-8"):
finally:
file.unlink()
+ @contextlib.contextmanager
+ def fake_venv(self):
+ venv = Path.cwd() / "Scripts"
+ venv.mkdir(exist_ok=True, parents=True)
+ venv_exe = (venv / Path(sys.executable).name)
+ venv_exe.touch()
+ try:
+ yield venv_exe, {"VIRTUAL_ENV": str(venv.parent)}
+ finally:
+ shutil.rmtree(venv)
+
class TestLauncher(unittest.TestCase, RunPyMixin):
@classmethod
@@ -349,6 +386,13 @@ def test_filter_to_company(self):
self.assertEqual(company, data["env.company"])
self.assertEqual("3.100", data["env.tag"])
+ def test_filter_to_company_with_default(self):
+ company = "PythonTestSuite"
+ data = self.run_py([f"-V:{company}/"], env=dict(PY_PYTHON="3.0"))
+ self.assertEqual("X.Y.exe", data["LaunchCommand"])
+ self.assertEqual(company, data["env.company"])
+ self.assertEqual("3.100", data["env.tag"])
+
def test_filter_to_tag(self):
company = "PythonTestSuite"
data = self.run_py([f"-V:3.100"])
@@ -356,23 +400,33 @@ def test_filter_to_tag(self):
self.assertEqual(company, data["env.company"])
self.assertEqual("3.100", data["env.tag"])
- data = self.run_py([f"-V:3.100-3"])
+ data = self.run_py([f"-V:3.100-32"])
self.assertEqual("X.Y-32.exe", data["LaunchCommand"])
self.assertEqual(company, data["env.company"])
self.assertEqual("3.100-32", data["env.tag"])
- data = self.run_py([f"-V:3.100-a"])
+ data = self.run_py([f"-V:3.100-arm64"])
self.assertEqual("X.Y-arm64.exe -X fake_arg_for_test", data["LaunchCommand"])
self.assertEqual(company, data["env.company"])
self.assertEqual("3.100-arm64", data["env.tag"])
def test_filter_to_company_and_tag(self):
company = "PythonTestSuite"
- data = self.run_py([f"-V:{company}/3.1"])
+ data = self.run_py([f"-V:{company}/3.1"], expect_returncode=103)
+
+ data = self.run_py([f"-V:{company}/3.100"])
self.assertEqual("X.Y.exe", data["LaunchCommand"])
self.assertEqual(company, data["env.company"])
self.assertEqual("3.100", data["env.tag"])
+ def test_filter_with_single_install(self):
+ company = "PythonTestSuite1"
+ data = self.run_py(
+ [f"-V:Nonexistent"],
+ env={"PYLAUNCHER_LIMIT_TO_COMPANY": company},
+ expect_returncode=103,
+ )
+
def test_search_major_3(self):
try:
data = self.run_py(["-3"], allow_fail=True)
@@ -402,21 +456,21 @@ def test_search_major_2(self):
self.assertTrue(data["env.tag"].startswith("2."), data["env.tag"])
def test_py_default(self):
- with self.py_ini(TEST_PY_COMMANDS):
+ with self.py_ini(TEST_PY_DEFAULTS):
data = self.run_py(["-arg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100", data["SearchInfo.tag"])
self.assertEqual("X.Y.exe -arg", data["stdout"].strip())
def test_py2_default(self):
- with self.py_ini(TEST_PY_COMMANDS):
+ with self.py_ini(TEST_PY_DEFAULTS):
data = self.run_py(["-2", "-arg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100-32", data["SearchInfo.tag"])
self.assertEqual("X.Y-32.exe -arg", data["stdout"].strip())
def test_py3_default(self):
- with self.py_ini(TEST_PY_COMMANDS):
+ with self.py_ini(TEST_PY_DEFAULTS):
data = self.run_py(["-3", "-arg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100-arm64", data["SearchInfo.tag"])
@@ -440,6 +494,15 @@ def test_py3_default_env(self):
self.assertEqual("3.100-arm64", data["SearchInfo.tag"])
self.assertEqual("X.Y-arm64.exe -X fake_arg_for_test -arg", data["stdout"].strip())
+ def test_py_default_short_argv0(self):
+ with self.py_ini(TEST_PY_DEFAULTS):
+ for argv0 in ['"py.exe"', 'py.exe', '"py"', 'py']:
+ with self.subTest(argv0):
+ data = self.run_py(["--version"], argv=f'{argv0} --version')
+ self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+ self.assertEqual("3.100", data["SearchInfo.tag"])
+ self.assertEqual(f'X.Y.exe --version', data["stdout"].strip())
+
def test_py_default_in_list(self):
data = self.run_py(["-0"], env=TEST_PY_ENV)
default = None
@@ -451,12 +514,8 @@ def test_py_default_in_list(self):
self.assertEqual("PythonTestSuite/3.100", default)
def test_virtualenv_in_list(self):
- venv = Path.cwd() / "Scripts"
- venv.mkdir(exist_ok=True, parents=True)
- venv_exe = (venv / Path(sys.executable).name)
- venv_exe.touch()
- try:
- data = self.run_py(["-0p"], env={"VIRTUAL_ENV": str(venv.parent)})
+ with self.fake_venv() as (venv_exe, env):
+ data = self.run_py(["-0p"], env=env)
for line in data["stdout"].splitlines():
m = re.match(r"\s*\*\s+(.+)$", line)
if m:
@@ -465,7 +524,7 @@ def test_virtualenv_in_list(self):
else:
self.fail("did not find active venv path")
- data = self.run_py(["-0"], env={"VIRTUAL_ENV": str(venv.parent)})
+ data = self.run_py(["-0"], env=env)
for line in data["stdout"].splitlines():
m = re.match(r"\s*\*\s+(.+)$", line)
if m:
@@ -473,33 +532,122 @@ def test_virtualenv_in_list(self):
break
else:
self.fail("did not find active venv entry")
- finally:
- shutil.rmtree(venv)
+
+ def test_virtualenv_with_env(self):
+ with self.fake_venv() as (venv_exe, env):
+ data1 = self.run_py([], env={**env, "PY_PYTHON": "PythonTestSuite/3"})
+ data2 = self.run_py(["-V:PythonTestSuite/3"], env={**env, "PY_PYTHON": "PythonTestSuite/3"})
+ # Compare stdout, because stderr goes via ascii
+ self.assertEqual(data1["stdout"].strip(), str(venv_exe))
+ self.assertEqual(data1["SearchInfo.lowPriorityTag"], "True")
+ # Ensure passing the argument doesn't trigger the same behaviour
+ self.assertNotEqual(data2["stdout"].strip(), str(venv_exe))
+ self.assertNotEqual(data2["SearchInfo.lowPriorityTag"], "True")
def test_py_shebang(self):
- with self.py_ini(TEST_PY_COMMANDS):
- with self.script("#! /usr/bin/env python -prearg") as script:
+ with self.py_ini(TEST_PY_DEFAULTS):
+ with self.script("#! /usr/bin/python -prearg") as script:
+ data = self.run_py([script, "-postarg"])
+ self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+ self.assertEqual("3.100", data["SearchInfo.tag"])
+ self.assertEqual(f"X.Y.exe -prearg {script} -postarg", data["stdout"].strip())
+
+ def test_python_shebang(self):
+ with self.py_ini(TEST_PY_DEFAULTS):
+ with self.script("#! python -prearg") as script:
data = self.run_py([script, "-postarg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100", data["SearchInfo.tag"])
self.assertEqual(f"X.Y.exe -prearg {script} -postarg", data["stdout"].strip())
def test_py2_shebang(self):
- with self.py_ini(TEST_PY_COMMANDS):
- with self.script("#! /usr/bin/env python2 -prearg") as script:
+ with self.py_ini(TEST_PY_DEFAULTS):
+ with self.script("#! /usr/bin/python2 -prearg") as script:
data = self.run_py([script, "-postarg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100-32", data["SearchInfo.tag"])
self.assertEqual(f"X.Y-32.exe -prearg {script} -postarg", data["stdout"].strip())
def test_py3_shebang(self):
- with self.py_ini(TEST_PY_COMMANDS):
- with self.script("#! /usr/bin/env python3 -prearg") as script:
+ with self.py_ini(TEST_PY_DEFAULTS):
+ with self.script("#! /usr/bin/python3 -prearg") as script:
+ data = self.run_py([script, "-postarg"])
+ self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+ self.assertEqual("3.100-arm64", data["SearchInfo.tag"])
+ self.assertEqual(f"X.Y-arm64.exe -X fake_arg_for_test -prearg {script} -postarg", data["stdout"].strip())
+
+ def test_py_shebang_nl(self):
+ with self.py_ini(TEST_PY_DEFAULTS):
+ with self.script("#! /usr/bin/python -prearg\n") as script:
+ data = self.run_py([script, "-postarg"])
+ self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+ self.assertEqual("3.100", data["SearchInfo.tag"])
+ self.assertEqual(f"X.Y.exe -prearg {script} -postarg", data["stdout"].strip())
+
+ def test_py2_shebang_nl(self):
+ with self.py_ini(TEST_PY_DEFAULTS):
+ with self.script("#! /usr/bin/python2 -prearg\n") as script:
+ data = self.run_py([script, "-postarg"])
+ self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+ self.assertEqual("3.100-32", data["SearchInfo.tag"])
+ self.assertEqual(f"X.Y-32.exe -prearg {script} -postarg", data["stdout"].strip())
+
+ def test_py3_shebang_nl(self):
+ with self.py_ini(TEST_PY_DEFAULTS):
+ with self.script("#! /usr/bin/python3 -prearg\n") as script:
data = self.run_py([script, "-postarg"])
self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
self.assertEqual("3.100-arm64", data["SearchInfo.tag"])
self.assertEqual(f"X.Y-arm64.exe -X fake_arg_for_test -prearg {script} -postarg", data["stdout"].strip())
+ def test_py_shebang_short_argv0(self):
+ with self.py_ini(TEST_PY_DEFAULTS):
+ with self.script("#! /usr/bin/python -prearg") as script:
+ # Override argv to only pass "py.exe" as the command
+ data = self.run_py([script, "-postarg"], argv=f'"py.exe" "{script}" -postarg')
+ self.assertEqual("PythonTestSuite", data["SearchInfo.company"])
+ self.assertEqual("3.100", data["SearchInfo.tag"])
+ self.assertEqual(f'X.Y.exe -prearg "{script}" -postarg', data["stdout"].strip())
+
+ def test_py_handle_64_in_ini(self):
+ with self.py_ini("\n".join(["[defaults]", "python=3.999-64"])):
+ # Expect this to fail, but should get oldStyleTag flipped on
+ data = self.run_py([], allow_fail=True, expect_returncode=103)
+ self.assertEqual("3.999-64", data["SearchInfo.tag"])
+ self.assertEqual("True", data["SearchInfo.oldStyleTag"])
+
+ def test_search_path(self):
+ stem = Path(sys.executable).stem
+ with self.py_ini(TEST_PY_DEFAULTS):
+ with self.script(f"#! /usr/bin/env {stem} -prearg") as script:
+ data = self.run_py(
+ [script, "-postarg"],
+ env={"PATH": f"{Path(sys.executable).parent};{os.getenv('PATH')}"},
+ )
+ self.assertEqual(f"{sys.executable} -prearg {script} -postarg", data["stdout"].strip())
+
+ def test_search_path_exe(self):
+ # Leave the .exe on the name to ensure we don't add it a second time
+ name = Path(sys.executable).name
+ with self.py_ini(TEST_PY_DEFAULTS):
+ with self.script(f"#! /usr/bin/env {name} -prearg") as script:
+ data = self.run_py(
+ [script, "-postarg"],
+ env={"PATH": f"{Path(sys.executable).parent};{os.getenv('PATH')}"},
+ )
+ self.assertEqual(f"{sys.executable} -prearg {script} -postarg", data["stdout"].strip())
+
+ def test_recursive_search_path(self):
+ stem = self.get_py_exe().stem
+ with self.py_ini(TEST_PY_DEFAULTS):
+ with self.script(f"#! /usr/bin/env {stem}") as script:
+ data = self.run_py(
+ [script],
+ env={"PATH": f"{self.get_py_exe().parent};{os.getenv('PATH')}"},
+ )
+ # The recursive search is ignored and we get normal "py" behavior
+ self.assertEqual(f"X.Y.exe {script}", data["stdout"].strip())
+
def test_install(self):
data = self.run_py(["-V:3.10"], env={"PYLAUNCHER_ALWAYS_INSTALL": "1"}, expect_returncode=111)
cmd = data["stdout"].strip()
@@ -513,3 +661,60 @@ def test_install(self):
self.assertIn("winget.exe", cmd)
# Both command lines include the store ID
self.assertIn("9PJPW5LDXLZ5", cmd)
+
+ def test_literal_shebang_absolute(self):
+ with self.script(f"#! C:/some_random_app -witharg") as script:
+ data = self.run_py([script])
+ self.assertEqual(
+ f"C:\\some_random_app -witharg {script}",
+ data["stdout"].strip(),
+ )
+
+ def test_literal_shebang_relative(self):
+ with self.script(f"#! ..\\some_random_app -witharg") as script:
+ data = self.run_py([script])
+ self.assertEqual(
+ f"{script.parent.parent}\\some_random_app -witharg {script}",
+ data["stdout"].strip(),
+ )
+
+ def test_literal_shebang_quoted(self):
+ with self.script(f'#! "some random app" -witharg') as script:
+ data = self.run_py([script])
+ self.assertEqual(
+ f'"{script.parent}\\some random app" -witharg {script}',
+ data["stdout"].strip(),
+ )
+
+ with self.script(f'#! some" random "app -witharg') as script:
+ data = self.run_py([script])
+ self.assertEqual(
+ f'"{script.parent}\\some random app" -witharg {script}',
+ data["stdout"].strip(),
+ )
+
+ def test_literal_shebang_quoted_escape(self):
+ with self.script(f'#! some\\" random "app -witharg') as script:
+ data = self.run_py([script])
+ self.assertEqual(
+ f'"{script.parent}\\some\\ random app" -witharg {script}',
+ data["stdout"].strip(),
+ )
+
+ def test_literal_shebang_command(self):
+ with self.py_ini(TEST_PY_COMMANDS):
+ with self.script('#! test-command arg1') as script:
+ data = self.run_py([script])
+ self.assertEqual(
+ f"TEST_EXE.exe arg1 {script}",
+ data["stdout"].strip(),
+ )
+
+ def test_literal_shebang_invalid_template(self):
+ with self.script('#! /usr/bin/not-python arg1') as script:
+ data = self.run_py([script])
+ expect = script.parent / "/usr/bin/not-python"
+ self.assertEqual(
+ f"{expect} arg1 {script}",
+ data["stdout"].strip(),
+ )
diff --git a/Lib/test/test_linecache.py b/Lib/test/test_linecache.py
index c6e2dadbb25e1f..72dd40136cfdb2 100644
--- a/Lib/test/test_linecache.py
+++ b/Lib/test/test_linecache.py
@@ -73,12 +73,10 @@ class GetLineTestsBadData(TempFile):
# file_byte_string = b'Bad data goes here'
def test_getline(self):
- self.assertRaises((SyntaxError, UnicodeDecodeError),
- linecache.getline, self.file_name, 1)
+ self.assertEqual(linecache.getline(self.file_name, 1), '')
def test_getlines(self):
- self.assertRaises((SyntaxError, UnicodeDecodeError),
- linecache.getlines, self.file_name)
+ self.assertEqual(linecache.getlines(self.file_name), [])
class EmptyFile(GetLineTestsGoodData, unittest.TestCase):
@@ -92,9 +90,11 @@ class SingleEmptyLine(GetLineTestsGoodData, unittest.TestCase):
class GoodUnicode(GetLineTestsGoodData, unittest.TestCase):
file_list = ['á\n', 'b\n', 'abcdef\n', 'ááááá\n']
+class BadUnicode_NoDeclaration(GetLineTestsBadData, unittest.TestCase):
+ file_byte_string = b'\n\x80abc'
-class BadUnicode(GetLineTestsBadData, unittest.TestCase):
- file_byte_string = b'\x80abc'
+class BadUnicode_WithDeclaration(GetLineTestsBadData, unittest.TestCase):
+ file_byte_string = b'# coding=utf-8\n\x80abc'
class LineCacheTests(unittest.TestCase):
diff --git a/Lib/test/test_list.py b/Lib/test/test_list.py
index d3da05ba84ac0f..9aa6dd1095668b 100644
--- a/Lib/test/test_list.py
+++ b/Lib/test/test_list.py
@@ -96,6 +96,19 @@ def imul(a, b): a *= b
self.assertRaises((MemoryError, OverflowError), mul, lst, n)
self.assertRaises((MemoryError, OverflowError), imul, lst, n)
+ def test_list_resize_overflow(self):
+ # gh-97616: test new_allocated * sizeof(PyObject*) overflow
+ # check in list_resize()
+ lst = [0] * 65
+ del lst[1:]
+ self.assertEqual(len(lst), 1)
+
+ size = ((2 ** (tuple.__itemsize__ * 8) - 1) // 2)
+ with self.assertRaises((MemoryError, OverflowError)):
+ lst * size
+ with self.assertRaises((MemoryError, OverflowError)):
+ lst *= size
+
def test_repr_large(self):
# Check the repr of large list objects
def check(n):
diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py
index 5cb6edc52d777c..bc8a7a35fbf2dc 100644
--- a/Lib/test/test_locale.py
+++ b/Lib/test/test_locale.py
@@ -1,5 +1,5 @@
from decimal import Decimal
-from test.support import verbose, is_android, is_emscripten
+from test.support import verbose, is_android, is_emscripten, is_wasi
from test.support.warnings_helper import check_warnings
import unittest
import locale
@@ -373,13 +373,19 @@ def setUp(self):
@unittest.skipIf(sys.platform.startswith('aix'),
'bpo-29972: broken test on AIX')
- @unittest.skipIf(is_emscripten, "musl libc issue on Emscripten, bpo-46390")
+ @unittest.skipIf(
+ is_emscripten or is_wasi,
+ "musl libc issue on Emscripten/WASI, bpo-46390"
+ )
def test_strcoll_with_diacritic(self):
self.assertLess(locale.strcoll('à', 'b'), 0)
@unittest.skipIf(sys.platform.startswith('aix'),
'bpo-29972: broken test on AIX')
- @unittest.skipIf(is_emscripten, "musl libc issue on Emscripten, bpo-46390")
+ @unittest.skipIf(
+ is_emscripten or is_wasi,
+ "musl libc issue on Emscripten/WASI, bpo-46390"
+ )
def test_strxfrm_with_diacritic(self):
self.assertLess(locale.strxfrm('à'), locale.strxfrm('b'))
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 5d4ddedd059fcc..76bd8724e29b41 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -1,4 +1,4 @@
-# Copyright 2001-2021 by Vinay Sajip. All Rights Reserved.
+# Copyright 2001-2022 by Vinay Sajip. All Rights Reserved.
#
# Permission to use, copy, modify, and distribute this software and its
# documentation for any purpose and without fee is hereby granted,
@@ -16,7 +16,7 @@
"""Test harness for the logging module. Run all tests.
-Copyright (C) 2001-2021 Vinay Sajip. All Rights Reserved.
+Copyright (C) 2001-2022 Vinay Sajip. All Rights Reserved.
"""
import logging
@@ -1645,6 +1645,42 @@ def test_config_set_handler_names(self):
self.apply_config(test_config)
self.assertEqual(logging.getLogger().handlers[0].name, 'hand1')
+ def test_exception_if_confg_file_is_invalid(self):
+ test_config = """
+ [loggers]
+ keys=root
+
+ [handlers]
+ keys=hand1
+
+ [formatters]
+ keys=form1
+
+ [logger_root]
+ handlers=hand1
+
+ [handler_hand1]
+ class=StreamHandler
+ formatter=form1
+
+ [formatter_form1]
+ format=%(levelname)s ++ %(message)s
+
+ prince
+ """
+
+ file = io.StringIO(textwrap.dedent(test_config))
+ self.assertRaises(RuntimeError, logging.config.fileConfig, file)
+
+ def test_exception_if_confg_file_is_empty(self):
+ fd, fn = tempfile.mkstemp(prefix='test_empty_', suffix='.ini')
+ os.close(fd)
+ self.assertRaises(RuntimeError, logging.config.fileConfig, fn)
+ os.remove(fn)
+
+ def test_exception_if_config_file_does_not_exist(self):
+ self.assertRaises(FileNotFoundError, logging.config.fileConfig, 'filenotfound')
+
def test_defaults_do_no_interpolation(self):
"""bpo-33802 defaults should not get interpolated"""
ini = textwrap.dedent("""
@@ -1919,7 +1955,7 @@ def setUp(self):
self.sl_hdlr = hcls((server.server_address[0], server.port))
else:
self.sl_hdlr = hcls(server.server_address)
- self.log_output = ''
+ self.log_output = b''
self.root_logger.removeHandler(self.root_logger.handlers[0])
self.root_logger.addHandler(self.sl_hdlr)
self.handled = threading.Event()
@@ -3504,6 +3540,35 @@ class NotAFilter: pass
{"version": 1, "root": {"level": "DEBUG", "filters": [filter_]}}
)
+ def test_90195(self):
+ # See gh-90195
+ config = {
+ 'version': 1,
+ 'disable_existing_loggers': False,
+ 'handlers': {
+ 'console': {
+ 'level': 'DEBUG',
+ 'class': 'logging.StreamHandler',
+ },
+ },
+ 'loggers': {
+ 'a': {
+ 'level': 'DEBUG',
+ 'handlers': ['console']
+ }
+ }
+ }
+ logger = logging.getLogger('a')
+ self.assertFalse(logger.disabled)
+ self.apply_config(config)
+ self.assertFalse(logger.disabled)
+ # Should disable all loggers ...
+ self.apply_config({'version': 1})
+ self.assertTrue(logger.disabled)
+ del config['disable_existing_loggers']
+ self.apply_config(config)
+ # Logger should be enabled, since explicitly mentioned
+ self.assertFalse(logger.disabled)
class ManagerTest(BaseTest):
def test_manager_loggerclass(self):
@@ -3665,7 +3730,7 @@ def test_queue_listener(self):
@unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'),
'logging.handlers.QueueListener required for this test')
def test_queue_listener_with_StreamHandler(self):
- # Test that traceback only appends once (bpo-34334).
+ # Test that traceback and stack-info only appends once (bpo-34334, bpo-46755).
listener = logging.handlers.QueueListener(self.queue, self.root_hdlr)
listener.start()
try:
@@ -3673,8 +3738,10 @@ def test_queue_listener_with_StreamHandler(self):
except ZeroDivisionError as e:
exc = e
self.que_logger.exception(self.next_message(), exc_info=exc)
+ self.que_logger.error(self.next_message(), stack_info=True)
listener.stop()
self.assertEqual(self.stream.getvalue().strip().count('Traceback'), 1)
+ self.assertEqual(self.stream.getvalue().strip().count('Stack'), 1)
@unittest.skipUnless(hasattr(logging.handlers, 'QueueListener'),
'logging.handlers.QueueListener required for this test')
@@ -4086,6 +4153,14 @@ class NoMsecFormatter(logging.Formatter):
f.converter = time.gmtime
self.assertEqual(f.formatTime(r), '21/04/1993 08:03:00')
+ def test_issue_89047(self):
+ f = logging.Formatter(fmt='{asctime}.{msecs:03.0f} {message}', style='{', datefmt="%Y-%m-%d %H:%M:%S")
+ for i in range(2500):
+ time.sleep(0.0004)
+ r = logging.makeLogRecord({'msg': 'Message %d' % (i + 1)})
+ s = f.format(r)
+ self.assertNotIn('.1000', s)
+
class TestBufferingFormatter(logging.BufferingFormatter):
def formatHeader(self, records):
@@ -5280,6 +5355,7 @@ def test_emit_after_closing_in_write_mode(self):
self.assertEqual(fp.read().strip(), '1')
class RotatingFileHandlerTest(BaseFileTest):
+ @unittest.skipIf(support.is_wasi, "WASI does not have /dev/null.")
def test_should_not_rollover(self):
# If maxbytes is zero rollover never occurs
rh = logging.handlers.RotatingFileHandler(
@@ -5387,6 +5463,7 @@ def rotator(source, dest):
rh.close()
class TimedRotatingFileHandlerTest(BaseFileTest):
+ @unittest.skipIf(support.is_wasi, "WASI does not have /dev/null.")
def test_should_not_rollover(self):
# See bpo-45401. Should only ever rollover regular files
fh = logging.handlers.TimedRotatingFileHandler(
@@ -5650,9 +5727,7 @@ def test__all__(self):
# why the test does this, but in any case we save the current locale
# first and restore it at the end.
def setUpModule():
- cm = support.run_with_locale('LC_ALL', '')
- cm.__enter__()
- unittest.addModuleCleanup(cm.__exit__, None, None, None)
+ unittest.enterModuleContext(support.run_with_locale('LC_ALL', ''))
if __name__ == "__main__":
diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py
index d092e0176c2616..77b37ca1fa4afe 100644
--- a/Lib/test/test_long.py
+++ b/Lib/test/test_long.py
@@ -1334,6 +1334,12 @@ def equivalent_python(n, length, byteorder, signed=False):
b'\xff\xff\xff\xff\xff')
self.assertRaises(OverflowError, (1).to_bytes, 0, 'big')
+ # gh-98783
+ class SubStr(str):
+ pass
+ self.assertEqual((0).to_bytes(1, SubStr('big')), b'\x00')
+ self.assertEqual((0).to_bytes(0, SubStr('little')), b'')
+
def test_from_bytes(self):
def check(tests, byteorder, signed=False):
def equivalent_python(byte_array, byteorder, signed=False):
@@ -1518,6 +1524,28 @@ def __init__(self, value):
self.assertEqual(i, 1)
self.assertEqual(getattr(i, 'foo', 'none'), 'bar')
+ class ValidBytes:
+ def __bytes__(self):
+ return b'\x01'
+ class InvalidBytes:
+ def __bytes__(self):
+ return 'abc'
+ class MissingBytes: ...
+ class RaisingBytes:
+ def __bytes__(self):
+ 1 / 0
+
+ self.assertEqual(int.from_bytes(ValidBytes()), 1)
+ self.assertRaises(TypeError, int.from_bytes, InvalidBytes())
+ self.assertRaises(TypeError, int.from_bytes, MissingBytes())
+ self.assertRaises(ZeroDivisionError, int.from_bytes, RaisingBytes())
+
+ # gh-98783
+ class SubStr(str):
+ pass
+ self.assertEqual(int.from_bytes(b'', SubStr('big')), 0)
+ self.assertEqual(int.from_bytes(b'\x00', SubStr('little')), 0)
+
@support.cpython_only
def test_from_bytes_small(self):
# bpo-46361
diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py
index 20c460e300cc9d..07c2764dfd1b2f 100644
--- a/Lib/test/test_mailbox.py
+++ b/Lib/test/test_mailbox.py
@@ -10,12 +10,17 @@
import tempfile
from test import support
from test.support import os_helper
+from test.support import socket_helper
import unittest
import textwrap
import mailbox
import glob
+if not socket_helper.has_gethostname:
+ raise unittest.SkipTest("test requires gethostname()")
+
+
class TestBase:
all_mailbox_types = (mailbox.Message, mailbox.MaildirMessage,
diff --git a/Lib/test/test_mailcap.py b/Lib/test/test_mailcap.py
index 97a8fac6e074ad..8185f4a7806615 100644
--- a/Lib/test/test_mailcap.py
+++ b/Lib/test/test_mailcap.py
@@ -128,7 +128,8 @@ def test_subst(self):
(["", "audio/*", "foo.txt"], ""),
(["echo foo", "audio/*", "foo.txt"], "echo foo"),
(["echo %s", "audio/*", "foo.txt"], "echo foo.txt"),
- (["echo %t", "audio/*", "foo.txt"], "echo audio/*"),
+ (["echo %t", "audio/*", "foo.txt"], None),
+ (["echo %t", "audio/wav", "foo.txt"], "echo audio/wav"),
(["echo \\%t", "audio/*", "foo.txt"], "echo %t"),
(["echo foo", "audio/*", "foo.txt", plist], "echo foo"),
(["echo %{total}", "audio/*", "foo.txt", plist], "echo 3")
@@ -212,7 +213,10 @@ def test_findmatch(self):
('"An audio fragment"', audio_basic_entry)),
([c, "audio/*"],
{"filename": fname},
- ("/usr/local/bin/showaudio audio/*", audio_entry)),
+ (None, None)),
+ ([c, "audio/wav"],
+ {"filename": fname},
+ ("/usr/local/bin/showaudio audio/wav", audio_entry)),
([c, "message/external-body"],
{"plist": plist},
("showexternal /dev/null default john python.org /tmp foo bar", message_entry))
@@ -221,6 +225,10 @@ def test_findmatch(self):
@unittest.skipUnless(os.name == "posix", "Requires 'test' command on system")
@unittest.skipIf(sys.platform == "vxworks", "'test' command is not supported on VxWorks")
+ @unittest.skipUnless(
+ test.support.has_subprocess_support,
+ "'test' command needs process support."
+ )
def test_test(self):
# findmatch() will automatically check any "test" conditions and skip
# the entry if the check fails.
diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py
index aae86cc257d7e1..a1a91f661ba253 100644
--- a/Lib/test/test_marshal.py
+++ b/Lib/test/test_marshal.py
@@ -259,6 +259,8 @@ def test_recursion_limit(self):
#if os.name == 'nt' and hasattr(sys, 'gettotalrefcount'):
if os.name == 'nt':
MAX_MARSHAL_STACK_DEPTH = 1000
+ elif sys.platform == 'wasi':
+ MAX_MARSHAL_STACK_DEPTH = 1500
else:
MAX_MARSHAL_STACK_DEPTH = 2000
for i in range(MAX_MARSHAL_STACK_DEPTH - 2):
@@ -352,7 +354,7 @@ def test_deterministic_sets(self):
for elements in (
"float('nan'), b'a', b'b', b'c', 'x', 'y', 'z'",
# Also test for bad interactions with backreferencing:
- "('Spam', 0), ('Spam', 1), ('Spam', 2)",
+ "('Spam', 0), ('Spam', 1), ('Spam', 2), ('Spam', 3), ('Spam', 4), ('Spam', 5)",
):
s = f"{kind}([{elements}])"
with self.subTest(s):
diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py
index cfaf3b3ea26a7e..bf0d0a56e6ac8b 100644
--- a/Lib/test/test_math.py
+++ b/Lib/test/test_math.py
@@ -1006,6 +1006,11 @@ class T(tuple):
self.assertEqual(math.dist(p, q), 5*scale)
self.assertEqual(math.dist(q, p), 5*scale)
+ def test_math_dist_leak(self):
+ # gh-98897: Check for error handling does not leak memory
+ with self.assertRaises(ValueError):
+ math.dist([1, 2], [3, 4, 5])
+
def testIsqrt(self):
# Test a variety of inputs, large and small.
test_values = (
diff --git a/Lib/test/test_memoryview.py b/Lib/test/test_memoryview.py
index d7e3f0c0effa69..9d1e1f3063ca55 100644
--- a/Lib/test/test_memoryview.py
+++ b/Lib/test/test_memoryview.py
@@ -545,6 +545,107 @@ def test_pickle(self):
with self.assertRaises(TypeError):
pickle.dumps(m, proto)
+ def test_use_released_memory(self):
+ # gh-92888: Previously it was possible to use a memoryview even after
+ # backing buffer is freed in certain cases. This tests that those
+ # cases raise an exception.
+ size = 128
+ def release():
+ m.release()
+ nonlocal ba
+ ba = bytearray(size)
+ class MyIndex:
+ def __index__(self):
+ release()
+ return 4
+ class MyFloat:
+ def __float__(self):
+ release()
+ return 4.25
+ class MyBool:
+ def __bool__(self):
+ release()
+ return True
+
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size))
+ with self.assertRaises(ValueError):
+ m[MyIndex()]
+
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size))
+ self.assertEqual(list(m[:MyIndex()]), [255] * 4)
+
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size))
+ self.assertEqual(list(m[MyIndex():8]), [255] * 4)
+
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size)).cast('B', (64, 2))
+ with self.assertRaisesRegex(ValueError, "operation forbidden"):
+ m[MyIndex(), 0]
+
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size)).cast('B', (2, 64))
+ with self.assertRaisesRegex(ValueError, "operation forbidden"):
+ m[0, MyIndex()]
+
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size))
+ with self.assertRaisesRegex(ValueError, "operation forbidden"):
+ m[MyIndex()] = 42
+ self.assertEqual(ba[:8], b'\0'*8)
+
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size))
+ with self.assertRaisesRegex(ValueError, "operation forbidden"):
+ m[:MyIndex()] = b'spam'
+ self.assertEqual(ba[:8], b'\0'*8)
+
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size))
+ with self.assertRaisesRegex(ValueError, "operation forbidden"):
+ m[MyIndex():8] = b'spam'
+ self.assertEqual(ba[:8], b'\0'*8)
+
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size)).cast('B', (64, 2))
+ with self.assertRaisesRegex(ValueError, "operation forbidden"):
+ m[MyIndex(), 0] = 42
+ self.assertEqual(ba[8:16], b'\0'*8)
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size)).cast('B', (2, 64))
+ with self.assertRaisesRegex(ValueError, "operation forbidden"):
+ m[0, MyIndex()] = 42
+ self.assertEqual(ba[:8], b'\0'*8)
+
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size))
+ with self.assertRaisesRegex(ValueError, "operation forbidden"):
+ m[0] = MyIndex()
+ self.assertEqual(ba[:8], b'\0'*8)
+
+ for fmt in 'bhilqnBHILQN':
+ with self.subTest(fmt=fmt):
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size)).cast(fmt)
+ with self.assertRaisesRegex(ValueError, "operation forbidden"):
+ m[0] = MyIndex()
+ self.assertEqual(ba[:8], b'\0'*8)
+
+ for fmt in 'fd':
+ with self.subTest(fmt=fmt):
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size)).cast(fmt)
+ with self.assertRaisesRegex(ValueError, "operation forbidden"):
+ m[0] = MyFloat()
+ self.assertEqual(ba[:8], b'\0'*8)
+
+ ba = None
+ m = memoryview(bytearray(b'\xff'*size)).cast('?')
+ with self.assertRaisesRegex(ValueError, "operation forbidden"):
+ m[0] = MyBool()
+ self.assertEqual(ba[:8], b'\0'*8)
if __name__ == "__main__":
unittest.main()
diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
index 97620258d82f6b..ef38c362103fc6 100644
--- a/Lib/test/test_minidom.py
+++ b/Lib/test/test_minidom.py
@@ -9,7 +9,7 @@
import pyexpat
import xml.dom.minidom
-from xml.dom.minidom import parse, Node, Document, parseString
+from xml.dom.minidom import parse, Attr, Node, Document, parseString
from xml.dom.minidom import getDOMImplementation
from xml.parsers.expat import ExpatError
@@ -77,6 +77,20 @@ def testParseFromTextFile(self):
dom.unlink()
self.confirm(isinstance(dom, Document))
+ def testAttrModeSetsParamsAsAttrs(self):
+ attr = Attr("qName", "namespaceURI", "localName", "prefix")
+ self.assertEqual(attr.name, "qName")
+ self.assertEqual(attr.namespaceURI, "namespaceURI")
+ self.assertEqual(attr.prefix, "prefix")
+ self.assertEqual(attr.localName, "localName")
+
+ def testAttrModeSetsNonOptionalAttrs(self):
+ attr = Attr("qName", "namespaceURI", None, "prefix")
+ self.assertEqual(attr.name, "qName")
+ self.assertEqual(attr.namespaceURI, "namespaceURI")
+ self.assertEqual(attr.prefix, "prefix")
+ self.assertEqual(attr.localName, attr.name)
+
def testGetElementsByTagName(self):
dom = parse(tstfile)
self.confirm(dom.getElementsByTagName("LI") == \
diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py
index 213a44d56f37b3..517cbe0cb115ab 100644
--- a/Lib/test/test_mmap.py
+++ b/Lib/test/test_mmap.py
@@ -407,7 +407,6 @@ def test_move(self):
m.move(0, 0, 1)
m.move(0, 0, 0)
-
def test_anonymous(self):
# anonymous mmap.mmap(-1, PAGE)
m = mmap.mmap(-1, PAGESIZE)
@@ -887,6 +886,92 @@ def test_resize_succeeds_with_error_for_second_named_mapping(self):
self.assertEqual(m1[:data_length], data)
self.assertEqual(m2[:data_length], data)
+ def test_mmap_closed_by_int_scenarios(self):
+ """
+ gh-103987: Test that mmap objects raise ValueError
+ for closed mmap files
+ """
+
+ class MmapClosedByIntContext:
+ def __init__(self, access) -> None:
+ self.access = access
+
+ def __enter__(self):
+ self.f = open(TESTFN, "w+b")
+ self.f.write(random.randbytes(100))
+ self.f.flush()
+
+ m = mmap.mmap(self.f.fileno(), 100, access=self.access)
+
+ class X:
+ def __index__(self):
+ m.close()
+ return 10
+
+ return (m, X)
+
+ def __exit__(self, exc_type, exc_value, traceback):
+ self.f.close()
+
+ read_access_modes = [
+ mmap.ACCESS_READ,
+ mmap.ACCESS_WRITE,
+ mmap.ACCESS_COPY,
+ mmap.ACCESS_DEFAULT,
+ ]
+
+ write_access_modes = [
+ mmap.ACCESS_WRITE,
+ mmap.ACCESS_COPY,
+ mmap.ACCESS_DEFAULT,
+ ]
+
+ for access in read_access_modes:
+ with MmapClosedByIntContext(access) as (m, X):
+ with self.assertRaisesRegex(ValueError, "mmap closed or invalid"):
+ m[X()]
+
+ with MmapClosedByIntContext(access) as (m, X):
+ with self.assertRaisesRegex(ValueError, "mmap closed or invalid"):
+ m[X() : 20]
+
+ with MmapClosedByIntContext(access) as (m, X):
+ with self.assertRaisesRegex(ValueError, "mmap closed or invalid"):
+ m[X() : 20 : 2]
+
+ with MmapClosedByIntContext(access) as (m, X):
+ with self.assertRaisesRegex(ValueError, "mmap closed or invalid"):
+ m[20 : X() : -2]
+
+ with MmapClosedByIntContext(access) as (m, X):
+ with self.assertRaisesRegex(ValueError, "mmap closed or invalid"):
+ m.read(X())
+
+ with MmapClosedByIntContext(access) as (m, X):
+ with self.assertRaisesRegex(ValueError, "mmap closed or invalid"):
+ m.find(b"1", 1, X())
+
+ for access in write_access_modes:
+ with MmapClosedByIntContext(access) as (m, X):
+ with self.assertRaisesRegex(ValueError, "mmap closed or invalid"):
+ m[X() : 20] = b"1" * 10
+
+ with MmapClosedByIntContext(access) as (m, X):
+ with self.assertRaisesRegex(ValueError, "mmap closed or invalid"):
+ m[X() : 20 : 2] = b"1" * 5
+
+ with MmapClosedByIntContext(access) as (m, X):
+ with self.assertRaisesRegex(ValueError, "mmap closed or invalid"):
+ m[20 : X() : -2] = b"1" * 5
+
+ with MmapClosedByIntContext(access) as (m, X):
+ with self.assertRaisesRegex(ValueError, "mmap closed or invalid"):
+ m.move(1, 2, X())
+
+ with MmapClosedByIntContext(access) as (m, X):
+ with self.assertRaisesRegex(ValueError, "mmap closed or invalid"):
+ m.write_byte(X())
+
class LargeMmapTests(unittest.TestCase):
def setUp(self):
diff --git a/Lib/test/test_modulefinder.py b/Lib/test/test_modulefinder.py
index ca1058b8d4087c..b64e684f80599f 100644
--- a/Lib/test/test_modulefinder.py
+++ b/Lib/test/test_modulefinder.py
@@ -10,9 +10,6 @@
import modulefinder
-TEST_DIR = tempfile.mkdtemp()
-TEST_PATH = [TEST_DIR, os.path.dirname(tempfile.__file__)]
-
# Each test description is a list of 5 items:
#
# 1. a module name that will be imported by modulefinder
@@ -23,9 +20,9 @@
# about because they MAY be not found
# 5. a string specifying packages to create; the format is obvious imo.
#
-# Each package will be created in TEST_DIR, and TEST_DIR will be
+# Each package will be created in test_dir, and test_dir will be
# removed after the tests again.
-# Modulefinder searches in a path that contains TEST_DIR, plus
+# Modulefinder searches in a path that contains test_dir, plus
# the standard Lib directory.
maybe_test = [
@@ -300,7 +297,7 @@ def open_file(path):
return open(path, 'wb')
-def create_package(source):
+def create_package(test_dir, source):
ofi = None
try:
for line in source.splitlines():
@@ -313,41 +310,45 @@ def create_package(source):
ofi.close()
if type(line) == bytes:
line = line.decode('utf-8')
- ofi = open_file(os.path.join(TEST_DIR, line.strip()))
+ ofi = open_file(os.path.join(test_dir, line.strip()))
finally:
if ofi:
ofi.close()
class ModuleFinderTest(unittest.TestCase):
+ def setUp(self):
+ self.test_dir = tempfile.mkdtemp()
+ self.test_path = [self.test_dir, os.path.dirname(tempfile.__file__)]
+
+ def tearDown(self):
+ shutil.rmtree(self.test_dir)
+
def _do_test(self, info, report=False, debug=0, replace_paths=[], modulefinder_class=modulefinder.ModuleFinder):
import_this, modules, missing, maybe_missing, source = info
- create_package(source)
- try:
- mf = modulefinder_class(path=TEST_PATH, debug=debug,
- replace_paths=replace_paths)
- mf.import_hook(import_this)
- if report:
- mf.report()
-## # This wouldn't work in general when executed several times:
-## opath = sys.path[:]
-## sys.path = TEST_PATH
-## try:
-## __import__(import_this)
-## except:
-## import traceback; traceback.print_exc()
-## sys.path = opath
-## return
- modules = sorted(set(modules))
- found = sorted(mf.modules)
- # check if we found what we expected, not more, not less
- self.assertEqual(found, modules)
-
- # check for missing and maybe missing modules
- bad, maybe = mf.any_missing_maybe()
- self.assertEqual(bad, missing)
- self.assertEqual(maybe, maybe_missing)
- finally:
- shutil.rmtree(TEST_DIR)
+ create_package(self.test_dir, source)
+ mf = modulefinder_class(path=self.test_path, debug=debug,
+ replace_paths=replace_paths)
+ mf.import_hook(import_this)
+ if report:
+ mf.report()
+## # This wouldn't work in general when executed several times:
+## opath = sys.path[:]
+## sys.path = self.test_path
+## try:
+## __import__(import_this)
+## except:
+## import traceback; traceback.print_exc()
+## sys.path = opath
+## return
+ modules = sorted(set(modules))
+ found = sorted(mf.modules)
+ # check if we found what we expected, not more, not less
+ self.assertEqual(found, modules)
+
+ # check for missing and maybe missing modules
+ bad, maybe = mf.any_missing_maybe()
+ self.assertEqual(bad, missing)
+ self.assertEqual(maybe, maybe_missing)
def test_package(self):
self._do_test(package_test)
@@ -380,7 +381,7 @@ def test_same_name_as_bad(self):
self._do_test(same_name_as_bad_test)
def test_bytecode(self):
- base_path = os.path.join(TEST_DIR, 'a')
+ base_path = os.path.join(self.test_dir, 'a')
source_path = base_path + importlib.machinery.SOURCE_SUFFIXES[0]
bytecode_path = base_path + importlib.machinery.BYTECODE_SUFFIXES[0]
with open_file(source_path) as file:
@@ -390,8 +391,8 @@ def test_bytecode(self):
self._do_test(bytecode_test)
def test_replace_paths(self):
- old_path = os.path.join(TEST_DIR, 'a', 'module.py')
- new_path = os.path.join(TEST_DIR, 'a', 'spam.py')
+ old_path = os.path.join(self.test_dir, 'a', 'module.py')
+ new_path = os.path.join(self.test_dir, 'a', 'spam.py')
with support.captured_stdout() as output:
self._do_test(maybe_test, debug=2,
replace_paths=[(old_path, new_path)])
diff --git a/Lib/test/test_netrc.py b/Lib/test/test_netrc.py
index 3cca1e8ff1ac1a..573d636de956d1 100644
--- a/Lib/test/test_netrc.py
+++ b/Lib/test/test_netrc.py
@@ -1,6 +1,11 @@
import netrc, os, unittest, sys, textwrap
from test.support import os_helper, run_unittest
+try:
+ import pwd
+except ImportError:
+ pwd = None
+
temp_filename = os_helper.TESTFN
class NetrcTestCase(unittest.TestCase):
@@ -266,6 +271,8 @@ def test_comment_at_end_of_machine_line_pass_has_hash(self):
@unittest.skipUnless(os.name == 'posix', 'POSIX only test')
+ @unittest.skipIf(pwd is None, 'security check requires pwd module')
+ @os_helper.skip_unless_working_chmod
def test_security(self):
# This test is incomplete since we are normally not run as root and
# therefore can't test the file ownership being wrong.
diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py
index 9812c055193517..31a02f86abb003 100644
--- a/Lib/test/test_nntplib.py
+++ b/Lib/test/test_nntplib.py
@@ -1593,8 +1593,7 @@ def setUp(self):
self.background.start()
self.addCleanup(self.background.join)
- self.nntp = NNTP(socket_helper.HOST, port, usenetrc=False).__enter__()
- self.addCleanup(self.nntp.__exit__, None, None, None)
+ self.nntp = self.enterContext(NNTP(socket_helper.HOST, port, usenetrc=False))
def run_server(self, sock):
# Could be generalized to handle more commands in separate methods
diff --git a/Lib/test/test_ntpath.py b/Lib/test/test_ntpath.py
index 7211ed861762b4..646e81d1e2fa9b 100644
--- a/Lib/test/test_ntpath.py
+++ b/Lib/test/test_ntpath.py
@@ -1,5 +1,6 @@
import ntpath
import os
+import string
import sys
import unittest
import warnings
@@ -107,17 +108,50 @@ def test_splitdrive(self):
tester('ntpath.splitdrive("//conky/mountpoint/foo/bar")',
('//conky/mountpoint', '/foo/bar'))
tester('ntpath.splitdrive("\\\\\\conky\\mountpoint\\foo\\bar")',
- ('', '\\\\\\conky\\mountpoint\\foo\\bar'))
+ ('\\\\\\conky', '\\mountpoint\\foo\\bar'))
tester('ntpath.splitdrive("///conky/mountpoint/foo/bar")',
- ('', '///conky/mountpoint/foo/bar'))
+ ('///conky', '/mountpoint/foo/bar'))
tester('ntpath.splitdrive("\\\\conky\\\\mountpoint\\foo\\bar")',
- ('', '\\\\conky\\\\mountpoint\\foo\\bar'))
+ ('\\\\conky\\', '\\mountpoint\\foo\\bar'))
tester('ntpath.splitdrive("//conky//mountpoint/foo/bar")',
- ('', '//conky//mountpoint/foo/bar'))
+ ('//conky/', '/mountpoint/foo/bar'))
# Issue #19911: UNC part containing U+0130
self.assertEqual(ntpath.splitdrive('//conky/MOUNTPOİNT/foo/bar'),
('//conky/MOUNTPOİNT', '/foo/bar'))
+ # gh-81790: support device namespace, including UNC drives.
+ tester('ntpath.splitdrive("//?/c:")', ("//?/c:", ""))
+ tester('ntpath.splitdrive("//?/c:/")', ("//?/c:", "/"))
+ tester('ntpath.splitdrive("//?/c:/dir")', ("//?/c:", "/dir"))
+ tester('ntpath.splitdrive("//?/UNC")', ("//?/UNC", ""))
+ tester('ntpath.splitdrive("//?/UNC/")', ("//?/UNC/", ""))
+ tester('ntpath.splitdrive("//?/UNC/server/")', ("//?/UNC/server/", ""))
+ tester('ntpath.splitdrive("//?/UNC/server/share")', ("//?/UNC/server/share", ""))
+ tester('ntpath.splitdrive("//?/UNC/server/share/dir")', ("//?/UNC/server/share", "/dir"))
+ tester('ntpath.splitdrive("//?/VOLUME{00000000-0000-0000-0000-000000000000}/spam")',
+ ('//?/VOLUME{00000000-0000-0000-0000-000000000000}', '/spam'))
+ tester('ntpath.splitdrive("//?/BootPartition/")', ("//?/BootPartition", "/"))
+
+ tester('ntpath.splitdrive("\\\\?\\c:")', ("\\\\?\\c:", ""))
+ tester('ntpath.splitdrive("\\\\?\\c:\\")', ("\\\\?\\c:", "\\"))
+ tester('ntpath.splitdrive("\\\\?\\c:\\dir")', ("\\\\?\\c:", "\\dir"))
+ tester('ntpath.splitdrive("\\\\?\\UNC")', ("\\\\?\\UNC", ""))
+ tester('ntpath.splitdrive("\\\\?\\UNC\\")', ("\\\\?\\UNC\\", ""))
+ tester('ntpath.splitdrive("\\\\?\\UNC\\server\\")', ("\\\\?\\UNC\\server\\", ""))
+ tester('ntpath.splitdrive("\\\\?\\UNC\\server\\share")', ("\\\\?\\UNC\\server\\share", ""))
+ tester('ntpath.splitdrive("\\\\?\\UNC\\server\\share\\dir")',
+ ("\\\\?\\UNC\\server\\share", "\\dir"))
+ tester('ntpath.splitdrive("\\\\?\\VOLUME{00000000-0000-0000-0000-000000000000}\\spam")',
+ ('\\\\?\\VOLUME{00000000-0000-0000-0000-000000000000}', '\\spam'))
+ tester('ntpath.splitdrive("\\\\?\\BootPartition\\")', ("\\\\?\\BootPartition", "\\"))
+
+ # gh-96290: support partial/invalid UNC drives
+ tester('ntpath.splitdrive("//")', ("//", "")) # empty server & missing share
+ tester('ntpath.splitdrive("///")', ("///", "")) # empty server & empty share
+ tester('ntpath.splitdrive("///y")', ("///y", "")) # empty server & non-empty share
+ tester('ntpath.splitdrive("//x")', ("//x", "")) # non-empty server & missing share
+ tester('ntpath.splitdrive("//x/")', ("//x/", "")) # non-empty server & empty share
+
def test_split(self):
tester('ntpath.split("c:\\foo\\bar")', ('c:\\foo', 'bar'))
tester('ntpath.split("\\\\conky\\mountpoint\\foo\\bar")',
@@ -136,6 +170,10 @@ def test_isabs(self):
tester('ntpath.isabs("\\foo")', 1)
tester('ntpath.isabs("\\foo\\bar")', 1)
+ # gh-96290: normal UNC paths and device paths without trailing backslashes
+ tester('ntpath.isabs("\\\\conky\\mountpoint")', 1)
+ tester('ntpath.isabs("\\\\.\\C:")', 1)
+
def test_commonprefix(self):
tester('ntpath.commonprefix(["/home/swenson/spam", "/home/swen/spam"])',
"/home/swen")
@@ -245,6 +283,12 @@ def test_normpath(self):
tester("ntpath.normpath('//server/share/../..')", '\\\\server\\share\\')
tester("ntpath.normpath('//server/share/../../')", '\\\\server\\share\\')
+ # gh-96290: don't normalize partial/invalid UNC drives as rooted paths.
+ tester("ntpath.normpath('\\\\foo\\\\')", '\\\\foo\\\\')
+ tester("ntpath.normpath('\\\\foo\\')", '\\\\foo\\')
+ tester("ntpath.normpath('\\\\foo')", '\\\\foo')
+ tester("ntpath.normpath('\\\\')", '\\\\')
+
def test_realpath_curdir(self):
expected = ntpath.normpath(os.getcwd())
tester("ntpath.realpath('.')", expected)
@@ -278,6 +322,16 @@ def test_realpath_basic(self):
self.assertPathEqual(ntpath.realpath(os.fsencode(ABSTFN + "1")),
os.fsencode(ABSTFN))
+ # gh-88013: call ntpath.realpath with binary drive name may raise a
+ # TypeError. The drive should not exist to reproduce the bug.
+ for c in string.ascii_uppercase:
+ d = f"{c}:\\"
+ if not ntpath.exists(d):
+ break
+ else:
+ raise OSError("No free drive letters available")
+ self.assertEqual(ntpath.realpath(d), d)
+
@os_helper.skip_unless_symlink
@unittest.skipUnless(HAVE_GETFINALPATHNAME, 'need _getfinalpathname')
def test_realpath_strict(self):
@@ -852,6 +906,8 @@ def _check_function(self, func):
def test_path_normcase(self):
self._check_function(self.path.normcase)
+ if sys.platform == 'win32':
+ self.assertEqual(ntpath.normcase('\u03a9\u2126'), 'ωΩ')
def test_path_isabs(self):
self._check_function(self.path.isabs)
diff --git a/Lib/test/test_numeric_tower.py b/Lib/test/test_numeric_tower.py
index c54dedb8b793a0..9cd85e13634c2b 100644
--- a/Lib/test/test_numeric_tower.py
+++ b/Lib/test/test_numeric_tower.py
@@ -14,6 +14,27 @@
_PyHASH_MODULUS = sys.hash_info.modulus
_PyHASH_INF = sys.hash_info.inf
+
+class DummyIntegral(int):
+ """Dummy Integral class to test conversion of the Rational to float."""
+
+ def __mul__(self, other):
+ return DummyIntegral(super().__mul__(other))
+ __rmul__ = __mul__
+
+ def __truediv__(self, other):
+ return NotImplemented
+ __rtruediv__ = __truediv__
+
+ @property
+ def numerator(self):
+ return DummyIntegral(self)
+
+ @property
+ def denominator(self):
+ return DummyIntegral(1)
+
+
class HashTest(unittest.TestCase):
def check_equal_hash(self, x, y):
# check both that x and y are equal and that their hashes are equal
@@ -121,6 +142,13 @@ def test_fractions(self):
self.assertEqual(hash(F(7*_PyHASH_MODULUS, 1)), 0)
self.assertEqual(hash(F(-_PyHASH_MODULUS, 1)), 0)
+ # The numbers ABC doesn't enforce that the "true" division
+ # of integers produces a float. This tests that the
+ # Rational.__float__() method has required type conversions.
+ x = F(DummyIntegral(1), DummyIntegral(2), _normalize=False)
+ self.assertRaises(TypeError, lambda: x.numerator/x.denominator)
+ self.assertEqual(float(x), 0.5)
+
def test_hash_normalization(self):
# Test for a bug encountered while changing long_hash.
#
diff --git a/Lib/test/test_opcache.py b/Lib/test/test_opcache.py
index 61f337d70ea787..e39b7260624899 100644
--- a/Lib/test/test_opcache.py
+++ b/Lib/test/test_opcache.py
@@ -1,5 +1,6 @@
import unittest
+
class TestLoadAttrCache(unittest.TestCase):
def test_descriptor_added_after_optimization(self):
class Descriptor:
@@ -21,3 +22,413 @@ def f(o):
Descriptor.__set__ = lambda *args: None
self.assertEqual(f(o), 2)
+
+ def test_metaclass_descriptor_added_after_optimization(self):
+ class Descriptor:
+ pass
+
+ class Metaclass(type):
+ attribute = Descriptor()
+
+ class Class(metaclass=Metaclass):
+ attribute = True
+
+ def __get__(self, instance, owner):
+ return False
+
+ def __set__(self, instance, value):
+ return None
+
+ def f():
+ return Class.attribute
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ Descriptor.__get__ = __get__
+ Descriptor.__set__ = __set__
+
+ for _ in range(1025):
+ self.assertFalse(f())
+
+ def test_metaclass_descriptor_shadows_class_attribute(self):
+ class Metaclass(type):
+ @property
+ def attribute(self):
+ return True
+
+ class Class(metaclass=Metaclass):
+ attribute = False
+
+ def f():
+ return Class.attribute
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ def test_metaclass_set_descriptor_after_optimization(self):
+ class Metaclass(type):
+ pass
+
+ class Class(metaclass=Metaclass):
+ attribute = True
+
+ @property
+ def attribute(self):
+ return False
+
+ def f():
+ return Class.attribute
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ Metaclass.attribute = attribute
+
+ for _ in range(1025):
+ self.assertFalse(f())
+
+ def test_metaclass_del_descriptor_after_optimization(self):
+ class Metaclass(type):
+ @property
+ def attribute(self):
+ return True
+
+ class Class(metaclass=Metaclass):
+ attribute = False
+
+ def f():
+ return Class.attribute
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ del Metaclass.attribute
+
+ for _ in range(1025):
+ self.assertFalse(f())
+
+ def test_type_descriptor_shadows_attribute_method(self):
+ class Class:
+ mro = None
+
+ def f():
+ return Class.mro
+
+ for _ in range(1025):
+ self.assertIsNone(f())
+
+ def test_type_descriptor_shadows_attribute_member(self):
+ class Class:
+ __base__ = None
+
+ def f():
+ return Class.__base__
+
+ for _ in range(1025):
+ self.assertIs(f(), object)
+
+ def test_type_descriptor_shadows_attribute_getset(self):
+ class Class:
+ __name__ = "Spam"
+
+ def f():
+ return Class.__name__
+
+ for _ in range(1025):
+ self.assertEqual(f(), "Class")
+
+ def test_metaclass_getattribute(self):
+ class Metaclass(type):
+ def __getattribute__(self, name):
+ return True
+
+ class Class(metaclass=Metaclass):
+ attribute = False
+
+ def f():
+ return Class.attribute
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ def test_metaclass_swap(self):
+ class OldMetaclass(type):
+ @property
+ def attribute(self):
+ return True
+
+ class NewMetaclass(type):
+ @property
+ def attribute(self):
+ return False
+
+ class Class(metaclass=OldMetaclass):
+ pass
+
+ def f():
+ return Class.attribute
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ Class.__class__ = NewMetaclass
+
+ for _ in range(1025):
+ self.assertFalse(f())
+
+ def test_load_shadowing_slot_should_raise_type_error(self):
+ class Class:
+ __slots__ = ("slot",)
+
+ class Sneaky:
+ __slots__ = ("shadowed",)
+ shadowing = Class.slot
+
+ def f(o):
+ o.shadowing
+
+ o = Sneaky()
+ o.shadowed = 42
+
+ for _ in range(1025):
+ with self.assertRaises(TypeError):
+ f(o)
+
+ def test_store_shadowing_slot_should_raise_type_error(self):
+ class Class:
+ __slots__ = ("slot",)
+
+ class Sneaky:
+ __slots__ = ("shadowed",)
+ shadowing = Class.slot
+
+ def f(o):
+ o.shadowing = 42
+
+ o = Sneaky()
+
+ for _ in range(1025):
+ with self.assertRaises(TypeError):
+ f(o)
+
+ def test_load_borrowed_slot_should_not_crash(self):
+ class Class:
+ __slots__ = ("slot",)
+
+ class Sneaky:
+ borrowed = Class.slot
+
+ def f(o):
+ o.borrowed
+
+ o = Sneaky()
+
+ for _ in range(1025):
+ with self.assertRaises(TypeError):
+ f(o)
+
+ def test_store_borrowed_slot_should_not_crash(self):
+ class Class:
+ __slots__ = ("slot",)
+
+ class Sneaky:
+ borrowed = Class.slot
+
+ def f(o):
+ o.borrowed = 42
+
+ o = Sneaky()
+
+ for _ in range(1025):
+ with self.assertRaises(TypeError):
+ f(o)
+
+
+class TestLoadMethodCache(unittest.TestCase):
+ def test_descriptor_added_after_optimization(self):
+ class Descriptor:
+ pass
+
+ class Class:
+ attribute = Descriptor()
+
+ def __get__(self, instance, owner):
+ return lambda: False
+
+ def __set__(self, instance, value):
+ return None
+
+ def attribute():
+ return True
+
+ instance = Class()
+ instance.attribute = attribute
+
+ def f():
+ return instance.attribute()
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ Descriptor.__get__ = __get__
+ Descriptor.__set__ = __set__
+
+ for _ in range(1025):
+ self.assertFalse(f())
+
+ def test_metaclass_descriptor_added_after_optimization(self):
+ class Descriptor:
+ pass
+
+ class Metaclass(type):
+ attribute = Descriptor()
+
+ class Class(metaclass=Metaclass):
+ def attribute():
+ return True
+
+ def __get__(self, instance, owner):
+ return lambda: False
+
+ def __set__(self, instance, value):
+ return None
+
+ def f():
+ return Class.attribute()
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ Descriptor.__get__ = __get__
+ Descriptor.__set__ = __set__
+
+ for _ in range(1025):
+ self.assertFalse(f())
+
+ def test_metaclass_descriptor_shadows_class_attribute(self):
+ class Metaclass(type):
+ @property
+ def attribute(self):
+ return lambda: True
+
+ class Class(metaclass=Metaclass):
+ def attribute():
+ return False
+
+ def f():
+ return Class.attribute()
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ def test_metaclass_set_descriptor_after_optimization(self):
+ class Metaclass(type):
+ pass
+
+ class Class(metaclass=Metaclass):
+ def attribute():
+ return True
+
+ @property
+ def attribute(self):
+ return lambda: False
+
+ def f():
+ return Class.attribute()
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ Metaclass.attribute = attribute
+
+ for _ in range(1025):
+ self.assertFalse(f())
+
+ def test_metaclass_del_descriptor_after_optimization(self):
+ class Metaclass(type):
+ @property
+ def attribute(self):
+ return lambda: True
+
+ class Class(metaclass=Metaclass):
+ def attribute():
+ return False
+
+ def f():
+ return Class.attribute()
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ del Metaclass.attribute
+
+ for _ in range(1025):
+ self.assertFalse(f())
+
+ def test_type_descriptor_shadows_attribute_method(self):
+ class Class:
+ def mro():
+ return ["Spam", "eggs"]
+
+ def f():
+ return Class.mro()
+
+ for _ in range(1025):
+ self.assertEqual(f(), ["Spam", "eggs"])
+
+ def test_type_descriptor_shadows_attribute_member(self):
+ class Class:
+ def __base__():
+ return "Spam"
+
+ def f():
+ return Class.__base__()
+
+ for _ in range(1025):
+ self.assertNotEqual(f(), "Spam")
+
+ def test_metaclass_getattribute(self):
+ class Metaclass(type):
+ def __getattribute__(self, name):
+ return lambda: True
+
+ class Class(metaclass=Metaclass):
+ def attribute():
+ return False
+
+ def f():
+ return Class.attribute()
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ def test_metaclass_swap(self):
+ class OldMetaclass(type):
+ @property
+ def attribute(self):
+ return lambda: True
+
+ class NewMetaclass(type):
+ @property
+ def attribute(self):
+ return lambda: False
+
+ class Class(metaclass=OldMetaclass):
+ pass
+
+ def f():
+ return Class.attribute()
+
+ for _ in range(1025):
+ self.assertTrue(f())
+
+ Class.__class__ = NewMetaclass
+
+ for _ in range(1025):
+ self.assertFalse(f())
+
+
+if __name__ == "__main__":
+ import unittest
+ unittest.main()
diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py
index b7e38c23349878..1db738d228b1b9 100644
--- a/Lib/test/test_operator.py
+++ b/Lib/test/test_operator.py
@@ -208,6 +208,9 @@ def test_indexOf(self):
nan = float("nan")
self.assertEqual(operator.indexOf([nan, nan, 21], nan), 0)
self.assertEqual(operator.indexOf([{}, 1, {}, 2], {}), 0)
+ it = iter('leave the iterator at exactly the position after the match')
+ self.assertEqual(operator.indexOf(it, 'a'), 2)
+ self.assertEqual(next(it), 'v')
def test_invert(self):
operator = self.module
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 36ad587760d701..aa414ca14889a4 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -11,7 +11,6 @@
import fractions
import itertools
import locale
-import mmap
import os
import pickle
import select
@@ -59,6 +58,10 @@
except ImportError:
INT_MAX = PY_SSIZE_T_MAX = sys.maxsize
+try:
+ import mmap
+except ImportError:
+ mmap = None
from test.support.script_helper import assert_python_ok
from test.support import unix_shell
@@ -183,6 +186,9 @@ def test_access(self):
@unittest.skipIf(
support.is_emscripten, "Test is unstable under Emscripten."
)
+ @unittest.skipIf(
+ support.is_wasi, "WASI does not support dup."
+ )
def test_closerange(self):
first = os.open(os_helper.TESTFN, os.O_CREAT|os.O_RDWR)
# We must allocate two consecutive file descriptors, otherwise
@@ -1585,7 +1591,10 @@ def test_makedir(self):
'dir5', 'dir6')
os.makedirs(path)
- @unittest.skipIf(support.is_emscripten, "Emscripten's umask is a stub.")
+ @unittest.skipIf(
+ support.is_emscripten or support.is_wasi,
+ "Emscripten's/WASI's umask is a stub."
+ )
def test_mode(self):
with os_helper.temp_umask(0o002):
base = os_helper.TESTFN
@@ -1598,6 +1607,10 @@ def test_mode(self):
self.assertEqual(os.stat(path).st_mode & 0o777, 0o555)
self.assertEqual(os.stat(parent).st_mode & 0o777, 0o775)
+ @unittest.skipIf(
+ support.is_emscripten or support.is_wasi,
+ "Emscripten's/WASI's umask is a stub."
+ )
def test_exist_ok_existing_directory(self):
path = os.path.join(os_helper.TESTFN, 'dir1')
mode = 0o777
@@ -1612,6 +1625,10 @@ def test_exist_ok_existing_directory(self):
# Issue #25583: A drive root could raise PermissionError on Windows
os.makedirs(os.path.abspath('/'), exist_ok=True)
+ @unittest.skipIf(
+ support.is_emscripten or support.is_wasi,
+ "Emscripten's/WASI's umask is a stub."
+ )
def test_exist_ok_s_isgid_directory(self):
path = os.path.join(os_helper.TESTFN, 'dir1')
S_ISGID = stat.S_ISGID
@@ -1661,7 +1678,7 @@ def tearDown(self):
os.removedirs(path)
-@unittest.skipUnless(hasattr(os, 'chown'), "Test needs chown")
+@os_helper.skip_unless_working_chmod
class ChownFileTests(unittest.TestCase):
@classmethod
@@ -1762,6 +1779,7 @@ def test_remove_nothing(self):
self.assertTrue(os.path.exists(os_helper.TESTFN))
+@unittest.skipIf(support.is_wasi, "WASI has no /dev/null")
class DevNullTests(unittest.TestCase):
def test_devnull(self):
with open(os.devnull, 'wb', 0) as f:
@@ -2108,6 +2126,7 @@ def test_chmod(self):
self.assertRaises(OSError, os.chmod, os_helper.TESTFN, 0)
+@unittest.skipIf(support.is_wasi, "Cannot create invalid FD on WASI.")
class TestInvalidFD(unittest.TestCase):
singles = ["fchdir", "dup", "fdatasync", "fstat",
"fstatvfs", "fsync", "tcgetpgrp", "ttyname"]
@@ -2157,6 +2176,26 @@ def test_closerange(self):
def test_dup2(self):
self.check(os.dup2, 20)
+ @unittest.skipUnless(hasattr(os, 'dup2'), 'test needs os.dup2()')
+ @unittest.skipIf(
+ support.is_emscripten,
+ "dup2() with negative fds is broken on Emscripten (see gh-102179)"
+ )
+ def test_dup2_negative_fd(self):
+ valid_fd = os.open(__file__, os.O_RDONLY)
+ self.addCleanup(os.close, valid_fd)
+ fds = [
+ valid_fd,
+ -1,
+ -2**31,
+ ]
+ for fd, fd2 in itertools.product(fds, repeat=2):
+ if fd != fd2:
+ with self.subTest(fd=fd, fd2=fd2):
+ with self.assertRaises(OSError) as ctx:
+ os.dup2(fd, fd2)
+ self.assertEqual(ctx.exception.errno, errno.EBADF)
+
@unittest.skipUnless(hasattr(os, 'fchmod'), 'test needs os.fchmod()')
def test_fchmod(self):
self.check(os.fchmod, 0)
@@ -2167,7 +2206,8 @@ def test_fchown(self):
@unittest.skipUnless(hasattr(os, 'fpathconf'), 'test needs os.fpathconf()')
@unittest.skipIf(
- support.is_emscripten, "musl libc issue on Emscripten, bpo-46390"
+ support.is_emscripten or support.is_wasi,
+ "musl libc issue on Emscripten/WASI, bpo-46390"
)
def test_fpathconf(self):
self.check(os.pathconf, "PC_NAME_MAX")
@@ -2460,6 +2500,7 @@ def test_kill_int(self):
# os.kill on Windows can take an int which gets set as the exit code
self._kill(100)
+ @unittest.skipIf(mmap is None, "requires mmap")
def _kill_with_event(self, event, name):
tagname = "test_os_%s" % uuid.uuid1()
m = mmap.mmap(-1, 1, tagname)
@@ -3068,6 +3109,14 @@ def kill_process(pid):
@support.requires_subprocess()
class SpawnTests(unittest.TestCase):
+ @staticmethod
+ def quote_args(args):
+ # On Windows, os.spawn* simply joins arguments with spaces:
+ # arguments need to be quoted
+ if os.name != 'nt':
+ return args
+ return [f'"{arg}"' if " " in arg.strip() else arg for arg in args]
+
def create_args(self, *, with_env=False, use_bytes=False):
self.exitcode = 17
@@ -3088,115 +3137,118 @@ def create_args(self, *, with_env=False, use_bytes=False):
with open(filename, "w", encoding="utf-8") as fp:
fp.write(code)
- args = [sys.executable, filename]
+ program = sys.executable
+ args = self.quote_args([program, filename])
if use_bytes:
+ program = os.fsencode(program)
args = [os.fsencode(a) for a in args]
self.env = {os.fsencode(k): os.fsencode(v)
for k, v in self.env.items()}
- return args
+ return program, args
@requires_os_func('spawnl')
def test_spawnl(self):
- args = self.create_args()
- exitcode = os.spawnl(os.P_WAIT, args[0], *args)
+ program, args = self.create_args()
+ exitcode = os.spawnl(os.P_WAIT, program, *args)
self.assertEqual(exitcode, self.exitcode)
@requires_os_func('spawnle')
def test_spawnle(self):
- args = self.create_args(with_env=True)
- exitcode = os.spawnle(os.P_WAIT, args[0], *args, self.env)
+ program, args = self.create_args(with_env=True)
+ exitcode = os.spawnle(os.P_WAIT, program, *args, self.env)
self.assertEqual(exitcode, self.exitcode)
@requires_os_func('spawnlp')
def test_spawnlp(self):
- args = self.create_args()
- exitcode = os.spawnlp(os.P_WAIT, args[0], *args)
+ program, args = self.create_args()
+ exitcode = os.spawnlp(os.P_WAIT, program, *args)
self.assertEqual(exitcode, self.exitcode)
@requires_os_func('spawnlpe')
def test_spawnlpe(self):
- args = self.create_args(with_env=True)
- exitcode = os.spawnlpe(os.P_WAIT, args[0], *args, self.env)
+ program, args = self.create_args(with_env=True)
+ exitcode = os.spawnlpe(os.P_WAIT, program, *args, self.env)
self.assertEqual(exitcode, self.exitcode)
@requires_os_func('spawnv')
def test_spawnv(self):
- args = self.create_args()
- exitcode = os.spawnv(os.P_WAIT, args[0], args)
+ program, args = self.create_args()
+ exitcode = os.spawnv(os.P_WAIT, program, args)
self.assertEqual(exitcode, self.exitcode)
# Test for PyUnicode_FSConverter()
- exitcode = os.spawnv(os.P_WAIT, FakePath(args[0]), args)
+ exitcode = os.spawnv(os.P_WAIT, FakePath(program), args)
self.assertEqual(exitcode, self.exitcode)
@requires_os_func('spawnve')
def test_spawnve(self):
- args = self.create_args(with_env=True)
- exitcode = os.spawnve(os.P_WAIT, args[0], args, self.env)
+ program, args = self.create_args(with_env=True)
+ exitcode = os.spawnve(os.P_WAIT, program, args, self.env)
self.assertEqual(exitcode, self.exitcode)
@requires_os_func('spawnvp')
def test_spawnvp(self):
- args = self.create_args()
- exitcode = os.spawnvp(os.P_WAIT, args[0], args)
+ program, args = self.create_args()
+ exitcode = os.spawnvp(os.P_WAIT, program, args)
self.assertEqual(exitcode, self.exitcode)
@requires_os_func('spawnvpe')
def test_spawnvpe(self):
- args = self.create_args(with_env=True)
- exitcode = os.spawnvpe(os.P_WAIT, args[0], args, self.env)
+ program, args = self.create_args(with_env=True)
+ exitcode = os.spawnvpe(os.P_WAIT, program, args, self.env)
self.assertEqual(exitcode, self.exitcode)
@requires_os_func('spawnv')
def test_nowait(self):
- args = self.create_args()
- pid = os.spawnv(os.P_NOWAIT, args[0], args)
+ program, args = self.create_args()
+ pid = os.spawnv(os.P_NOWAIT, program, args)
support.wait_process(pid, exitcode=self.exitcode)
@requires_os_func('spawnve')
def test_spawnve_bytes(self):
# Test bytes handling in parse_arglist and parse_envlist (#28114)
- args = self.create_args(with_env=True, use_bytes=True)
- exitcode = os.spawnve(os.P_WAIT, args[0], args, self.env)
+ program, args = self.create_args(with_env=True, use_bytes=True)
+ exitcode = os.spawnve(os.P_WAIT, program, args, self.env)
self.assertEqual(exitcode, self.exitcode)
@requires_os_func('spawnl')
def test_spawnl_noargs(self):
- args = self.create_args()
- self.assertRaises(ValueError, os.spawnl, os.P_NOWAIT, args[0])
- self.assertRaises(ValueError, os.spawnl, os.P_NOWAIT, args[0], '')
+ program, __ = self.create_args()
+ self.assertRaises(ValueError, os.spawnl, os.P_NOWAIT, program)
+ self.assertRaises(ValueError, os.spawnl, os.P_NOWAIT, program, '')
@requires_os_func('spawnle')
def test_spawnle_noargs(self):
- args = self.create_args()
- self.assertRaises(ValueError, os.spawnle, os.P_NOWAIT, args[0], {})
- self.assertRaises(ValueError, os.spawnle, os.P_NOWAIT, args[0], '', {})
+ program, __ = self.create_args()
+ self.assertRaises(ValueError, os.spawnle, os.P_NOWAIT, program, {})
+ self.assertRaises(ValueError, os.spawnle, os.P_NOWAIT, program, '', {})
@requires_os_func('spawnv')
def test_spawnv_noargs(self):
- args = self.create_args()
- self.assertRaises(ValueError, os.spawnv, os.P_NOWAIT, args[0], ())
- self.assertRaises(ValueError, os.spawnv, os.P_NOWAIT, args[0], [])
- self.assertRaises(ValueError, os.spawnv, os.P_NOWAIT, args[0], ('',))
- self.assertRaises(ValueError, os.spawnv, os.P_NOWAIT, args[0], [''])
+ program, __ = self.create_args()
+ self.assertRaises(ValueError, os.spawnv, os.P_NOWAIT, program, ())
+ self.assertRaises(ValueError, os.spawnv, os.P_NOWAIT, program, [])
+ self.assertRaises(ValueError, os.spawnv, os.P_NOWAIT, program, ('',))
+ self.assertRaises(ValueError, os.spawnv, os.P_NOWAIT, program, [''])
@requires_os_func('spawnve')
def test_spawnve_noargs(self):
- args = self.create_args()
- self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, args[0], (), {})
- self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, args[0], [], {})
- self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, args[0], ('',), {})
- self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, args[0], [''], {})
+ program, __ = self.create_args()
+ self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, program, (), {})
+ self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, program, [], {})
+ self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, program, ('',), {})
+ self.assertRaises(ValueError, os.spawnve, os.P_NOWAIT, program, [''], {})
def _test_invalid_env(self, spawn):
- args = [sys.executable, '-c', 'pass']
+ program = sys.executable
+ args = self.quote_args([program, '-c', 'pass'])
# null character in the environment variable name
newenv = os.environ.copy()
newenv["FRUIT\0VEGETABLE"] = "cabbage"
try:
- exitcode = spawn(os.P_WAIT, args[0], args, newenv)
+ exitcode = spawn(os.P_WAIT, program, args, newenv)
except ValueError:
pass
else:
@@ -3206,7 +3258,7 @@ def _test_invalid_env(self, spawn):
newenv = os.environ.copy()
newenv["FRUIT"] = "orange\0VEGETABLE=cabbage"
try:
- exitcode = spawn(os.P_WAIT, args[0], args, newenv)
+ exitcode = spawn(os.P_WAIT, program, args, newenv)
except ValueError:
pass
else:
@@ -3216,7 +3268,7 @@ def _test_invalid_env(self, spawn):
newenv = os.environ.copy()
newenv["FRUIT=ORANGE"] = "lemon"
try:
- exitcode = spawn(os.P_WAIT, args[0], args, newenv)
+ exitcode = spawn(os.P_WAIT, program, args, newenv)
except ValueError:
pass
else:
@@ -3229,10 +3281,11 @@ def _test_invalid_env(self, spawn):
fp.write('import sys, os\n'
'if os.getenv("FRUIT") != "orange=lemon":\n'
' raise AssertionError')
- args = [sys.executable, filename]
+
+ args = self.quote_args([program, filename])
newenv = os.environ.copy()
newenv["FRUIT"] = "orange=lemon"
- exitcode = spawn(os.P_WAIT, args[0], args, newenv)
+ exitcode = spawn(os.P_WAIT, program, args, newenv)
self.assertEqual(exitcode, 0)
@requires_os_func('spawnve')
@@ -3771,7 +3824,6 @@ class Str(str):
def test_oserror_filename(self):
funcs = [
(self.filenames, os.chdir,),
- (self.filenames, os.chmod, 0o777),
(self.filenames, os.lstat,),
(self.filenames, os.open, os.O_RDONLY),
(self.filenames, os.rmdir,),
@@ -3792,6 +3844,8 @@ def test_oserror_filename(self):
(self.filenames, os.rename, "dst"),
(self.filenames, os.replace, "dst"),
))
+ if os_helper.can_chmod():
+ funcs.append((self.filenames, os.chmod, 0o777))
if hasattr(os, "chown"):
funcs.append((self.filenames, os.chown, 0, 0))
if hasattr(os, "lchown"):
@@ -3980,7 +4034,7 @@ class PathTConverterTests(unittest.TestCase):
('access', False, (os.F_OK,), None),
('chflags', False, (0,), None),
('lchflags', False, (0,), None),
- ('open', False, (0,), getattr(os, 'close', None)),
+ ('open', False, (os.O_RDONLY,), getattr(os, 'close', None)),
]
def test_path_t_converter(self):
@@ -4352,6 +4406,7 @@ def test_fd(self):
st = os.stat(entry.name, dir_fd=fd, follow_symlinks=False)
self.assertEqual(entry.stat(follow_symlinks=False), st)
+ @unittest.skipIf(support.is_wasi, "WASI maps '' to cwd")
def test_empty_path(self):
self.assertRaises(FileNotFoundError, os.scandir, '')
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index 6737068c0ff6d6..bd5170651d5345 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -13,7 +13,7 @@
from unittest import mock
from test.support import import_helper
-from test.support import is_emscripten
+from test.support import is_emscripten, is_wasi
from test.support import os_helper
from test.support.os_helper import TESTFN, FakePath
@@ -465,6 +465,9 @@ def test_parents_common(self):
self.assertEqual(par[0], P('/a/b'))
self.assertEqual(par[1], P('/a'))
self.assertEqual(par[2], P('/'))
+ self.assertEqual(par[-1], P('/'))
+ self.assertEqual(par[-2], P('/a'))
+ self.assertEqual(par[-3], P('/a/b'))
self.assertEqual(par[0:1], (P('/a/b'),))
self.assertEqual(par[:2], (P('/a/b'), P('/a')))
self.assertEqual(par[:-1], (P('/a/b'), P('/a')))
@@ -472,6 +475,8 @@ def test_parents_common(self):
self.assertEqual(par[::2], (P('/a/b'), P('/')))
self.assertEqual(par[::-1], (P('/'), P('/a'), P('/a/b')))
self.assertEqual(list(par), [P('/a/b'), P('/a'), P('/')])
+ with self.assertRaises(IndexError):
+ par[-4]
with self.assertRaises(IndexError):
par[3]
@@ -1530,6 +1535,7 @@ def test_empty_path(self):
p = self.cls('')
self.assertEqual(p.stat(), os.stat('.'))
+ @unittest.skipIf(is_wasi, "WASI has no user accounts.")
def test_expanduser_common(self):
P = self.cls
p = P('~')
@@ -1693,10 +1699,15 @@ def _check(glob, expected):
"dirA", "dirA/linkC", "dirB", "dirB/linkD", "dirC",
"dirC/dirD", "dirE", "linkB",
])
+ _check(p.rglob(""), ["", "dirA", "dirB", "dirC", "dirE", "dirC/dirD"])
p = P(BASE, "dirC")
+ _check(p.rglob("*"), ["dirC/fileC", "dirC/novel.txt",
+ "dirC/dirD", "dirC/dirD/fileD"])
_check(p.rglob("file*"), ["dirC/fileC", "dirC/dirD/fileD"])
_check(p.rglob("*/*"), ["dirC/dirD/fileD"])
+ _check(p.rglob("*/"), ["dirC/dirD"])
+ _check(p.rglob(""), ["dirC", "dirC/dirD"])
# gh-91616, a re module regression
_check(p.rglob("*.txt"), ["dirC/novel.txt"])
_check(p.rglob("*.*"), ["dirC/novel.txt"])
@@ -1779,6 +1790,15 @@ def my_scandir(path):
subdir.chmod(000)
self.assertEqual(len(set(base.glob("*"))), 4)
+ @os_helper.skip_unless_symlink
+ def test_glob_long_symlink(self):
+ # See gh-87695
+ base = self.cls(BASE) / 'long_symlink'
+ base.mkdir()
+ bad_link = base / 'bad_link'
+ bad_link.symlink_to("bad" * 200)
+ self.assertEqual(sorted(base.glob('**/*')), [bad_link])
+
def _check_resolve(self, p, expected, strict=True):
q = p.resolve(strict)
self.assertEqual(q, expected)
@@ -1891,6 +1911,7 @@ def test_with(self):
with p:
pass
+ @os_helper.skip_unless_working_chmod
def test_chmod(self):
p = self.cls(BASE) / 'fileA'
mode = p.stat().st_mode
@@ -1905,6 +1926,7 @@ def test_chmod(self):
# On Windows, os.chmod does not follow symlinks (issue #15411)
@only_posix
+ @os_helper.skip_unless_working_chmod
def test_chmod_follow_symlinks_true(self):
p = self.cls(BASE) / 'linkA'
q = p.resolve()
@@ -1920,6 +1942,7 @@ def test_chmod_follow_symlinks_true(self):
# XXX also need a test for lchmod.
+ @os_helper.skip_unless_working_chmod
def test_stat(self):
p = self.cls(BASE) / 'fileA'
st = p.stat()
@@ -2369,6 +2392,9 @@ def test_is_socket_false(self):
@unittest.skipIf(
is_emscripten, "Unix sockets are not implemented on Emscripten."
)
+ @unittest.skipIf(
+ is_wasi, "Cannot create socket on WASI."
+ )
def test_is_socket_true(self):
P = self.cls(BASE, 'mysock')
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
@@ -2525,7 +2551,8 @@ def _check_symlink_loop(self, *args, strict=True):
print(path.resolve(strict))
@unittest.skipIf(
- is_emscripten, "umask is not implemented on Emscripten."
+ is_emscripten or is_wasi,
+ "umask is not implemented on Emscripten/WASI."
)
def test_open_mode(self):
old_mask = os.umask(0)
@@ -2551,7 +2578,8 @@ def test_resolve_root(self):
os.chdir(current_directory)
@unittest.skipIf(
- is_emscripten, "umask is not implemented on Emscripten."
+ is_emscripten or is_wasi,
+ "umask is not implemented on Emscripten/WASI."
)
def test_touch_mode(self):
old_mask = os.umask(0)
diff --git a/Lib/test/test_patma.py b/Lib/test/test_patma.py
index 57d3b1ec701ca4..4153f51714f678 100644
--- a/Lib/test/test_patma.py
+++ b/Lib/test/test_patma.py
@@ -3151,6 +3151,40 @@ def f(command): # 0
self.assertListEqual(self._trace(f, "go x"), [1, 2, 3])
self.assertListEqual(self._trace(f, "spam"), [1, 2, 3])
+ def test_unreachable_code(self):
+ def f(command): # 0
+ match command: # 1
+ case 1: # 2
+ if False: # 3
+ return 1 # 4
+ case _: # 5
+ if False: # 6
+ return 0 # 7
+
+ self.assertListEqual(self._trace(f, 1), [1, 2, 3])
+ self.assertListEqual(self._trace(f, 0), [1, 2, 5, 6])
+
+ def test_parser_deeply_nested_patterns(self):
+ # Deeply nested patterns can cause exponential backtracking when parsing.
+ # See gh-93671 for more information.
+
+ levels = 100
+
+ patterns = [
+ "A" + "(" * levels + ")" * levels,
+ "{1:" * levels + "1" + "}" * levels,
+ "[" * levels + "1" + "]" * levels,
+ ]
+
+ for pattern in patterns:
+ with self.subTest(pattern):
+ code = inspect.cleandoc("""
+ match None:
+ case {}:
+ pass
+ """.format(pattern))
+ compile(code, "", "exec")
+
if __name__ == "__main__":
"""
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index 0141b739c25440..4f4a56922803cf 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -574,6 +574,156 @@ def test_pdb_whatis_command():
(Pdb) continue
"""
+def test_pdb_display_command():
+ """Test display command
+
+ >>> def test_function():
+ ... a = 0
+ ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ ... a = 1
+ ... a = 2
+ ... a = 3
+ ... a = 4
+
+ >>> with PdbTestInput([ # doctest: +ELLIPSIS
+ ... 'display a',
+ ... 'n',
+ ... 'display',
+ ... 'undisplay a',
+ ... 'n',
+ ... 'display a',
+ ... 'undisplay',
+ ... 'display a < 1',
+ ... 'n',
+ ... 'continue',
+ ... ]):
+ ... test_function()
+ > (4)test_function()
+ -> a = 1
+ (Pdb) display a
+ display a: 0
+ (Pdb) n
+ > (5)test_function()
+ -> a = 2
+ display a: 1 [old: 0]
+ (Pdb) display
+ Currently displaying:
+ a: 1
+ (Pdb) undisplay a
+ (Pdb) n
+ > (6)test_function()
+ -> a = 3
+ (Pdb) display a
+ display a: 2
+ (Pdb) undisplay
+ (Pdb) display a < 1
+ display a < 1: False
+ (Pdb) n
+ > (7)test_function()
+ -> a = 4
+ (Pdb) continue
+ """
+
+def test_pdb_alias_command():
+ """Test alias command
+
+ >>> class A:
+ ... def __init__(self):
+ ... self.attr1 = 10
+ ... self.attr2 = 'str'
+ ... def method(self):
+ ... pass
+
+ >>> def test_function():
+ ... o = A()
+ ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ ... o.method()
+
+ >>> with PdbTestInput([ # doctest: +ELLIPSIS
+ ... 'alias pi for k in %1.__dict__.keys(): print(f"%1.{k} = {%1.__dict__[k]}")',
+ ... 'alias ps pi self',
+ ... 'pi o',
+ ... 's',
+ ... 'ps',
+ ... 'continue',
+ ... ]):
+ ... test_function()
+ > (4)test_function()
+ -> o.method()
+ (Pdb) alias pi for k in %1.__dict__.keys(): print(f"%1.{k} = {%1.__dict__[k]}")
+ (Pdb) alias ps pi self
+ (Pdb) pi o
+ o.attr1 = 10
+ o.attr2 = str
+ (Pdb) s
+ --Call--
+ > (5)method()
+ -> def method(self):
+ (Pdb) ps
+ self.attr1 = 10
+ self.attr2 = str
+ (Pdb) continue
+ """
+
+def test_pdb_where_command():
+ """Test where command
+
+ >>> def g():
+ ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+
+ >>> def f():
+ ... g();
+
+ >>> def test_function():
+ ... f()
+
+ >>> with PdbTestInput([ # doctest: +ELLIPSIS
+ ... 'w',
+ ... 'where',
+ ... 'u',
+ ... 'w',
+ ... 'continue',
+ ... ]):
+ ... test_function()
+ --Return--
+ > (2)g()->None
+ -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ (Pdb) w
+ ...
+ (8)()
+ -> test_function()
+ (2)test_function()
+ -> f()
+ (2)f()
+ -> g();
+ > (2)g()->None
+ -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ (Pdb) where
+ ...
+ (8)()
+ -> test_function()
+ (2)test_function()
+ -> f()
+ (2)f()
+ -> g();
+ > (2)g()->None
+ -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ (Pdb) u
+ > (2)f()
+ -> g();
+ (Pdb) w
+ ...
+ (8)()
+ -> test_function()
+ (2)test_function()
+ -> f()
+ > (2)f()
+ -> g();
+ (2)g()->None
+ -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ (Pdb) continue
+ """
+
def test_post_mortem():
"""Test post mortem traceback debugging.
@@ -1363,6 +1513,191 @@ def test_pdb_issue_43318():
4
"""
+def test_pdb_issue_gh_91742():
+ """See GH-91742
+
+ >>> def test_function():
+ ... __author__ = "pi"
+ ... __version__ = "3.14"
+ ...
+ ... def about():
+ ... '''About'''
+ ... print(f"Author: {__author__!r}",
+ ... f"Version: {__version__!r}",
+ ... sep=" ")
+ ...
+ ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ ... about()
+
+
+ >>> reset_Breakpoint()
+ >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
+ ... 'step',
+ ... 'next',
+ ... 'next',
+ ... 'jump 5',
+ ... 'continue'
+ ... ]):
+ ... test_function()
+ > (12)test_function()
+ -> about()
+ (Pdb) step
+ --Call--
+ > (5)about()
+ -> def about():
+ (Pdb) next
+ > (7)about()
+ -> print(f"Author: {__author__!r}",
+ (Pdb) next
+ > (8)about()
+ -> f"Version: {__version__!r}",
+ (Pdb) jump 5
+ > (5)about()
+ -> def about():
+ (Pdb) continue
+ Author: 'pi' Version: '3.14'
+ """
+
+def test_pdb_issue_gh_94215():
+ """See GH-94215
+
+ Check that frame_setlineno() does not leak references.
+
+ >>> def test_function():
+ ... def func():
+ ... def inner(v): pass
+ ... inner(
+ ... 42
+ ... )
+ ...
+ ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ ... func()
+
+ >>> reset_Breakpoint()
+ >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
+ ... 'step',
+ ... 'next',
+ ... 'next',
+ ... 'jump 3',
+ ... 'next',
+ ... 'next',
+ ... 'jump 3',
+ ... 'next',
+ ... 'next',
+ ... 'jump 3',
+ ... 'continue'
+ ... ]):
+ ... test_function()
+ > (9)test_function()
+ -> func()
+ (Pdb) step
+ --Call--
+ > (2)func()
+ -> def func():
+ (Pdb) next
+ > (3)func()
+ -> def inner(v): pass
+ (Pdb) next
+ > (4)func()
+ -> inner(
+ (Pdb) jump 3
+ > (3)func()
+ -> def inner(v): pass
+ (Pdb) next
+ > (4)func()
+ -> inner(
+ (Pdb) next
+ > (5)func()
+ -> 42
+ (Pdb) jump 3
+ > (3)func()
+ -> def inner(v): pass
+ (Pdb) next
+ > (4)func()
+ -> inner(
+ (Pdb) next
+ > (5)func()
+ -> 42
+ (Pdb) jump 3
+ > (3)func()
+ -> def inner(v): pass
+ (Pdb) continue
+ """
+
+def test_pdb_issue_gh_101673():
+ """See GH-101673
+
+ Make sure ll won't revert local variable assignment
+
+ >>> def test_function():
+ ... a = 1
+ ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+
+ >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
+ ... '!a = 2',
+ ... 'll',
+ ... 'p a',
+ ... 'continue'
+ ... ]):
+ ... test_function()
+ --Return--
+ > (3)test_function()->None
+ -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ (Pdb) !a = 2
+ (Pdb) ll
+ 1 def test_function():
+ 2 a = 1
+ 3 -> import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ (Pdb) p a
+ 2
+ (Pdb) continue
+ """
+
+def test_pdb_issue_gh_101517():
+ """See GH-101517
+
+ Make sure pdb doesn't crash when the exception is caught in a try/except* block
+
+ >>> def test_function():
+ ... try:
+ ... raise KeyError
+ ... except* Exception as e:
+ ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+
+ >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
+ ... 'continue'
+ ... ]):
+ ... test_function()
+ > (4)test_function()
+ -> except* Exception as e:
+ (Pdb) continue
+ """
+
+def test_pdb_issue_gh_103225():
+ """See GH-103225
+
+ Make sure longlist uses 1-based line numbers in frames that correspond to a module
+
+ >>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
+ ... 'longlist',
+ ... 'continue'
+ ... ]):
+ ... a = 1
+ ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ ... b = 2
+ > (7)()
+ -> b = 2
+ (Pdb) longlist
+ 1 with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
+ 2 'longlist',
+ 3 'continue'
+ 4 ]):
+ 5 a = 1
+ 6 import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
+ 7 -> b = 2
+ (Pdb) continue
+ """
+
@support.requires_subprocess()
class PdbTestCase(unittest.TestCase):
@@ -1371,7 +1706,7 @@ def tearDown(self):
@unittest.skipIf(sys.flags.safe_path,
'PYTHONSAFEPATH changes default sys.path')
- def _run_pdb(self, pdb_args, commands):
+ def _run_pdb(self, pdb_args, commands, expected_returncode=0):
self.addCleanup(os_helper.rmtree, '__pycache__')
cmd = [sys.executable, '-m', 'pdb'] + pdb_args
with subprocess.Popen(
@@ -1384,15 +1719,20 @@ def _run_pdb(self, pdb_args, commands):
stdout, stderr = proc.communicate(str.encode(commands))
stdout = stdout and bytes.decode(stdout)
stderr = stderr and bytes.decode(stderr)
+ self.assertEqual(
+ proc.returncode,
+ expected_returncode,
+ f"Unexpected return code\nstdout: {stdout}\nstderr: {stderr}"
+ )
return stdout, stderr
- def run_pdb_script(self, script, commands):
+ def run_pdb_script(self, script, commands, expected_returncode=0):
"""Run 'script' lines with pdb and the pdb 'commands'."""
filename = 'main.py'
with open(filename, 'w') as f:
f.write(textwrap.dedent(script))
self.addCleanup(os_helper.unlink, filename)
- return self._run_pdb([filename], commands)
+ return self._run_pdb([filename], commands, expected_returncode)
def run_pdb_module(self, script, commands):
"""Runs the script code as part of a module"""
@@ -1598,7 +1938,9 @@ def test_issue16180(self):
script = "def f: pass\n"
commands = ''
expected = "SyntaxError:"
- stdout, stderr = self.run_pdb_script(script, commands)
+ stdout, stderr = self.run_pdb_script(
+ script, commands, expected_returncode=1
+ )
self.assertIn(expected, stdout,
'\n\nExpected:\n{}\nGot:\n{}\n'
'Fail to handle a syntax error in the debuggee.'
@@ -1761,7 +2103,9 @@ def test_module_without_a_main(self):
with open(init_file, 'w'):
pass
self.addCleanup(os_helper.rmtree, module_name)
- stdout, stderr = self._run_pdb(['-m', module_name], "")
+ stdout, stderr = self._run_pdb(
+ ['-m', module_name], "", expected_returncode=1
+ )
self.assertIn("ImportError: No module named t_main.__main__",
stdout.splitlines())
@@ -1774,7 +2118,9 @@ def test_package_without_a_main(self):
with open(modpath + '/__init__.py', 'w'):
pass
self.addCleanup(os_helper.rmtree, pkg_name)
- stdout, stderr = self._run_pdb(['-m', modpath.replace('/', '.')], "")
+ stdout, stderr = self._run_pdb(
+ ['-m', modpath.replace('/', '.')], "", expected_returncode=1
+ )
self.assertIn(
"'t_pkg.t_main' is a package and cannot be directly executed",
stdout)
@@ -1963,6 +2309,76 @@ def test_issue42383(self):
expected = '(Pdb) The correct file was executed'
self.assertEqual(stdout.split('\n')[6].rstrip('\r'), expected)
+ def test_gh_94215_crash(self):
+ script = """\
+ def func():
+ def inner(v): pass
+ inner(
+ 42
+ )
+ func()
+ """
+ commands = textwrap.dedent("""
+ break func
+ continue
+ next
+ next
+ jump 2
+ """)
+ stdout, stderr = self.run_pdb_script(script, commands)
+ self.assertFalse(stderr)
+
+ def test_gh_93696_frozen_list(self):
+ frozen_src = """
+ def func():
+ x = "Sentinel string for gh-93696"
+ print(x)
+ """
+ host_program = """
+ import os
+ import sys
+
+ def _create_fake_frozen_module():
+ with open('gh93696.py') as f:
+ src = f.read()
+
+ # this function has a co_filename as if it were in a frozen module
+ dummy_mod = compile(src, "
