Fix dry arg type and other linting warnings

Author: albertas

deadcode/actions/fix_or_show_unused_code.py

@@ -1,6 +1,6 @@
 from collections import defaultdict
 from difflib import unified_diff
-from typing import Iterable, Optional
+from typing import Iterable
 import os
 
 from deadcode.actions.merge_overlaping_file_parts import merge_overlaping_file_parts
@@ -10,7 +10,8 @@
 from deadcode.utils.flatten_lists import flatten_list
 from deadcode.visitor.ignore import _match
 
-def fix_or_show_unused_code(unused_items: Iterable[CodeItem], args: Args) -> Optional[str]:
+
+def fix_or_show_unused_code(unused_items: Iterable[CodeItem], args: Args) -> str:
     # Reading and writing should be patched in this file.
 
     # Group unused_names by filenames
@@ -36,11 +37,11 @@ def fix_or_show_unused_code(unused_items: Iterable[CodeItem], args: Args) -> Opt
         updated_file_content_lines = remove_file_parts_from_content(file_content_lines, unused_file_parts)
         updated_file_content = "".join(updated_file_content_lines)
         if updated_file_content.strip():
-            if args.dry and ('__all_files__' in args.dry or _match(filename, args.dry)):
+            if args.dry and ("__all_files__" in args.dry or _match(filename, args.dry)):
                 with open(filename, "r") as f:
                     diff = unified_diff(f.readlines(), updated_file_content_lines, fromfile=filename, tofile=filename)
                     # TODO: consider printing result instantly to save memory
-                    result.append(''.join(diff))
+                    result.append("".join(diff))
 
             elif args.fix:
                 with open(filename, "w") as f:
@@ -51,6 +52,7 @@ def fix_or_show_unused_code(unused_items: Iterable[CodeItem], args: Args) -> Opt
 
     if result:
         return "\n".join(result)
+    return ""
 
     # TODO: update this one: solution is to use read and write operations.
     #

deadcode/data_types.py

@@ -13,8 +13,8 @@
 @dataclass
 class Args:
     fix: bool = False
-    dry: bool = False
     verbose: bool = False
+    dry: Iterable[Pathname] = ()
     paths: Iterable[Pathname] = ()
     exclude: Iterable[Pathname] = ()
     ignore_definitions: Iterable[Pathname] = ()

deadcode/tests/cli_args/test_dry.py

@@ -17,7 +17,8 @@ class UnusedClass:
         self.assertEqual(
             unused_names,
             (
-                dedent("""\
+                dedent(
+                    """\
                 foo.py:1:0: DC03 Class `UnusedClass` is never used
 
                 --- foo.py
@@ -27,7 +28,8 @@ class UnusedClass:
                 -    pass
                 -
                  print("Dont change this file")
-                """)
+                """
+                )
             ),
         )
 
@@ -54,7 +56,8 @@ class UnusedClass:
         self.assertEqual(
             unused_names,
             (
-                dedent("""\
+                dedent(
+                    """\
                 foo.py:1:0: DC03 Class `UnusedClass` is never used
 
                 --- foo.py
@@ -64,7 +67,8 @@ class UnusedClass:
                 -    pass
                 -
                  print("Dont change this file")
-                """)
+                """
+                )
             ),
         )
 
@@ -95,7 +99,8 @@ def unused_function():
         unused_names = main(["ignore_names_by_pattern.py", "--no-color", "--dry"])
         self.assertEqual(
             unused_names,
-            dedent("""\
+            dedent(
+                """\
                 bar.py:1:0: DC02 Function `unused_function` is never used
                 foo.py:1:0: DC03 Class `UnusedClass` is never used
 
@@ -114,22 +119,23 @@ def unused_function():
                 -    pass
                 -
                  print("Dont change this file")
-            """)
+            """
+            ),
         )
 
         self.assertFiles(
             {
-            "foo.py": """
+                "foo.py": """
                 class UnusedClass:
                     pass
 
                 print("Dont change this file")""",
-            "bar.py": """
+                "bar.py": """
                 def unused_function():
                     pass
 
                 print("Dont change this file")""",
-        }
+            }
         )
 
     def test_only_provided_filenames_to_dry_option_are_reported(self):
@@ -149,7 +155,8 @@ def unused_function():
         unused_names = main(["ignore_names_by_pattern.py", "--no-color", "--dry", "foo.py"])
         self.assertEqual(
             unused_names,
-            dedent("""\
+            dedent(
+                """\
                 bar.py:1:0: DC02 Function `unused_function` is never used
                 foo.py:1:0: DC03 Class `UnusedClass` is never used
 
@@ -160,22 +167,23 @@ def unused_function():
                 -    pass
                 -
                  print("Dont change this file")
-            """)
+            """
+            ),
         )
 
         self.assertFiles(
             {
-            "foo.py": """
+                "foo.py": """
                 class UnusedClass:
                     pass
 
                 print("Dont change this file")""",
-            "bar.py": """
+                "bar.py": """
                 def unused_function():
                     pass
 
                 print("Dont change this file")""",
-        }
+            }
         )
 
     def test_no_diff_is_shown_if_dry_option_filenames_are_incorrect(self):
@@ -216,7 +224,8 @@ class UnusedClass:
         self.assertEqual(
             unused_names,
             (
-                dedent("""\
+                dedent(
+                    """\
                 foo.py:1:0: DC03 Class `UnusedClass` is never used
 
                 --- foo.py
@@ -226,7 +235,8 @@ class UnusedClass:
                 -    pass
                 -
                  print("Dont change this file")
-                """)
+                """
+                )
             ),
         )
 

pyproject.toml

@@ -66,7 +66,6 @@ known_third_party = ["deadcode"]
 ignore_names = [
     "ERROR_CODES",
     "fix",
-    "dry",
     "fix_indent",
     "ignore_definitions_if_decorated_with",
     "ignore_if_decorated_with",