Rework mypy options

* Remove --strict-optional (now default)
* Add --disallow-untyped-decorators
* Add --check-untyped-defs
* Fix type warnings in tests

Author: srittau

mypy.ini

@@ -1,9 +1,9 @@
 [mypy]
-ignore_missing_imports = True
 disallow_subclassing_any = True
+disallow_untyped_decorators = True
+check_untyped_defs = True
 warn_redundant_casts = True
 warn_return_any = True
 warn_unused_ignores = True
 warn_unused_configs = True
 no_implicit_optional = True
-strict_optional = True

test_asserts.py

@@ -41,7 +41,6 @@
 
 
 class _DummyObject(object):
-
     def __init__(self, value="x"):
         self.value = value
 
@@ -253,7 +252,7 @@ def test_assert_almost_equal__not_similar__delta__custom_message(self):
 
     def test_assert_almost_equal__wrong_types(self):
         try:
-            assert_almost_equal("5", "5")
+            assert_almost_equal("5", "5")  # type: ignore
         except TypeError:
             pass
         else:
@@ -336,7 +335,7 @@ def test_assert_not_almost_equal__similar__delta__custom_message(self):
 
     def test_assert_not_almost_equal__wrong_types(self):
         try:
-            assert_not_almost_equal("5", "5")
+            assert_not_almost_equal("5", "5")  # type: ignore
         except TypeError:
             pass
         else:
@@ -643,8 +642,7 @@ def test_assert_not_is_instance__custom_message__multiple_types(self):
 
     def test_assert_has_attr__has_attribute(self):
         d = _DummyObject()
-        d.foo = 5
-        assert_has_attr(d, "foo")
+        assert_has_attr(d, "value")
 
     def test_assert_has_attr__does_not_have_attribute__default_message(self):
         d = _DummyObject()
@@ -961,20 +959,22 @@ def test_assert_warns__multiple_warnings(self):
                 warn("baz", FutureWarning)
 
     def test_assert_warns__warning_handler_deinstalled_on_success(self):
-        with catch_warnings(record=1) as warnings:
+        with catch_warnings(record=True) as warnings:
             with assert_warns(UserWarning):
                 warn("foo", UserWarning)
+            assert warnings is not None
             assert_equal(0, len(warnings))
             warn("bar", UserWarning)
             assert_equal(1, len(warnings))
 
     def test_assert_warns__warning_handler_deinstalled_on_failure(self):
-        with catch_warnings(record=1) as warnings:
+        with catch_warnings(record=True) as warnings:
             try:
                 with assert_warns(UserWarning):
                     pass
             except AssertionError:
                 pass
+            assert warnings is not None
             assert_equal(0, len(warnings))
             warn("bar", UserWarning)
             assert_equal(1, len(warnings))
@@ -1016,20 +1016,22 @@ def test_assert_warns_regex__multiple_warnings(self):
                 warn("baz", FutureWarning)
 
     def test_assert_warns_regex__warning_handler_deinstalled_on_success(self):
-        with catch_warnings(record=1) as warnings:
+        with catch_warnings(record=True) as warnings:
             with assert_warns_regex(UserWarning, r"foo"):
                 warn("foo", UserWarning)
+            assert warnings is not None
             assert_equal(0, len(warnings))
             warn("bar", UserWarning)
             assert_equal(1, len(warnings))
 
     def test_assert_warns_regex__warning_handler_deinstalled_on_failure(self):
-        with catch_warnings(record=1) as warnings:
+        with catch_warnings(record=True) as warnings:
             try:
                 with assert_warns_regex(UserWarning, r""):
                     pass
             except AssertionError:
                 pass
+            assert warnings is not None
             assert_equal(0, len(warnings))
             warn("bar", UserWarning)
             assert_equal(1, len(warnings))