From f68a77d13e885d55359d76ef34cebb38b9c50413 Mon Sep 17 00:00:00 2001 From: Charles Beauville Date: Wed, 19 Jun 2024 12:49:15 +0200 Subject: [PATCH] fix errors --- src/py/flwr_tool/init_py_check.py | 12 ++++++------ src/py/flwr_tool/init_py_fix.py | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/py/flwr_tool/init_py_check.py b/src/py/flwr_tool/init_py_check.py index 0ecbc6359344..1fb08513bb6a 100755 --- a/src/py/flwr_tool/init_py_check.py +++ b/src/py/flwr_tool/init_py_check.py @@ -48,13 +48,13 @@ def check_missing_init_files(absolute_path: str) -> List[str]: return dir_list -def get_all_var_list(dir: str) -> Tuple[Path, List[str], List[str]]: +def get_all_var_list(init_dir: str) -> Tuple[Path, List[str], List[str]]: """Get the __all__ list of a __init__.py file. The function returns the path of the '__init__.py' file of the given dir, as well as the list itself, and the list of lines corresponding to the list. """ - init_file = Path(dir) / "__init__.py" + init_file = Path(init_dir) / "__init__.py" all_lines = [] all_list = [] capture = False @@ -79,8 +79,8 @@ def check_all_init_files(dir_list: List[str]) -> None: """Check if __all__ is in alphabetical order in __init__.py files.""" warning_list = [] - for dir in dir_list: - init_file, all_list, _ = get_all_var_list(dir) + for init_dir in dir_list: + init_file, all_list, _ = get_all_var_list(init_dir) if all_list and not all_list == sorted(all_list): warning_message = "- " + str(init_file) @@ -104,5 +104,5 @@ def check_all_init_files(dir_list: List[str]) -> None: ) for i, _ in enumerate(sys.argv): abs_path: str = os.path.abspath(os.path.join(os.getcwd(), sys.argv[i])) - dir_list = check_missing_init_files(abs_path) - check_all_init_files(dir_list) + init_dirs = check_missing_init_files(abs_path) + check_all_init_files(init_dirs) diff --git a/src/py/flwr_tool/init_py_fix.py b/src/py/flwr_tool/init_py_fix.py index f3ebd7395a42..906d66361b77 100755 --- a/src/py/flwr_tool/init_py_fix.py +++ b/src/py/flwr_tool/init_py_fix.py @@ -19,13 +19,13 @@ def fix_all_init_files(dir_list: List[str]) -> None: """Sort the __all__ variables that are in __init__.py files.""" warning_list = [] - for dir in dir_list: - init_file, all_list, all_lines = get_all_var_list(dir) + for init_dir in dir_list: + init_file, all_list, all_lines = get_all_var_list(init_dir) if all_list: sorted_all_list = sorted(all_list) if not all_list == sorted_all_list: - warning_message = "- " + str(dir) + warning_message = "- " + str(init_dir) warning_list.append(warning_message) old_all_lines = "\n".join(all_lines) @@ -65,5 +65,5 @@ def fix_all_init_files(dir_list: List[str]) -> None: ) for i, _ in enumerate(sys.argv): abs_path: str = os.path.abspath(os.path.join(os.getcwd(), sys.argv[i])) - warnings, dir_list = get_init_dir_list_and_warnings(abs_path) - fix_all_init_files(dir_list) + warnings, init_dirs = get_init_dir_list_and_warnings(abs_path) + fix_all_init_files(init_dirs)