Renaming.

Author: serhiy-storchaka

Lib/test/test_inspect/test_inspect.py

@@ -148,17 +148,25 @@ def meth_self_o(self, object, /): pass
 def meth_type_noargs(type, /): pass
 def meth_type_o(type, object, /): pass
 
-# Simple decorator for test cases that using decorated functions
-def identity(func):
+# Decorator decorator that returns a simple wrapped function
+def identity_wrapper(func):
     @functools.wraps(func)
     def wrapped(*args, **kwargs):
         return func(*args, **kwargs)
     return wrapped
 
-# Simple descriptor that decorates a function
-class DescWithDeco:
+# Original signature of the simple wrapped function returned by
+# identity_wrapper().
+varargs_signature = (
+    (('args', ..., ..., 'var_positional'),
+    ('kwargs', ..., ..., 'var_keyword')),
+    ...,
+)
+
+# Decorator decorator that returns a simple descriptor
+class custom_descriptor:
     def __init__(self, func):
-        self.func = identity(func)
+        self.func = func
 
     def __get__(self, instance, owner):
         return self.func.__get__(instance, owner)
@@ -4044,7 +4052,7 @@ def __init__(self, b):
 
     def test_signature_on_class_with_wrapped_metaclass_call(self):
         class CM(type):
-            @identity
+            @identity_wrapper
             def __call__(cls, a):
                 pass
         class C(metaclass=CM):
@@ -4058,7 +4066,7 @@ def __init__(self, b):
         with self.subTest('classmethod'):
             class CM(type):
                 @classmethod
-                @identity
+                @identity_wrapper
                 def __call__(cls, a):
                     return a
             class C(metaclass=CM):
@@ -4073,7 +4081,7 @@ def __init__(self, b):
         with self.subTest('staticmethod'):
             class CM(type):
                 @staticmethod
-                @identity
+                @identity_wrapper
                 def __call__(a):
                     return a
             class C(metaclass=CM):
@@ -4087,7 +4095,7 @@ def __init__(self, b):
 
         with self.subTest('MethodType'):
             class A:
-                @identity
+                @identity_wrapper
                 def call(self, a):
                     return a
             class CM(type):
@@ -4103,7 +4111,8 @@ def __init__(self, b):
 
         with self.subTest('descriptor'):
             class CM(type):
-                @DescWithDeco
+                @custom_descriptor
+                @identity_wrapper
                 def __call__(self, a):
                     return a
             class C(metaclass=CM):
@@ -4114,10 +4123,18 @@ def __init__(self, b):
             self.assertEqual(self.signature(C),
                             ((('a', ..., ..., "positional_or_keyword"),),
                             ...))
+            self.assertEqual(self.signature(C.__call__),
+                            ((('a', ..., ..., "positional_or_keyword"),),
+                            ...))
+
+            self.assertEqual(self.signature(C, follow_wrapped=False),
+                             varargs_signature)
+            self.assertEqual(self.signature(C.__call__, follow_wrapped=False),
+                             varargs_signature)
 
-    def test_signature_on_class_with_decorated_init(self):
+    def test_signature_on_class_with_wrapped_init(self):
         class C:
-            @identity
+            @identity_wrapper
             def __init__(self, b):
                 pass
 
@@ -4129,7 +4146,7 @@ def __init__(self, b):
         with self.subTest('classmethod'):
             class C:
                 @classmethod
-                @identity
+                @identity_wrapper
                 def __init__(cls, b):
                     pass
 
@@ -4141,7 +4158,7 @@ def __init__(cls, b):
         with self.subTest('staticmethod'):
             class C:
                 @staticmethod
-                @identity
+                @identity_wrapper
                 def __init__(b):
                     pass
 
@@ -4152,7 +4169,7 @@ def __init__(b):
 
         with self.subTest('MethodType'):
             class A:
-                @identity
+                @identity_wrapper
                 def call(self, a):
                     pass
 
@@ -4166,7 +4183,7 @@ class C:
 
         with self.subTest('partial'):
             class C:
