WIP: Deprecate tuple API in namedtuple

vstinner · vstinner · commit 98624e4298dc · 2026-08-07T21:33:58.000+02:00
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
@@ -358,7 +358,7 @@ def __ror__(self, other):
 except ImportError:
     _tuplegetter = lambda index, doc: property(_itemgetter(index), doc=doc)
 
-def namedtuple(typename, field_names, *, rename=False, defaults=None, module=None):
+def namedtuple(typename, field_names, *, rename=False, defaults=None, module=None, deprecate_tuple_api=True):
     """Returns a new subclass of tuple with named fields.
 
     >>> Point = namedtuple('Point', ['x', 'y'])
@@ -512,6 +512,15 @@ def __getnewargs__(self):
         doc = _sys.intern(f'Alias for field number {index}')
         class_namespace[name] = _tuplegetter(index, doc)
 
+    if deprecate_tuple_api:
+        def __getitem__(self, key):
+            import warnings
+            warnings.warn('tuple API is deprecated, use named attributes',
+                          DeprecationWarning, stacklevel=2)
+            return tuple.__getitem__(self, key)
+
+        class_namespace['__getitem__'] = __getitem__
+
     result = type(typename, (tuple,), class_namespace)
 
     # For pickling to work, the __module__ variable needs to be set to the frame
diff --git a/Lib/difflib.py b/Lib/difflib.py
@@ -617,7 +617,7 @@ def ratio(self):
         1.0
         """
 
-        matches = sum(triple[-1] for triple in self.get_matching_blocks())
+        matches = sum(triple.size for triple in self.get_matching_blocks())
         return _calculate_ratio(matches, len(self.a) + len(self.b))
 
     def quick_ratio(self):
diff --git a/Lib/getpass.py b/Lib/getpass.py
@@ -428,7 +428,7 @@ def getuser():
 
     try:
         import pwd
-        return pwd.getpwuid(os.getuid())[0]
+        return pwd.getpwuid(os.getuid()).pw_name
     except (ImportError, KeyError) as e:
         raise OSError('No username set in the environment') from e
 
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
@@ -626,7 +626,7 @@ def request_host(request):
 
     """
     url = request.get_full_url()
-    host = urllib.parse.urlparse(url)[1]
+    host = urllib.parse.urlparse(url).netloc
     if host == "":
         host = request.get_header("Host", "")
 
diff --git a/Lib/http/server.py b/Lib/http/server.py
@@ -796,8 +796,8 @@ def send_head(self):
             if not parts.path.endswith(('/', '%2f', '%2F')):
                 # redirect browser - doing basically what apache does
                 self.send_response(HTTPStatus.MOVED_PERMANENTLY)
-                new_parts = (parts[0], parts[1], parts[2] + '/',
-                             parts[3], parts[4])
+                new_parts = (parts.scheme, parts.netloc, parts.path + '/',
+                             parts.query, parts.fragment)
                 new_url = urllib.parse.urlunsplit(new_parts)
                 self.send_header("Location", new_url)
                 self.send_header("Content-Length", "0")
diff --git a/Lib/shutil.py b/Lib/shutil.py
@@ -983,7 +983,7 @@ def _get_gid(name):
     except KeyError:
         result = None
     if result is not None:
-        return result[2]
+        return result.gr_gid
     return None
 
 def _get_uid(name):
@@ -1001,7 +1001,7 @@ def _get_uid(name):
     except KeyError:
         result = None
     if result is not None:
-        return result[2]
+        return result.pw_uid
     return None
 
 def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0,
diff --git a/Lib/tarfile.py b/Lib/tarfile.py
@@ -2282,14 +2282,14 @@ def gettarinfo(self, name=None, arcname=None, fileobj=None):
         if pwd:
             if tarinfo.uid not in self._unames:
                 try:
-                    self._unames[tarinfo.uid] = pwd.getpwuid(tarinfo.uid)[0]
+                    self._unames[tarinfo.uid] = pwd.getpwuid(tarinfo.uid).pw_name
                 except KeyError:
                     self._unames[tarinfo.uid] = ''
             tarinfo.uname = self._unames[tarinfo.uid]
         if grp:
             if tarinfo.gid not in self._gnames:
                 try:
-                    self._gnames[tarinfo.gid] = grp.getgrgid(tarinfo.gid)[0]
+                    self._gnames[tarinfo.gid] = grp.getgrgid(tarinfo.gid).gr_name
                 except KeyError:
                     self._gnames[tarinfo.gid] = ''
             tarinfo.gname = self._gnames[tarinfo.gid]
diff --git a/Lib/test/ssl_servers.py b/Lib/test/ssl_servers.py
@@ -61,7 +61,7 @@ def translate_path(self, path):
 
         """
         # abandon query parameters
