adjust types for a successful mypy run

Some type: ignores were added but only internal uses of functionality.

beangulp/__init__.py

@@ -14,6 +14,7 @@
 import sys
 import warnings
 import click
+from typing import Any, List, Optional, Union, Sequence
 
 from beancount import loader
 
@@ -257,7 +258,7 @@ def _importer(importer):
 
 
 class Ingest:
-    def __init__(self, importers, hooks=None):
+    def __init__(self, importers: Sequence[Union[Importer, ImporterProtocol]], hooks: Optional[Sequence[Any]] = None) -> None:
         self.importers = [_importer(i) for i in importers]
         self.hooks = list(hooks) if hooks is not None else []
 

beangulp/cache.py

@@ -155,7 +155,7 @@ def get_file(filename):
     return _CACHE[filename]
 
 
-_CACHE = utils.DefaultDictWithKey(_FileMemo)
+_CACHE = utils.DefaultDictWithKey(_FileMemo)  # type: ignore
 
 
 def cache(func=None, *, key=None):

beangulp/file_type.py

@@ -12,17 +12,18 @@
 __license__ = "GNU GPLv2"
 
 import warnings
+from typing import Optional
 from beangulp import mimetypes
 
 
 # python-magic is an optional dependency.
 try:
     import magic
 except (ImportError, OSError):
-    magic = None
+    magic = None  # type: ignore
 
 
-def guess_file_type(filename):
+def guess_file_type(filename: str) -> Optional[str]:
     """Attempt to guess the type of the input file.
 
     Args:

beangulp/importer.py

@@ -177,37 +177,44 @@ class ImporterProtocol:
     # you prefer to create your imported transactions with a different flag.
     FLAG = flags.FLAG_OKAY
 
-    def name(self):
+    def name(self) -> str:
         """See Importer class name property."""
         return f"{self.__class__.__module__}.{self.__class__.__name__}"
 
     __str__ = name
 
     def identify(self, file) -> bool:
         """See Importer class identify() method."""
+        # Type error ignore for backwards compatibility - this should be overridden
+        # and implemented in subclasses
+        return None  # type: ignore
 
     def file_account(self, file) -> data.Account:
         """See Importer class account() method."""
+        # Type error ignore for backwards compatibility - this should be overridden
+        # and implemented in subclasses
+        return None  # type: ignore
 
     def file_date(self, file) -> Optional[datetime.date]:
         """See Importer class date() method."""
 
     def file_name(self, file) -> Optional[str]:
         """See Importer class filename() method."""
 
-    def extract(self, file, existing_entries: data.Entries = None) -> data.Entries:
+    def extract(self, file, existing_entries: Optional[data.Entries] = None) -> data.Entries:
         """See Importer class extract() method."""
+        return []
 
 
 class Adapter(Importer):
     """Adapter from ImporterProtocol to Importer ABC interface."""
 
-    def __init__(self, importer):
+    def __init__(self, importer: ImporterProtocol) -> None:
         assert isinstance(importer, ImporterProtocol)
         self.importer = importer
 
     @property
-    def name(self):
+    def name(self) -> str:
         return self.importer.name()
 
     def identify(self, filepath):

beangulp/importers/csv.py

@@ -11,7 +11,7 @@
 
 from inspect import signature
 from os import path
-from typing import Callable, Dict, List, Optional, Union
+from typing import Callable, Dict, List, Optional, Union, Tuple
 import collections
 import csv
 import datetime
@@ -159,7 +159,7 @@ def normalize_config(config, head, dialect='excel', skip_lines: int = 0):
 
 
 def prepare_for_identifier(regexps: Union[str, List[str]],
-                           matchers: Optional[List[str]]) -> Dict[str, str]:
+                           matchers: Optional[List[Tuple[str, str]]]) -> Dict[str, List[Tuple[str, str]]]:
     """Prepare data for identifier mixin."""
     if isinstance(regexps, str):
         regexps = [regexps]

beangulp/importers/csvbase.py

@@ -6,11 +6,12 @@
 
 from collections import defaultdict
 from itertools import islice
+from typing import Any, Dict, FrozenSet
 from beancount.core import data
 
 import beangulp
 
-EMPTY = frozenset()
+EMPTY: FrozenSet[str] = frozenset()
 
 
 def _resolve(spec, names):
@@ -181,7 +182,7 @@ class CSVReader(metaclass=CSVMeta):
     """Comment character."""
 
     # This is populated by the CSVMeta metaclass.
-    columns = {}
+    columns: Dict[Any, Any] = {}
 
     def read(self, filepath):
         """Read CSV file according to class defined columns specification.

