WIP: use named attributes

inspect: keep tuple API for 3 namedtuple

Author: vstinner

Lib/collections/__init__.py

@@ -361,7 +361,7 @@ def __ror__(self, other):
 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'])
+    >>> Point = namedtuple('Point', ['x', 'y'], deprecate_tuple_api=False)
     >>> Point.__doc__                   # docstring for the new class
     'Point(x, y)'
     >>> p = Point(11, y=22)             # instantiate with positional args or keywords

Lib/inspect.py

@@ -540,7 +540,7 @@ def getmembers_static(object, predicate=None):
     """
     return _getmembers(object, predicate, getattr_static)
 
-Attribute = namedtuple('Attribute', 'name kind defining_class object')
+Attribute = namedtuple('Attribute', 'name kind defining_class object', deprecate_tuple_api=False)
 
 def classify_class_attrs(cls):
     """Return list of attribute-descriptor tuples.
@@ -1643,7 +1643,7 @@ def getlineno(frame):
     """Get the line number from a frame object, allowing for optimization."""
     return frame.f_lineno
 
-_FrameInfo = namedtuple('_FrameInfo', ('frame',) + Traceback._fields)
+_FrameInfo = namedtuple('_FrameInfo', ('frame',) + Traceback._fields, deprecate_tuple_api=False)
 class FrameInfo(_FrameInfo):
     def __new__(cls, frame, filename, lineno, function, code_context, index, *, positions=None):
         instance = super().__new__(cls, frame, filename, lineno, function, code_context, index)

Lib/pydoc.py

@@ -2022,7 +2022,7 @@ def output(self):
         return self._output or sys.stdout
 
     def __repr__(self):