-                __init__ = functools.partial(identity(lambda x, a, b: None), 2)
+                __init__ = functools.partial(identity_wrapper(lambda x, a, b: None), 2)
 
             C(1)  # does not raise
             self.assertEqual(self.signature(C),
@@ -4175,7 +4192,7 @@ class C:
 
         with self.subTest('partialmethod'):
             class C:
-                @identity
+                @identity_wrapper
                 def _init(self, x, a):
                     self.a = (x, a)
                 __init__ = functools.partialmethod(_init, 2)
@@ -4187,35 +4204,29 @@ def _init(self, x, a):
 
         with self.subTest('descriptor'):
             class C:
-                @DescWithDeco
+                @custom_descriptor
+                @identity_wrapper
                 def __init__(self, a):
                     pass
 
             C(1)  # does not raise
             self.assertEqual(self.signature(C),
                             ((('a', ..., ..., "positional_or_keyword"),),
                             ...))
-
             self.assertEqual(self.signature(C.__init__),
                             ((('self', ..., ..., "positional_or_keyword"),
                             ('a', ..., ..., "positional_or_keyword")),
                             ...))
 
-            varargs_signature = (
-                (('args', ..., ..., 'var_positional'),
-                ('kwargs', ..., ..., 'var_keyword')),
-                ...,
-            )
             self.assertEqual(self.signature(C, follow_wrapped=False),
                              varargs_signature)
             self.assertEqual(self.signature(C.__new__, follow_wrapped=False),
                              varargs_signature)
 
-
-    def test_signature_on_class_with_decorated_new(self):
+    def test_signature_on_class_with_wrapped_new(self):
         with self.subTest('FunctionType'):
             class C:
-                @identity
+                @identity_wrapper
                 def __new__(cls, a):
                     return a
 
@@ -4227,7 +4238,7 @@ def __new__(cls, a):
         with self.subTest('classmethod'):
             class C:
                 @classmethod
-                @identity
+                @identity_wrapper
                 def __new__(cls, cls2, a):
                     return a
 
@@ -4239,7 +4250,7 @@ def __new__(cls, cls2, a):
         with self.subTest('staticmethod'):
             class C:
                 @staticmethod
-                @identity
+                @identity_wrapper
                 def __new__(cls, a):
                     return a
 
@@ -4250,7 +4261,7 @@ def __new__(cls, a):
 
         with self.subTest('MethodType'):
             class A:
-                @identity
+                @identity_wrapper
                 def call(self, cls, a):
                     return a
             class C:
@@ -4263,7 +4274,7 @@ class C:
 
         with self.subTest('partial'):
             class C:
-                __new__ = functools.partial(identity(lambda x, cls, a: (x, a)), 2)
+                __new__ = functools.partial(identity_wrapper(lambda x, cls, a: (x, a)), 2)
 
             self.assertEqual(C(1), (2, 1))
             self.assertEqual(self.signature(C),
@@ -4272,7 +4283,7 @@ class C:
 
         with self.subTest('partialmethod'):
             class C:
-                __new__ = functools.partialmethod(identity(lambda cls, x, a: (x, a)), 2)
+                __new__ = functools.partialmethod(identity_wrapper(lambda cls, x, a: (x, a)), 2)
 
             self.assertEqual(C(1), (2, 1))
             self.assertEqual(self.signature(C),
@@ -4281,25 +4292,20 @@ class C:
 
         with self.subTest('descriptor'):
             class C:
-                @DescWithDeco
+                @custom_descriptor
+                @identity_wrapper
                 def __new__(cls, a):
                     return a
 
             self.assertEqual(C(1), 1)
             self.assertEqual(self.signature(C),
                             ((('a', ..., ..., "positional_or_keyword"),),
                             ...))
-
             self.assertEqual(self.signature(C.__new__),
                             ((('cls', ..., ..., "positional_or_keyword"),
                             ('a', ..., ..., "positional_or_keyword")),
                             ...))
 
-            varargs_signature = (
-                (('args', ..., ..., 'var_positional'),
-                ('kwargs', ..., ..., 'var_keyword')),
-                ...,
-            )
             self.assertEqual(self.signature(C, follow_wrapped=False),
                              varargs_signature)
             self.assertEqual(self.signature(C.__new__, follow_wrapped=False),