beangulp/petl_utils.py

@@ -1,11 +1,11 @@
 """Utilities using petl.
 """
 
-from typing import Optional
+from typing import Optional, Set
 import datetime
 import re
 
-import petl
+import petl  # type: ignore
 
 from beancount.core import data
 from beancount.core import amount
@@ -47,32 +47,33 @@ def table_to_directives(
             metas.append((column, match.group(1)))
 
     # Create transactions.
-    entries = []
+    entries: data.Directives = []
     filename = filename or f"<{__file__}>"
     for index, rec in enumerate(table.records()):
         meta = data.new_metadata(filename, index)
         units = amount.Amount(rec.amount, currency)
-        tags, links = set(), set()
+        tags: Set[str] = set()
+        links: Set[str] = set()
+        link = getattr(rec, "link", None)
+        if link:
+            links.add(link)
+        tag = getattr(rec, "tag", None)
+        if tag:
+            tags.add(tag)
         txn = data.Transaction(
             meta,
             rec.date,
             flags.FLAG_OKAY,
             getattr(rec, "payee", None),
             getattr(rec, "narration", ""),
-            tags,
-            links,
+            frozenset(tags),
+            frozenset(links),
             [data.Posting(rec.account, units, None, None, None, None)],
         )
         if hasattr(rec, "other_account") and rec.other_account:
             txn.postings.append(
                 data.Posting(rec.other_account, None, None, None, None, None)
             )
-        link = getattr(rec, "link", None)
-        if link:
-            links.add(link)
-        tag = getattr(rec, "tag", None)
-        if tag:
-            tags.add(tag)
 
         for column, key in metas:
             value = getattr(rec, column, None)

beangulp/petl_utils_test.py

@@ -1,7 +1,7 @@
 import datetime
 import decimal
 import unittest
-import petl
+import petl  # type: ignore
 
 from beancount.parser import cmptest
 from beangulp import petl_utils

beangulp/similar.py

@@ -7,7 +7,7 @@
 __license__ = "GNU GPLv2"
 
 from decimal import Decimal
-from typing import Callable, Optional
+from typing import Callable, Optional, FrozenSet, Set, Union
 import collections
 import datetime
 import re
@@ -196,8 +196,8 @@ def cmp(entry1: data.Directive, entry2: data.Directive) -> bool:
         ):
             return False
 
-        links1 = entry1.links
-        links2 = entry2.links
+        links1: Union[FrozenSet[str], Set[str]] = entry1.links
+        links2: Union[FrozenSet[str], Set[str]] = entry2.links
         if regex:
             links1 = {link for link in links1 if re.match(regex, link)}
             links2 = {link for link in links2 if re.match(regex, link)}

beangulp/testing.py

@@ -34,10 +34,10 @@ def write_expected(outfile: TextIO,
       name: The filename for filing, produced by the importer.
       entries: The list of entries extracted by the importer.
     """
-    date = date.isoformat() if date else ''
+    formatted_date = date.isoformat() if date else ''
     name = name or ''
     print(f';; Account: {account}', file=outfile)
-    print(f';; Date: {date}', file=outfile)
+    print(f';; Date: {formatted_date}', file=outfile)
     print(f';; Name: {name}', file=outfile)
     printer.print_entries(entries, file=outfile)
 
@@ -46,7 +46,7 @@ def write_expected_file(filepath: str, *data, force: bool = False):
     """Writes out the expected file."""
     mode = 'w' if force else 'x'
     with open(filepath, mode) as expfile:
-        write_expected(expfile, *data)
+        write_expected(expfile, *data)  # type: ignore
 
 
 def compare_expected(filepath: str, *data) -> List[str]:

examples/importers/csvbank.py

@@ -5,7 +5,7 @@
 
 
 class Importer(csvbase.Importer):
-    date = csvbase.Date('Posting Date', '%m/%d/%Y')
+    date = csvbase.Date('Posting Date', '%m/%d/%Y')  # type: ignore
     narration = csvbase.Columns('Description', 'Check or Slip #', sep='; ')
     amount = csvbase.Amount('Amount')
     balance = csvbase.Amount('Balance')