remove unnecessary code

python · Oct 22, 2024 · d0b6e04 · d0b6e04
1 parent be8d0e7
commit d0b6e04
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst
@@ -412,7 +412,6 @@ symtable
 
   (Contributed by Bénédikt Tran in :gh:`120029`.)
 
-
 unicodedata
 -----------
 

diff --git a/Lib/test/test_unittest/test_discovery.py b/Lib/test/test_unittest/test_discovery.py
@@ -397,7 +397,7 @@ def restore_isdir():
         self.addCleanup(restore_isdir)
 
         _find_tests_args = []
-        def _find_tests(start_dir, pattern, namespace=None):
+        def _find_tests(start_dir, pattern):
             _find_tests_args.append((start_dir, pattern))
             return ['tests']
         loader._find_tests = _find_tests
@@ -817,7 +817,7 @@ def test_discovery_from_dotted_path(self):
         expectedPath = os.path.abspath(os.path.dirname(test.test_unittest.__file__))
 
         self.wasRun = False
-        def _find_tests(start_dir, pattern, namespace=None):
+        def _find_tests(start_dir, pattern):
             self.wasRun = True
             self.assertEqual(start_dir, expectedPath)
             return tests

diff --git a/Lib/unittest/loader.py b/Lib/unittest/loader.py
@@ -305,7 +305,7 @@ def discover(self, start_dir, pattern='test*.py', top_level_dir=None):
                             self._top_level_dir = \
                                 (path.split(the_module.__name__
                                         .replace(".", os.path.sep))[0])
-                            tests.extend(self._find_tests(path, pattern, namespace=True))
+                            tests.extend(self._find_tests(path, pattern))
                     elif the_module.__name__ in sys.builtin_module_names:
                         # builtin module
                         raise TypeError('Can not use builtin modules '
@@ -371,7 +371,7 @@ def _match_path(self, path, full_path, pattern):
         # override this method to use alternative matching strategy
         return fnmatch(path, pattern)
 
-    def _find_tests(self, start_dir, pattern, namespace=False):
+    def _find_tests(self, start_dir, pattern):
         """Used by discovery. Yields test suites it loads."""
         # Handle the __init__ in this package
         name = self._get_name_from_path(start_dir)
@@ -380,8 +380,7 @@ def _find_tests(self, start_dir, pattern, namespace=False):
         if name != '.' and name not in self._loading_packages:
             # name is in self._loading_packages while we have called into
             # loadTestsFromModule with name.
-            tests, should_recurse = self._find_test_path(
-                start_dir, pattern, namespace)
+            tests, should_recurse = self._find_test_path(start_dir, pattern)
             if tests is not None:
                 yield tests
             if not should_recurse:
@@ -392,20 +391,19 @@ def _find_tests(self, start_dir, pattern, namespace=False):
         paths = sorted(os.listdir(start_dir))
         for path in paths:
             full_path = os.path.join(start_dir, path)
-            tests, should_recurse = self._find_test_path(
-                full_path, pattern, False)
+            tests, should_recurse = self._find_test_path(full_path, pattern)
             if tests is not None:
                 yield tests
             if should_recurse:
                 # we found a package that didn't use load_tests.
                 name = self._get_name_from_path(full_path)
                 self._loading_packages.add(name)
                 try:
-                    yield from self._find_tests(full_path, pattern, False)
+                    yield from self._find_tests(full_path, pattern)
                 finally:
                     self._loading_packages.discard(name)
 
-    def _find_test_path(self, full_path, pattern, namespace=False):
+    def _find_test_path(self, full_path, pattern):
         """Used by discovery.
 
         Loads tests from a single file, or a directories' __init__.py when
@@ -449,8 +447,7 @@ def _find_test_path(self, full_path, pattern, namespace=False):
                         msg % (mod_name, module_dir, expected_dir))
                 return self.loadTestsFromModule(module, pattern=pattern), False
         elif os.path.isdir(full_path):
-            if (not namespace and
-                not os.path.isfile(os.path.join(full_path, '__init__.py'))):
+            if not os.path.isfile(os.path.join(full_path, '__init__.py')):
                 return None, False
 
             load_tests = None