Simplified code

Author: dave3d

comment_spell_check/comment_spell_check.py

@@ -222,7 +222,7 @@ def spell_check_comment(
         prefixes = prefixes or []
         error_word = remove_prefix(error_word, prefixes)
 
-        if len(error_word) == 0:
+        if not error_word:
             continue
         if error_word in spell or error_word.lower() in spell:
             continue
@@ -490,7 +490,7 @@ def comment_spell_check(args):
 
 
 def main():
-    """Main function to run the spell checker."""
+    """Parse the command line arguments and call the spell checking function."""
     args = parseargs.parse_args()
     comment_spell_check(args)
 

comment_spell_check/utils/create_checker.py

@@ -2,7 +2,6 @@
 additional dictionaries if provided.
 """
 
-import pathlib
 import logging
 import importlib.resources
 import spellchecker
@@ -22,46 +21,35 @@ def create_checker(dict_list: list[str] = None) -> spellchecker.SpellChecker:
     # load the English dictionary
     lib_path = importlib.resources.files(spellchecker)
     english_dict = str(lib_path) + "/resources/en.json.gz"
-    logger.info("Loading English dictionary from: %s", english_dict)
     checker.word_frequency.load_dictionary(english_dict)
-    logger.info("# of words: %d", checker.word_frequency.unique_words)
+    logger.info("Loaded %s", english_dict)
+    logger.info("%d words", checker.word_frequency.unique_words)
 
     # load the additional dictionaries
-    if not isinstance(dict_list, list):
+    if not isinstance(dict_list, list) or not dict_list:
         return checker
-    if len(dict_list) > 0:
-        for d in dict_list:
-            if isinstance(d, pathlib.PosixPath):
-                # local file path
-                try:
-                    checker.word_frequency.load_text_file(d)
-                    logger.info("Loading dictionary: %s", d)
-                except IsADirectoryError:
-                    # if a directory is provided, load all text files in it
-                    for file in d.glob("*.txt"):
-                        try:
-                            checker.word_frequency.load_text_file(file)
-                            logger.info("Loading dictionary: %s", file)
-                        except FileNotFoundError:
-                            logger.error("File not found: %s", file)
-                            continue
-            else:
-                # load dictionary from URL
-                try:
-                    response = requests.get(d)
-                    response.raise_for_status()
-                    checker.word_frequency.load_text(response.text)
-                    logger.info("Loading dictionary URL: %s", d)
-                except requests.exceptions.MissingSchema:
-                    # URL didn't work so assume it's a local file path
-                    try:
-                        checker.word_frequency.load_text_file(d)
-                        logger.info("Loading dictionary: %s", d)
-                    except FileNotFoundError:
-                        logger.error("File not found: %s", d)
-                        continue
-                except requests.exceptions.RequestException as e:
-                    logger.error("Error loading dictionary from URL %s: %s", d, e)
-            logger.info("# of words: %d", checker.word_frequency.unique_words)
+
+    for d in dict_list:
+        dstring = str(d)
+
+        # load dictionary from URL
+        try:
+            response = requests.get(dstring)
+            response.raise_for_status()
+            checker.word_frequency.load_text(response.text)
+
+        except requests.exceptions.MissingSchema:
+            # URL didn't work so assume it's a local file path
+            try:
+                checker.word_frequency.load_text_file(dstring)
+            except IOError:
+                logger.error("Error loading %s", dstring)
+                continue
+
+        except requests.exceptions.RequestException as e:
+            logger.error("Error loading dictionary from URL %s: %s", dstring, e)
+
+        logger.info("Loaded %s", dstring)
+        logger.info("%d words", checker.word_frequency.unique_words)
 
     return checker