PYTHON-3444 MyPy Errors With Version 0.981 (#1063)

Author: juliusgeo

test/test_auth.py

@@ -329,8 +329,8 @@ def auth_string(user, password):
         bad_user = MongoClient(auth_string("not-user", SASL_PASS))
         bad_pwd = MongoClient(auth_string(SASL_USER, "not-pwd"))
         # OperationFailure raised upon connecting.
-        self.assertRaises(OperationFailure, bad_user.admin.command, "ping")  # type: ignore[arg-type]
-        self.assertRaises(OperationFailure, bad_pwd.admin.command, "ping")  # type: ignore[arg-type]
+        self.assertRaises(OperationFailure, bad_user.admin.command, "ping")
+        self.assertRaises(OperationFailure, bad_pwd.admin.command, "ping")
 
 
 class TestSCRAMSHA1(IntegrationTest):

test/test_bson.py

@@ -119,8 +119,7 @@ def tzname(self, dt):
 
 class TestBSON(unittest.TestCase):
     def assertInvalid(self, data):
-        # Remove type ignore after: https://github.com/python/mypy/issues/13220
-        self.assertRaises(InvalidBSON, decode, data)  # type: ignore[arg-type]
+        self.assertRaises(InvalidBSON, decode, data)
 
     def check_encode_then_decode(self, doc_class=dict, decoder=decode, encoder=encode):
 
@@ -1029,17 +1028,14 @@ def test_unicode_decode_error_handler(self):
 
         # Ensure that strict mode raises an error.
         for invalid in [invalid_key, invalid_val, invalid_both]:
-            # Remove type ignore after: https://github.com/python/mypy/issues/13220
             self.assertRaises(
                 InvalidBSON,
-                decode,  # type: ignore[arg-type]
+                decode,
                 invalid,
                 CodecOptions(unicode_decode_error_handler="strict"),
             )
-            self.assertRaises(
-                InvalidBSON, decode, invalid, CodecOptions()  # type: ignore[arg-type]
-            )
-            self.assertRaises(InvalidBSON, decode, invalid)  # type: ignore[arg-type]
+            self.assertRaises(InvalidBSON, decode, invalid, CodecOptions())
+            self.assertRaises(InvalidBSON, decode, invalid)
 
         # Test all other error handlers.
         for handler in ["replace", "backslashreplace", "surrogateescape", "ignore"]:
@@ -1056,10 +1052,9 @@ def test_unicode_decode_error_handler(self):
         dec = decode(enc, CodecOptions(unicode_decode_error_handler="junk"))
         self.assertEqual(dec, {"keystr": "foobar"})
 
-        # Remove type ignore after: https://github.com/python/mypy/issues/13220
         self.assertRaises(
             InvalidBSON,
-            decode,  # type: ignore[arg-type]
+            decode,
             invalid_both,
             CodecOptions(unicode_decode_error_handler="junk"),
         )

test/test_change_stream.py

@@ -1080,9 +1080,8 @@ def setFailPoint(self, scenario_dict):
         fail_cmd = SON([("configureFailPoint", "failCommand")])
         fail_cmd.update(fail_point)
         client_context.client.admin.command(fail_cmd)
-        # Remove type ignore after: https://github.com/python/mypy/issues/13220
         self.addCleanup(
-            client_context.client.admin.command,  # type: ignore[arg-type]
+            client_context.client.admin.command,
             "configureFailPoint",
             fail_cmd["configureFailPoint"],
             mode="off",

test/test_database.py

@@ -604,14 +604,13 @@ def test_command_max_time_ms(self):
         try:
             db = self.client.pymongo_test
             db.command("count", "test")
-            # Remove type ignore after: https://github.com/python/mypy/issues/13220
-            self.assertRaises(ExecutionTimeout, db.command, "count", "test", maxTimeMS=1)  # type: ignore[arg-type]
+            self.assertRaises(ExecutionTimeout, db.command, "count", "test", maxTimeMS=1)
             pipeline = [{"$project": {"name": 1, "count": 1}}]
             # Database command helper.
             db.command("aggregate", "test", pipeline=pipeline, cursor={})
             self.assertRaises(
                 ExecutionTimeout,
-                db.command,  # type: ignore[arg-type]
+                db.command,
                 "aggregate",
                 "test",
                 pipeline=pipeline,