Extended ellipsis test, removed version_info slices

Author: Daraan

src/test_typing_extensions.py

@@ -5384,7 +5384,7 @@ def test_invalid_uses(self):
             Concatenate[P, T]
 
         # Cannot construct a Callable with Ellipsis in 3.8 as args must be types
-        if sys.version_info[:2] >= (3, 9, 2):
+        if sys.version_info >= (3, 9, 2):
             with self.assertRaisesRegex(
                 TypeError,
                 'is not a generic class',
@@ -5404,16 +5404,16 @@ def test_invalid_uses(self):
             ):
                 Concatenate[1, ..., P]
 
-    @skipUnless(TYPING_3_11_0, "Cannot be backported to <=3.9"
-                               "Cannot use ... with 3.10 typing._ConcatenateGenericAlias")
+    @skipUnless(TYPING_3_11_0 or (3, 10, 0) <= sys.version_info < (3, 10, 2),
+                "Cannot be backported to <=3.9"
+                "Cannot use ... with 3.10.2+ typing._ConcatenateGenericAlias")
     def test_alias(self):
-        P = ParamSpec("P")
-        C1 = Callable[Concatenate[int, P], Any]
-        # Python <= 3.9 fails because parameters to generic types must be types.
-        # For Python 3.10 & typing._ConcatenateGenericAlias will
-        # as Ellipsis is not supported for ParamSpec
-        # Fallback to 3.10 & typing_extensions._ConcatenateGenericAlias not implemented
-        C1[...]
+        P = ParamSpec('P')
+        X = Callable[Concatenate[int, P], Any]
+
+        C1 = X[...]
+        self.assertEqual(C1.__parameters__, ())
+        self.assertEqual(C1.__args__, (Concatenate[int, ...], Any))
 
     def test_basic_introspection(self):
         P = ParamSpec('P')

src/typing_extensions.py

@@ -1800,7 +1800,7 @@ def __parameters__(self):
     _ConcatenateGenericAlias = typing._ConcatenateGenericAlias
 
 # 3.10.2+
-if sys.version_info[:3] >= (3, 10, 2):
+if sys.version_info >= (3, 10, 2):
     _ellipsis_dummy = ParamSpec('_ellipsis_dummy')
 
     @typing._tp_cache
@@ -1848,7 +1848,7 @@ def _concatenate_getitem(self, parameters):
         return _ConcatenateGenericAlias(self, parameters)
 
 # 3.11+; Concatenate does not accept ellipsis in 3.10
-if hasattr(typing, 'Concatenate') and sys.version_info[:2] >= (3, 11):
+if hasattr(typing, 'Concatenate') and sys.version_info >= (3, 11):
     Concatenate = typing.Concatenate
 # 3.9-3.10
 elif sys.version_info[:2] >= (3, 9):