-        path = urllib.parse.urlparse(path)[2]
+        path = urllib.parse.urlparse(path).path
         path = os.path.normpath(urllib.parse.unquote(path))
         words = path.split('/')
         words = filter(None, words)
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
@@ -868,7 +868,7 @@ def open_urlresource(url, *args, **kw):
 
     check = kw.pop('check', None)
 
-    filename = urllib.parse.urlparse(url)[2].split('/')[-1] # '/': it's URL!
+    filename = urllib.parse.urlparse(url).path.split('/')[-1] # '/': it's URL!
 
     fn = os.path.join(TEST_DATA_DIR, filename)
 
diff --git a/Lib/test/test_dataclasses/__init__.py b/Lib/test/test_dataclasses/__init__.py
@@ -16,6 +16,7 @@
 import sys
 import textwrap
 import unittest
+import warnings
 from unittest.mock import Mock
 from typing import ClassVar, Any, List, Union, Tuple, Dict, Generic, TypeVar, Optional, Protocol, DefaultDict
 from typing import get_type_hints
@@ -1779,7 +1780,9 @@ class C:
 
         # Make sure that the returned dicts are actually OrderedDicts.
         self.assertIs(type(d), OrderedDict)
-        self.assertIs(type(d['y'][1]), OrderedDict)
+        with warnings.catch_warnings(category=DeprecationWarning):
+            warnings.simplefilter("ignore", category=DeprecationWarning)
+            self.assertIs(type(d['y'][1]), OrderedDict)
 
     def test_helper_asdict_namedtuple_key(self):
         # Ensure that a field that contains a dict which has a
diff --git a/Lib/test/test_getpass.py b/Lib/test/test_getpass.py
@@ -39,10 +39,13 @@ def test_username_falls_back_to_pwd(self, environ):
         expected_name = 'some_name'
         environ.get.return_value = None
         if pwd:
+            class User:
+                pass
             with mock.patch('os.getuid') as uid, \
                     mock.patch('pwd.getpwuid') as getpw:
                 uid.return_value = 42
-                getpw.return_value = [expected_name]
+                getpw.return_value = User()
+                getpw.return_value.pw_name = expected_name
                 self.assertEqual(expected_name,
                                  getpass.getuser())
                 getpw.assert_called_once_with(42)
diff --git a/Lib/test/test_hash.py b/Lib/test/test_hash.py
@@ -182,10 +182,10 @@ def get_hash(self, repr_, seed=None):
             env['PYTHONHASHSEED'] = str(seed)
         else:
             env.pop('PYTHONHASHSEED', None)
-        out = assert_python_ok(
+        proc = assert_python_ok(
             '-c', self.get_hash_command(repr_),
             **env)
-        stdout = out[1].strip()
+        stdout = proc.out.strip()
         return int(stdout)
 
     def test_randomized_hash(self):
diff --git a/Lib/test/test_os/test_os.py b/Lib/test/test_os/test_os.py
@@ -915,18 +915,20 @@ def test_statvfs_attributes(self):
         result = os.statvfs(self.fname)
 
         # Make sure direct access works
-        self.assertEqual(result.f_bfree, result[3])
+        with warnings.catch_warnings(category=DeprecationWarning):
+            warnings.simplefilter("ignore", category=DeprecationWarning)
+            self.assertEqual(result.f_bfree, result[3])
 
-        # Make sure all the attributes are there.
-        members = ('bsize', 'frsize', 'blocks', 'bfree', 'bavail', 'files',
-                    'ffree', 'favail', 'flag', 'namemax')
-        for value, member in enumerate(members):
-            self.assertEqual(getattr(result, 'f_' + member), result[value])
+            # Make sure all the attributes are there.
+            members = ('bsize', 'frsize', 'blocks', 'bfree', 'bavail', 'files',
+                        'ffree', 'favail', 'flag', 'namemax')
+            for value, member in enumerate(members):
+                self.assertEqual(getattr(result, 'f_' + member), result[value])
 
-        self.assertTrue(isinstance(result.f_fsid, int))
+            # Test that the size of the tuple doesn't change
+            self.assertEqual(len(result), 10)
 
-        # Test that the size of the tuple doesn't change
-        self.assertEqual(len(result), 10)
+        self.assertTrue(isinstance(result.f_fsid, int))
 
         # Make sure that assignment really fails
         try:
@@ -2467,8 +2469,8 @@ def get_urandom_subprocess(self, count):
             'data = os.urandom(%s)' % count,
             'sys.stdout.buffer.write(data)',
             'sys.stdout.buffer.flush()'))
