From c4eb6d5039856263d3a82a3c3e17f293599348c2 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Thu, 28 Dec 2023 16:10:25 +0100 Subject: [PATCH 1/2] fix: forgot to refactor those parts --- z3c/dependencychecker/modules.py | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/z3c/dependencychecker/modules.py b/z3c/dependencychecker/modules.py index 7b7023d..c9d4cf0 100644 --- a/z3c/dependencychecker/modules.py +++ b/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()): From cb9c220cbbf24d0b73033e482231f8957956ee30 Mon Sep 17 00:00:00 2001 From: Gil Forcada Codinachs Date: Thu, 28 Dec 2023 16:11:18 +0100 Subject: [PATCH 2/2] Update CHANGES --- CHANGES.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 5531cf9..65f3344 100644 --- a/CHANGES.rst +++ b/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) -------------------