-        if inspect.stack()[1][3] == '?':
+        if inspect.stack()[1].function == '?':
             self()
             return ''
         return '<%s.%s instance>' % (self.__class__.__module__,

Lib/tarfile.py

@@ -2837,12 +2837,12 @@ def chown(self, tarinfo, targetpath, numeric_owner):
             if not numeric_owner:
                 try:
                     if grp and tarinfo.gname:
-                        g = grp.getgrnam(tarinfo.gname)[2]
+                        g = grp.getgrnam(tarinfo.gname).gr_gid
                 except KeyError:
                     pass
                 try:
                     if pwd and tarinfo.uname:
-                        u = pwd.getpwnam(tarinfo.uname)[2]
+                        u = pwd.getpwnam(tarinfo.uname).pw_uid
                 except KeyError:
                     pass
             if g is None:

Lib/test/test_calendar.py

@@ -1108,7 +1108,8 @@ def run_cli_ok(self, *args):
         return stdout.buffer.read()
 
     def run_cmd_ok(self, *args):
-        return assert_python_ok('-m', 'calendar', *args)[1]
+        proc = assert_python_ok('-m', 'calendar', *args)
+        return proc.out
 
     def assertCLIFails(self, *args):
         with self.captured_stderr_with_buffer() as stderr:

Lib/test/test_collections.py

@@ -319,7 +319,7 @@ def __ror__(self, other):
 class TestNamedTuple(unittest.TestCase):
 
     def test_factory(self):
-        Point = namedtuple('Point', 'x y')
+        Point = namedtuple('Point', 'x y', deprecate_tuple_api=False)
         self.assertEqual(Point.__name__, 'Point')
         self.assertEqual(Point.__slots__, ())
         self.assertEqual(Point.__module__, __name__)
@@ -398,7 +398,7 @@ def test_defaults(self):
         self.assertEqual(Point(), (10, 20))
 
     def test_readonly(self):
-        Point = namedtuple('Point', 'x y')
+        Point = namedtuple('Point', 'x y', deprecate_tuple_api=False)
         p = Point(11, 22)
         with self.assertRaises(AttributeError):
             p.x = 33
@@ -504,7 +504,7 @@ def test_instance(self):
         self.assertEqual(repr(p), 'Point(x=11, y=22)')
 
     def test_tupleness(self):
-        Point = namedtuple('Point', 'x y')
+        Point = namedtuple('Point', 'x y', deprecate_tuple_api=False)
         p = Point(11, 22)
 
         self.assertIsInstance(p, tuple)

Lib/test/test_profiling/test_sampling_profiler/mocks.py

@@ -3,7 +3,9 @@
 from collections import namedtuple
 
 # Matches the C structseq LocationInfo from _remote_debugging
-LocationInfo = namedtuple('LocationInfo', ['lineno', 'end_lineno', 'col_offset', 'end_col_offset'])
+LocationInfo = namedtuple('LocationInfo',
+    ['lineno', 'end_lineno', 'col_offset', 'end_col_offset'],
+    deprecate_tuple_api=False)
 
 
 class MockFrameInfo:

Lib/test/test_profiling/test_sampling_profiler/test_dump.py

@@ -37,14 +37,17 @@
 StructseqInterpreterInfo = namedtuple(
     "StructseqInterpreterInfo",
     ["interpreter_id", "threads"],
+    deprecate_tuple_api=False,
 )
 StructseqThreadInfo = namedtuple(
     "StructseqThreadInfo",
     ["thread_id", "status", "frame_info"],
+    deprecate_tuple_api=False,
 )
 StructseqFrameInfo = namedtuple(
     "StructseqFrameInfo",
     ["filename", "location", "funcname", "opcode"],
+    deprecate_tuple_api=False,
 )
 
 

Lib/test/test_script_helper.py

@@ -12,7 +12,7 @@ class TestScriptHelper(unittest.TestCase):
 
     def test_assert_python_ok(self):
         t = script_helper.assert_python_ok('-c', 'import sys; sys.exit(0)')
-        self.assertEqual(0, t[0], 'return code was not 0')
+        self.assertEqual(0, t.rc, 'return code was not 0')
 
     def test_assert_python_failure(self):
         # I didn't import the sys module so this child will fail.

Lib/test/test_sys.py

@@ -657,7 +657,9 @@ def test_attributes(self):
         self.assertIsInstance(sys.int_info.str_digits_check_threshold, int)
         self.assertIsInstance(sys.hexversion, int)
 
-        self.assertEqual(len(sys.hash_info), 9)
+        with warnings.catch_warnings(category=DeprecationWarning):
+            warnings.simplefilter("ignore", category=DeprecationWarning)
+            self.assertEqual(len(sys.hash_info), 9)
         self.assertLess(sys.hash_info.modulus, 2**sys.hash_info.width)
         # sys.hash_info.modulus should be a prime; we do a quick
         # probable primality test (doesn't exclude the possibility of
@@ -879,7 +881,9 @@ def test_sys_flags_indexable_attributes(self):
                 self.assertEqual(sys.flags[attr_idx], attr_value,
                                  msg=f"sys.flags .{attr} vs [{attr_idx}]")
         self.assertTrue(repr(sys.flags))
-        self.assertEqual(len(sys.flags), 18, msg="Do not increase, see GH-122575")
+        with warnings.catch_warnings(category=DeprecationWarning):
+            warnings.simplefilter("ignore", category=DeprecationWarning)
+            self.assertEqual(len(sys.flags), 18, msg="Do not increase, see GH-122575")
 
         self.assertIn(sys.flags.utf8_mode, {0, 1, 2})
 
@@ -1941,7 +1945,9 @@ def test_pythontypes(self):
         # per GH-122575 would be nice...
         # Q: What is the actual point of this sys.flags C size derived from PyStructSequence_Field array assertion?
         non_sequence_fields = 4
-        check(sys.flags, vsize('') + self.P + self.P * (non_sequence_fields + len(sys.flags)))
+        with warnings.catch_warnings(category=DeprecationWarning):
+            warnings.simplefilter("ignore", category=DeprecationWarning)
+            check(sys.flags, vsize('') + self.P + self.P * (non_sequence_fields + len(sys.flags)))
 
     def test_asyncgen_hooks(self):
         old = sys.get_asyncgen_hooks()