Moved some tests utilities from 'test_zipfile/...' to the general 'support' folder

LucasEsposito · LucasEsposito · commit f6227ad08fd6 · 2024-07-23T01:08:39.000+02:00
diff --git a/Lib/test/support/itertools.py b/Lib/test/support/itertools.py
@@ -0,0 +1,12 @@
+# from more_itertools v8.13.0
+def always_iterable(obj, base_type=(str, bytes)):
+    if obj is None:
+        return iter(())
+
+    if (base_type is not None) and isinstance(obj, base_type):
+        return iter((obj,))
+
+    try:
+        return iter(obj)
+    except TypeError:
+        return iter((obj,))
diff --git a/Lib/test/support/parameterize.py b/Lib/test/support/parameterize.py
@@ -1,39 +1,39 @@
-import types
-import functools
-
-from ._itertools import always_iterable
-
-
-def parameterize(names, value_groups):
-    """
-    Decorate a test method to run it as a set of subtests.
-
-    Modeled after pytest.parametrize.
-    """
-
-    def decorator(func):
-        @functools.wraps(func)
-        def wrapped(self):
-            for values in value_groups:
-                resolved = map(Invoked.eval, always_iterable(values))
-                params = dict(zip(always_iterable(names), resolved))
-                with self.subTest(**params):
-                    func(self, **params)
-
-        return wrapped
-
-    return decorator
-
-
-class Invoked(types.SimpleNamespace):
-    """
-    Wrap a function to be invoked for each usage.
-    """
-
-    @classmethod
-    def wrap(cls, func):
-        return cls(func=func)
-
-    @classmethod
-    def eval(cls, cand):
-        return cand.func() if isinstance(cand, cls) else cand
+import types
+import functools
+
+from .itertools import always_iterable
+
+
+def parameterize(names, value_groups):
+    """
+    Decorate a test method to run it as a set of subtests.
+
+    Modeled after pytest.parametrize.
+    """
+
+    def decorator(func):
+        @functools.wraps(func)
+        def wrapped(self):
+            for values in value_groups:
+                resolved = map(Invoked.eval, always_iterable(values))
+                params = dict(zip(always_iterable(names), resolved))
+                with self.subTest(**params):
+                    func(self, **params)
+
+        return wrapped
+
+    return decorator
+
+
+class Invoked(types.SimpleNamespace):
+    """
+    Wrap a function to be invoked for each usage.
+    """
+
+    @classmethod
+    def wrap(cls, func):
+        return cls(func=func)
+
+    @classmethod
+    def eval(cls, cand):
+        return cand.func() if isinstance(cand, cls) else cand
diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py
@@ -8,12 +8,11 @@
 import sys
 from test import support
 from test.support import skip_if_buggy_ucrt_strfptime, warnings_helper
+from test.support.parameterize import parameterize
 from datetime import date as datetime_date
 
 import _strptime
 
-from Lib.test.test_zipfile._path._test_params import parameterize
-
 
 class getlang_Tests(unittest.TestCase):
     """Test _getlang"""
diff --git a/Lib/test/test_zipfile/_path/_itertools.py b/Lib/test/test_zipfile/_path/_itertools.py
@@ -29,20 +29,6 @@ def __next__(self):
         return result
 
 
-# from more_itertools v8.13.0
-def always_iterable(obj, base_type=(str, bytes)):
-    if obj is None:
-        return iter(())
-
-    if (base_type is not None) and isinstance(obj, base_type):
-        return iter((obj,))
-
-    try:
-        return iter(obj)
-    except TypeError:
-        return iter((obj,))
-
-
 # from more_itertools v9.0.0
 def consume(iterator, n=None):
     """Advance *iterable* by *n* steps. If *n* is ``None``, consume it
diff --git a/Lib/test/test_zipfile/_path/test_path.py b/Lib/test/test_zipfile/_path/test_path.py
@@ -10,11 +10,11 @@
 import zipfile._path
 
 from test.support.os_helper import temp_dir, FakePath
+from test.support.parameterize import parameterize, Invoked
 
 from ._functools import compose
 from ._itertools import Counter
 
-from ._test_params import parameterize, Invoked
 
 
 class jaraco:
