typing

Author: tedivm

prettyconfig/conf/settings.py

@@ -20,17 +20,17 @@
     gitignore_directories = set([])
     with open(".gitignore", "rb") as f:
         for line in f.readlines():
-            line = line.decode("utf-8")
-            if "*" in line:
+            line_string = line.decode("utf-8")
+            if "*" in line_string:
                 continue
-            if line.startswith("#"):
+            if line_string.startswith("#"):
                 continue
-            if "#" in line:
-                line = line.split("#")[0]
-            line = line.strip().strip("/")
-            if len(line) == 0:
+            if "#" in line_string:
+                line_string = line_string.split("#")[0]
+            line_string = line_string.strip().strip("/")
+            if len(line_string) == 0:
                 continue
-            gitignore_directories.add(line)
+            gitignore_directories.add(line_string)
     if len(gitignore_directories) > 0:
         default_data["exclude_paths"] = set(default_data.get("exclude_paths", [])) | gitignore_directories
 

prettyconfig/formatters/yaml.py

@@ -16,17 +16,18 @@ def dump(self, data: Any, stream=None, **kw) -> None | str:
         YAML.dump(self, data, stream, **kw)
         if return_string:
             return stream.getvalue()
+        return None
 
 
 #
 # Overload the comment writer to remove superfluous newlines.
 #
 
 # Save the original comment writer so our extended version can use it.
-ruamel.yaml.emitter.Emitter.write_comment_original = ruamel.yaml.emitter.Emitter.write_comment
+ruamel.yaml.emitter.Emitter.write_comment_original = ruamel.yaml.emitter.Emitter.write_comment  # type: ignore
 
 # Create the new comment writer.
-def strip_empty_lines_write_comment(self, comment, pre=False):
+def strip_empty_lines_write_comment(self, comment: Any, pre: bool = False) -> None:
     # Check if comment is nothing but newlines.
     # Then replace with a single new line.
     string_check = comment.value.replace("\n", "")
@@ -37,13 +38,13 @@ def strip_empty_lines_write_comment(self, comment, pre=False):
 
 
 # Set ruamel.yaml to use the new writer.
-ruamel.yaml.emitter.Emitter.write_comment = strip_empty_lines_write_comment
+ruamel.yaml.emitter.Emitter.write_comment = strip_empty_lines_write_comment  # type: ignore
 
 
 yaml = YAMLWithStrings()
-yaml.preserve_quotes = True
+yaml.preserve_quotes = True  # type: ignore
 yaml.default_flow_style = False
-yaml.width = 120
+yaml.width = 120  # type: ignore
 yaml.indent(mapping=2, sequence=4, offset=2)
 
 
@@ -52,4 +53,4 @@ def yaml_formatter(input: str) -> str:
     # comments and other useful data. The dump function uses that to add
     # comments back in.
     data = yaml.load(input)
-    return yaml.dump(data)
+    return yaml.dump(data)  # type: ignore