Merge pull request #129 from reinout/more-ignore-files

Ignore folders in more code paths

Author: gforcada

CHANGES.rst

@@ -4,8 +4,8 @@ Changelog of z3c.dependencychecker
 2.14.2 (unreleased)
 -------------------
 
-- Nothing changed yet.
-
+- Refactored other `modules.py` classes that needed the same fix from previous release.
+  [gforcada]
 
 2.14.1 (2023-12-28)
 -------------------

z3c/dependencychecker/modules.py

@@ -349,14 +349,12 @@ def create_from_files(cls, top_dir):
         if top_dir.endswith(".py"):
             return
 
-        for path, folders, filenames in os.walk(top_dir):
-            folders[:] = [d for d in folders if d not in FOLDERS_TO_IGNORE]
-            for filename in filenames:
-                if filename.endswith(".txt") or filename.endswith(".rst"):
-                    yield cls(
-                        top_dir,
-                        os.path.join(path, filename),
-                    )
+        for path, filename in cls.walk_and_filter_folder(top_dir):
+            if filename.endswith(".txt") or filename.endswith(".rst"):
+                yield cls(
+                    top_dir,
+                    os.path.join(path, filename),
+                )
 
     def scan(self):
         with open(self.path) as doc_file:
@@ -400,14 +398,12 @@ def create_from_files(cls, top_dir):
         if top_dir.endswith(".py"):
             return
 
-        for path, folders, filenames in os.walk(top_dir):
-            folders[:] = [d for d in folders if d not in FOLDERS_TO_IGNORE]
-            for filename in filenames:
-                if fnmatch.fnmatch(filename, "*settings.py"):
-                    yield cls(
-                        top_dir,
-                        os.path.join(path, filename),
-                    )
+        for path, filename in cls.walk_and_filter_folder(top_dir):
+            if fnmatch.fnmatch(filename, "*settings.py"):
+                yield cls(
+                    top_dir,
+                    os.path.join(path, filename),
+                )
 
     def scan(self):
         for node in ast.walk(self._get_tree()):