-        out = assert_python_ok('-c', code)
-        stdout = out[1]
+        proc = assert_python_ok('-c', code)
+        stdout = proc.out
         self.assertEqual(len(stdout), count)
         return stdout
 
diff --git a/Lib/test/test_pkgutil.py b/Lib/test/test_pkgutil.py
@@ -180,7 +180,7 @@ def test_walkpackages_filesys(self):
             'test_walkpackages_filesys.sub',
             'test_walkpackages_filesys.sub.mod',
         ]
-        actual= [e[1] for e in pkgutil.walk_packages([self.dirname])]
+        actual= [e.name for e in pkgutil.walk_packages([self.dirname])]
         self.assertEqual(actual, expected)
 
         for pkg in expected:
@@ -214,7 +214,7 @@ def test_walkpackages_zipfile(self):
             'test_walkpackages_zipfile.sub',
             'test_walkpackages_zipfile.sub.mod',
         ]
-        actual= [e[1] for e in pkgutil.walk_packages([zip_file])]
+        actual= [e.name for e in pkgutil.walk_packages([zip_file])]
         self.assertEqual(actual, expected)
         del sys.path[0]
 
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
@@ -1999,8 +1999,8 @@ def test_make_archive_owner_group(self):
         # testing make_archive with owner and group, with various combinations
         # this works even if there's not gid/uid support
         if UID_GID_SUPPORT:
-            group = grp.getgrgid(0)[0]
-            owner = pwd.getpwuid(0)[0]
+            group = grp.getgrgid(0).gr_name
+            owner = pwd.getpwuid(0).pw_name
         else:
             group = owner = 'root'
 
@@ -2027,8 +2027,8 @@ def test_make_archive_owner_group(self):
     def test_tarfile_root_owner(self):
         root_dir, base_dir = self._create_files()
         base_name = os.path.join(self.mkdtemp(), 'archive')
-        group = grp.getgrgid(0)[0]
-        owner = pwd.getpwuid(0)[0]
+        group = grp.getgrgid(0).gr_name
+        owner = pwd.getpwuid(0).pw_name
         with os_helper.change_cwd(root_dir), no_chdir:
             archive_name = make_archive(base_name, 'gztar', root_dir, 'dist',
                                         owner=owner, group=group)
@@ -2433,8 +2433,8 @@ def check_chown(path, uid=None, gid=None):
         check_chown(dirname, gid=gid)
 
         try:
-            user = pwd.getpwuid(uid)[0]
-            group = grp.getgrgid(gid)[0]
+            user = pwd.getpwuid(uid).pw_name
+            group = grp.getgrgid(gid).gr_name
         except KeyError:
             # On some systems uid/gid cannot be resolved.
             pass
diff --git a/Lib/test/test_statistics.py b/Lib/test/test_statistics.py
@@ -59,8 +59,8 @@ def _nan_equal(a, b):
         return False
     if isinstance(a, float):
         return math.isnan(a) and math.isnan(b)
-    aexp = a.as_tuple()[2]
-    bexp = b.as_tuple()[2]
+    aexp = a.as_tuple().exponent
+    bexp = b.as_tuple().exponent
     return (aexp == bexp) and (aexp in ('n', 'N'))  # Both NAN or both sNAN.
 
 
diff --git a/Lib/test/test_structseq.py b/Lib/test/test_structseq.py
@@ -281,9 +281,11 @@ def test_copy_replace_all_fields_visible(self):
         # visible fields
         self.assertEqual(copy.replace(t), t)
         self.assertIsInstance(copy.replace(t), os.times_result)
-        self.assertEqual(copy.replace(t, user=1.5), (1.5, *t[1:]))
-        self.assertEqual(copy.replace(t, system=2.5), (t[0], 2.5, *t[2:]))
-        self.assertEqual(copy.replace(t, user=1.5, system=2.5), (1.5, 2.5, *t[2:]))
+        with warnings.catch_warnings(category=DeprecationWarning):
+            warnings.simplefilter("ignore", category=DeprecationWarning)
+            self.assertEqual(copy.replace(t, user=1.5), (1.5, *t[1:]))
+            self.assertEqual(copy.replace(t, system=2.5), (t[0], 2.5, *t[2:]))
+            self.assertEqual(copy.replace(t, user=1.5, system=2.5), (1.5, 2.5, *t[2:]))
 
         # unknown fields
         with self.assertRaisesRegex(TypeError, 'unexpected field name'):
diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
@@ -2015,16 +2015,16 @@ def check_roundtrip(self, f):
             code = f.read()
         readline = iter(code.splitlines(keepends=True)).__next__
         tokens5 = list(tokenize.tokenize(readline))
-        tokens2 = [tok[:2] for tok in tokens5]
+        tokens2 = [(tok.type, tok.string) for tok in tokens5]
         # Reproduce tokens2 from pairs
         bytes_from2 = tokenize.untokenize(tokens2)
         readline2 = iter(bytes_from2.splitlines(keepends=True)).__next__
-        tokens2_from2 = [tok[:2] for tok in tokenize.tokenize(readline2)]
+        tokens2_from2 = [(tok.type, tok.string) for tok in tokenize.tokenize(readline2)]
         self.assertEqual(tokens2_from2, tokens2)
         # Reproduce tokens2 from 5-tuples
         bytes_from5 = tokenize.untokenize(tokens5)
         readline5 = iter(bytes_from5.splitlines(keepends=True)).__next__
-        tokens2_from5 = [tok[:2] for tok in tokenize.tokenize(readline5)]
+        tokens2_from5 = [(tok.type, tok.string) for tok in tokenize.tokenize(readline5)]
         self.assertEqual(tokens2_from5, tokens2)
 
         if not contains_ambiguous_backslash(code):
diff --git a/Lib/test/test_utf8_mode.py b/Lib/test/test_utf8_mode.py
@@ -29,11 +29,11 @@ def posix_locale(self):
     def get_output(self, *args, failure=False, **kw):
         kw = dict(self.DEFAULT_ENV, **kw)
         if failure:
-            out = assert_python_failure(*args, **kw)
-            out = out[2]
+            proc = assert_python_failure(*args, **kw)
+            out = proc.err
         else:
-            out = assert_python_ok(*args, **kw)
-            out = out[1]
+            proc = assert_python_ok(*args, **kw)
+            out = proc.out
         return out.decode().rstrip("\n\r")
 
     @unittest.skipIf(MS_WINDOWS, 'Windows has no POSIX locale')
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
@@ -274,7 +274,7 @@ def request_host(request):
 
     """
     url = request.full_url
-    host = urlparse(url)[1]
+    host = urlparse(url).netloc
     if host == "":
         host = request.get_header("Host", "")
 
@@ -832,11 +832,11 @@ def reduce_uri(self, uri, default_port=True):
         """Accept authority or URI and extract only the authority and path."""
         # note HTTP URLs do not have a userinfo component
         parts = urlsplit(uri)
-        if parts[1]:
+        if parts.netloc:
             # URI
-            scheme = parts[0]
-            authority = parts[1]
-            path = parts[2] or '/'
+            scheme = parts.scheme
+            authority = parts.netloc
+            path = parts.path or '/'
         else:
             # host or host:port
             scheme = None
@@ -1209,7 +1209,7 @@ class HTTPDigestAuthHandler(BaseHandler, AbstractDigestAuthHandler):
     handler_order = 490  # before Basic auth
 
     def http_error_401(self, req, fp, code, msg, headers):
-        host = urlparse(req.full_url)[1]
+        host = urlparse(req.full_url).netloc
         retry = self.http_error_auth_reqed('www-authenticate',
                                            host, req, headers)
         self.reset_retry_count()
@@ -1668,7 +1668,9 @@ def url2pathname(url, *, require_scheme=False, resolve_host=False):
     """
     if not require_scheme:
         url = 'file:' + url
-    scheme, authority, url = urlsplit(url)[:3]  # Discard query and fragment.
+    parts = urlsplit(url)
+    # Discard query and fragment.
+    scheme, authority, url = parts.scheme, parts.netloc, parts.path
     if scheme != 'file':
         raise URLError("URL is missing a 'file:' scheme")
     if os.name == 'nt':
diff --git a/Lib/urllib/robotparser.py b/Lib/urllib/robotparser.py
@@ -62,7 +62,9 @@ def set_url(self, url):
 
         if isinstance(url, urllib.request.Request):
             url = url.full_url
-        self.host, self.path = urllib.parse.urlsplit(url)[1:3]
+        parts = urllib.parse.urlsplit(url)
+        self.host = parts.netloc
+        self.path = parts.path
 
     def read(self):
         """Reads the robots.txt URL and feeds it to the parser."""
