Fix mypy errors

Author: Neal Chambers

mypy.ini

@@ -109,8 +109,3 @@ disallow_any_generics = False
 disallow_any_decorated = False
 disallow_any_explicit = False
 disallow_any_expr = False
-
-[mypy-test_input_parser]
-disallow_any_expr = False
-warn_return_any = False
-disallow_any_explicit = False

tests/test_input_parser.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import unittest
-from typing import Dict, List, NamedTuple, Optional, Type
+from typing import Dict, List, NamedTuple, Optional, Type, cast
 
 from dateutil.parser import parse
 
@@ -26,7 +26,7 @@
 from rp2.out_transaction import OutTransaction
 from rp2.plugin.country.us import US
 from rp2.rp2_decimal import RP2Decimal
-from rp2.rp2_error import RP2Error, RP2RuntimeError, RP2TypeError, RP2ValueError
+from rp2.rp2_error import RP2Error, RP2TypeError, RP2ValueError
 from rp2.transaction_set import TransactionSet
 
 
@@ -107,7 +107,7 @@ def _verify_non_empty_in_table(self, in_transaction_set: TransactionSet, asset:
 
         transaction: Optional[InTransaction] = None
         previous_transaction: Optional[InTransaction] = None
-        for (
+        for (  # type: ignore
             transaction,
             internal_id,
             timestamp,
@@ -117,7 +117,7 @@ def _verify_non_empty_in_table(self, in_transaction_set: TransactionSet, asset:
             crypto_balance_change,
             fiat_balance_change,
             is_taxable,
-        ) in zip(
+        ) in zip(  # type: ignore
             in_transaction_set,
             internal_ids,
             timestamps,
@@ -128,9 +128,8 @@ def _verify_non_empty_in_table(self, in_transaction_set: TransactionSet, asset:
             fiat_balance_changes,
             is_taxable_values,
         ):
+            transaction = cast(InTransaction, transaction)
             row = int(internal_id)
-            if not in_transaction_set or not transaction:  # Unwrap the Optional types to keep mypy happy
-                raise RP2RuntimeError("Internal error: in_transaction_set or transaction are None")
             self.assertEqual(in_transaction_set.get_parent(transaction), previous_transaction)
             self.assertEqual(transaction.row, row)
             self.assertEqual(transaction.internal_id, internal_id)
@@ -182,7 +181,7 @@ def _verify_non_empty_out_table(self, out_transaction_set: TransactionSet, asset
         transaction: Optional[OutTransaction] = None
         previous_transaction: Optional[OutTransaction] = None
 
-        for (
+        for (  # type: ignore
             transaction,
             internal_id,
             timestamp,
@@ -192,7 +191,7 @@ def _verify_non_empty_out_table(self, out_transaction_set: TransactionSet, asset
             crypto_balance_change,
             fiat_balance_change,
             is_taxable,
-        ) in zip(
+        ) in zip(  # type: ignore
             out_transaction_set,
             internal_ids,
             timestamps,
@@ -203,9 +202,8 @@ def _verify_non_empty_out_table(self, out_transaction_set: TransactionSet, asset
             fiat_balance_changes,
             is_taxable_values,
         ):
+            transaction = cast(OutTransaction, transaction)
             row = int(internal_id)
-            if not out_transaction_set or not transaction:  # Unwrap the Optional types to keep mypy happy
-                raise RP2RuntimeError("Internal error: in_transaction_set or transaction are None")
             self.assertEqual(out_transaction_set.get_parent(transaction), previous_transaction)
             self.assertEqual(transaction.row, row)
             self.assertEqual(transaction.internal_id, internal_id)
@@ -254,7 +252,7 @@ def _verify_non_empty_intra_table(self, intra_transaction_set: TransactionSet, a
 
         transaction: Optional[IntraTransaction] = None
         previous_transaction: Optional[IntraTransaction] = None
-        for (
+        for (  # type: ignore
             transaction,
             internal_id,
             timestamp,
@@ -264,7 +262,7 @@ def _verify_non_empty_intra_table(self, intra_transaction_set: TransactionSet, a
             crypto_balance_change,
             fiat_balance_change,
             is_taxable,
-        ) in zip(
+        ) in zip(  # type: ignore
             intra_transaction_set,
             internal_ids,
             timestamps,
@@ -275,9 +273,8 @@ def _verify_non_empty_intra_table(self, intra_transaction_set: TransactionSet, a
             fiat_balance_changes,
             is_taxable_values,
         ):
+            transaction = cast(IntraTransaction, transaction)
             row = int(internal_id)
-            if not intra_transaction_set or not transaction:  # Unwrap the Optional types to keep mypy happy
-                raise RP2RuntimeError("Internal error: intra_transaction_set or transaction are None")
             self.assertEqual(intra_transaction_set.get_parent(transaction), previous_transaction)
             self.assertEqual(transaction.row, row)
             self.assertEqual(transaction.internal_id, internal_id)