- r enable mypy check_untyped_defs

Author: JayBazuzi

approval_utilities/list_utils.py

@@ -1,7 +1,7 @@
-from typing import Callable, List, Optional
+from typing import Any, Callable, List, Optional
 
 
-def format_list(alist: List[str], formatter: Optional[Callable], header: str) -> str:
+def format_list(alist: List[Any], formatter: Optional[Callable], header: str) -> str:
     if formatter is None:
         formatter = FormatLineItem().print_item
     text = (header + "\n\n") if header else ""
@@ -14,7 +14,7 @@ class FormatLineItem(object):
     def __init__(self) -> None:
         self.index = 0
 
-    def print_item(self, item: str) -> str:
+    def print_item(self, item: Any) -> str:
         text = str(self.index) + ") " + str(item)
         self.index += 1
         return text

approval_utilities/utilities/time_utilities.py

@@ -1,12 +1,13 @@
 import os
 
 from typing_extensions import ContextManager
+from typing import Optional
 
 
 def use_utc_timezone() -> ContextManager:
     class TimeZoneSwap:
         def __init__(self):
-            self.timezone = ""
+            self.timezone: Optional[str] = ""
 
         def __enter__(self):
             self.timezone = os.environ.get("TZ")

approvaltests/approvals.py

@@ -325,7 +325,7 @@ def verify_file(
 
 def verify_all(
     header: str,
-    alist: List[str],
+    alist: List[Any],
     formatter: Optional[Callable] = None,
     reporter: Optional[DiffReporter] = None,
     encoding: None = None,

approvaltests/reporters/default_reporter_factory.py

@@ -6,7 +6,7 @@
 DEFAULT_REPORTER = local()
 
 
-def set_default_reporter(reporter: Reporter) -> None:
+def set_default_reporter(reporter: Optional[Reporter]) -> None:
     DEFAULT_REPORTER.v = reporter
 
 

approvaltests/string_writer.py

@@ -11,7 +11,7 @@ class StringWriter(Writer):
 
     def __init__(
         self,
-        contents: str,
+        contents: Optional[str],
         extension: str = ".txt",
         encoding: Optional[str] = None,
         errors: Optional[str] = None,

mypy.ini

@@ -8,7 +8,6 @@ disallow_incomplete_defs = False
 disallow_untyped_calls = False
 disallow_untyped_defs = False
 disallow_any_generics = False
-check_untyped_defs = False
 no_implicit_reexport = False
 disallow_subclassing_any = False
 # End strict mode overrides
@@ -46,11 +45,14 @@ disable_error_code = misc
 disable_error_code = empty-body, no-any-return, import-not-found
 
 [mypy-tests.executable_commands.test_sql_loader]
-disable_error_code = return-value
+disable_error_code = return-value, arg-type
 
 [mypy-tests.test_inline_approvals]
 disable_error_code = no-any-return
 
+[mypy-tests.test_fileapprover]
+disable_error_code = arg-type
+
 [mypy-tests.mrjob.test_mrjob]
 disable_error_code = import-untyped
 
@@ -90,5 +92,17 @@ disable_error_code = arg-type, import-untyped
 [mypy-approvaltests.inline.parse]
 disable_error_code = no-any-return, arg-type
 
+[mypy-approvaltests.reporters.generic_diff_reporter_config]
+disable_error_code = arg-type
+
+[mypy-approvaltests.reporters.diff_reporter]
+disable_error_code = name-defined
+
+[mypy-tests.scrubbers.test_scrubbers]
+disable_error_code = arg-type
+
+[mypy-tests.test_simple_logger]
+disable_error_code = assignment
+
 [mypy-approvaltests.integrations.pytest.py_test_namer]
 disable_error_code = attr-defined

tests/test_compare_file_lists.py

@@ -1,10 +1,13 @@
-def compare_log_and_file_system(log_file_names, fs_file_names):
+from typing import List
+
+
+def compare_log_and_file_system(log_file_names: List[str], fs_file_names: List[str]):
     return [file for file in fs_file_names if file not in log_file_names]
 
 
 def test_returns_empty_list_for_two_empty_lists():
-    log_file_names = []
-    fs_file_names = []
+    log_file_names: List[str] = []
+    fs_file_names: List[str] = []
     assert compare_log_and_file_system(log_file_names, fs_file_names) == []
 
 

tests/test_verify.py

@@ -7,7 +7,7 @@
 
 import pytest
 
-from approvaltests import Options, delete_approved_file, approvals
+from approvaltests import Options, delete_approved_file, approvals, List
 from approvaltests.approval_exception import ApprovalException
 from approvaltests.approvals import (
     verify,
@@ -139,7 +139,7 @@ def test_verify_as_json_raises_type_error_for_non_renderable_types(self):
             verify_as_json(Ellipsis, self.reporter)
 
     def test_verify_as_json_raises_value_error_for_non_renderable_values(self):
-        circular_data = []
+        circular_data: List[List] = []
         circular_data.append(circular_data)
         with self.assertRaises(ValueError):
             verify_as_json(circular_data, self.reporter)