Addressed some typing and linter complaints

Author: sveinbjornt

db/models.py

@@ -39,7 +39,7 @@
     Float,
     Sequence,
     Boolean,
-    DateTime,  # type: ignore # Imported for re-export
+    DateTime,  # type: ignore # noqa: F401 # Imported for re-export
     UniqueConstraint,
     Index,
     ForeignKey,

main.py

@@ -63,7 +63,7 @@
     QUERIES_UTIL_GRAMMAR_DIR,
 )
 
-from reynir.version import __version__ as greynir_version
+from reynir import __version__ as greynir_version
 from tokenizer import __version__ as tokenizer_version
 
 
@@ -101,7 +101,7 @@
 app.config["CACHE"] = Cache(app, config={"CACHE_TYPE": cache_type})
 
 # Register blueprint routes
-from routes import routes, max_age  # type: ignore
+from routes import routes, max_age  # type: ignore  # noqa: E402
 
 app.register_blueprint(routes)
 
@@ -288,8 +288,7 @@ def inject_nn_bools() -> Dict[str, Union[str, bool]]:
     except socket_error as e:
         if e.errno == errno.EADDRINUSE:  # Address already in use
             logging.error(
-                f"Another application is already running at"
-                " host {Settings.HOST}:{Settings.PORT}"
+                f"Another application is already running at host {Settings.HOST}:{Settings.PORT}"
             )
             sys.exit(1)
         else:

queries/builtin.py

@@ -26,8 +26,7 @@
 
 """
 
-from typing import Callable, Dict, Iterable, Optional, List, Any, Tuple, cast
-from typing_extensions import TypedDict
+from typing import Callable, Dict, Iterable, Optional, List, Any, Tuple, cast, TypedDict
 
 import math
 from datetime import datetime, timezone

queries/flights.py

@@ -26,8 +26,7 @@
 # TODO: Map country to capital city, e.g. "Svíþjóð" -> "Stokkhólmur"
 # TODO: Fetch more than one flight using "flight_count"?
 
-from typing import Any, List, Dict, Optional, cast
-from typing_extensions import TypedDict
+from typing import Any, List, Dict, Optional, cast, TypedDict
 
 import re
 import random

queries/schedules.py

@@ -27,8 +27,7 @@
 # TODO: Channels provided by Síminn
 # TODO: "Rás tveir" vandamál, ætti að vera "Rás tvö"
 
-from typing import List, Dict, Optional, Tuple, Any, cast
-from typing_extensions import TypedDict
+from typing import List, Dict, Optional, Tuple, Any, cast, TypedDict
 from queries import Query, QueryStateDict
 from tree import Node, TerminalNode, ParamList, Result
 

routes/loc.py

@@ -21,8 +21,7 @@
 
 """
 
-from typing import Dict, Iterable, List, NamedTuple, Optional, Tuple, Union, cast
-from typing_extensions import TypedDict
+from typing import Dict, Iterable, List, NamedTuple, Optional, Tuple, Union, cast, TypedDict
 
 from . import routes, better_jsonify, cache, days_from_period_arg
 
@@ -269,7 +268,7 @@ def staticmap():
         lat = float(request.args.get("lat", "0.0"))
         lon = float(request.args.get("lon", "0.0"))
         zoom = int(request.args.get("z", "7"))
-    except:
+    except Exception:
         return abort(400)
 
     imgdata = get_staticmap_image(lat, lon, zoom=zoom)

search.py

@@ -26,8 +26,7 @@
 
 """
 
-from typing import Iterable, Iterator, Optional, List, Tuple
-from typing_extensions import TypedDict
+from typing import Iterable, Iterator, Optional, List, Tuple, TypedDict
 
 from datetime import datetime, timedelta
 

tnttagger.py

@@ -434,7 +434,7 @@ def tag(self, sentence: List[str]) -> List[Tuple[str, str]]:
         _C = self._C
 
         current_state: StateList = [(0.0, [("BOS", False), ("BOS", False)])]
-        keyfunc: Callable[[Any], float] = lambda x: x[0]
+        keyfunc: Callable[[Any], float] = lambda x: x[0]  # noqa: E731
 
         for index, word in enumerate(sent):