Fix various linting errors

Author: goodmami

delphin/ace.py

@@ -668,7 +668,7 @@ def _make_response(lines, run) -> Tuple[interface.Response, List[str]]:
     return response, content_lines
 
 
-def _sexpr_data(line: str) -> Iterator[Dict[str, Any]]:
+def _sexpr_data(line: str) -> Iterator[Tuple[str, Any]]:
     while line:
         try:
             expr = util.SExpr.parse(line)
@@ -679,8 +679,12 @@ def _sexpr_data(line: str) -> Iterator[Dict[str, Any]]:
         if len(expr.data) != 2:
             logger.error('Malformed output from ACE: %s', line)
             break
+
+        key, val = expr.data
+        assert isinstance(key, str)
+        yield key, val
+
         line = expr.remainder.lstrip()
-        yield expr.data
 
 
 def _tsdb_response(response: interface.Response,

delphin/tsdb.py

@@ -11,7 +11,7 @@
 import re
 from pathlib import Path
 from collections import OrderedDict
-from gzip import open as gzopen
+from gzip import open as gzopen, GzipFile
 import tempfile
 import shutil
 from datetime import datetime, date
@@ -740,9 +740,6 @@ def _get_paths(dir: util.PathLike, name: str) -> Tuple[Path, Path, bool]:
     return tx_path, gz_path, use_gz
 
 
-# Note: the return type should have TextIO instead of IO[str], but
-# there's a bug in the type checker. Replace when mypy no longer
-# complains about TextIO.
 def open(dir: util.PathLike,
          name: str,
          encoding: Optional[str] = None) -> IO[str]:
@@ -865,8 +862,8 @@ def write(dir: util.PathLike,
         # now copy the temp file to the destination
         f_tmp.seek(0)
         if gzip:
-            with gzopen(dest, mode) as f_out:
-                shutil.copyfileobj(f_tmp, f_out)
+            with GzipFile(dest, mode=mode) as gz_out:
+                shutil.copyfileobj(f_tmp, gz_out)
         else:
             with dest.open(mode=mode) as f_out:
                 shutil.copyfileobj(f_tmp, f_out)

delphin/util.py

@@ -4,6 +4,7 @@
 """
 
 from typing import (
+    Any,
     Union,
     Iterable,
     Iterator,
@@ -265,12 +266,17 @@ def _vf2_candidates(
 # S-expressions
 #  e.g. (:n-inputs . 3) or (S (NP (NNS Dogs)) (VP (VBZ bark)))
 
-_Val = Union[str, int, float]
+_Atom = Union[str, int, float]
+_SExpr = Union[_Atom, '_Cons']
+# The following would be nice, but Mypy doesn't do recursive types yet:
+#     https://github.com/python/mypy/issues/731
+# _Cons = Union[Tuple[_SExpr, _SExpr], List[_SExpr]]
+_Cons = Union[Tuple[Any, Any], List[Any]]
 
 
 class SExprResult(NamedTuple):
     """The result of parsing an S-Expression."""
-    data: Union[Tuple[_Val, _Val], List[_Val]]
+    data: _Cons
     remainder: str
 
 

tests/util_test.py

@@ -1,8 +1,11 @@
 # coding: utf-8
 
+import codecs
+
 from delphin.util import safe_int, SExpr, detect_encoding, LookaheadIterator
 
-import pytest, codecs
+import pytest
+
 
 def test_safe_int():
     assert safe_int('1') == 1
@@ -58,6 +61,7 @@ def test_SExpr_format():
 #     assert unescape_string('\\xe3\\x81\\x82') == 'あ'
 #     assert unescape_string('\\N{HIRAGANA LETTER A}') == 'あ'
 
+
 @pytest.fixture
 def empty_file(tmp_path):
     f = tmp_path / 'empty.txt'
@@ -116,7 +120,7 @@ def shiftjis_file(tmp_path):
 def eucjp_file(tmp_path):
     f = tmp_path / 'eucjp.txt'
     f.write_text(u'; coding: euc_jp\n'
-                 u'a=\"あ\"', encoding = 'euc_jp')
+                 u'a=\"あ\"', encoding='euc_jp')
     return str(f)
 
 
@@ -142,9 +146,11 @@ def invalid3_file(tmp_path):
     return str(f)
 
 
-def test_detect_encoding(empty_file, nocomment_file, utf8_file, utf8var1_file,
+def test_detect_encoding(
+    empty_file, nocomment_file, utf8_file, utf8var1_file,
     utf8var2_file, shiftjis_file, eucjp_file, latin1_file, invalid1_file,
-    invalid2_file, invalid3_file):
+    invalid2_file, invalid3_file
+):
     assert detect_encoding(empty_file) == 'utf-8'
     assert detect_encoding(nocomment_file) == 'utf-8'
     assert detect_encoding(utf8_file) == 'utf-8'