Fix ty type-checking errors

Fix all errors reported by ty across the codebase.

Author: Lotram

bugwarrior/collect.py

@@ -64,12 +64,12 @@ def _aggregate_issues(service: "Service", queue: multiprocessing.Queue):
         log.critical(f"Worker for [{target}] exited: {e}")
         queue.put((SERVICE_FINISHED_ERROR, target))
     except BaseException as e:
-        if hasattr(e, 'request') and e.request:
+        if (request := getattr(e, 'request', None)) is not None:
             # Exceptions raised by requests library have the HTTP request
             # object stored as attribute. The request can have hooks attached
             # to it, and we need to remove them, as there can be unpickleable
             # methods. There is no one left to call these hooks anyway.
-            e.request.hooks = {}
+            request.hooks = {}
         log.exception(f"Worker for [{target}] failed: {e}")
         queue.put((SERVICE_FINISHED_ERROR, target))
     else:

bugwarrior/command.py

@@ -38,11 +38,10 @@ def _try_load_config(
         # configuration file which just failed to load.
         logging.basicConfig()
 
-        exc_info = sys.exc_info()
         log.critical(
             "Could not load configuration. "
             "Maybe you have not created a configuration file.",
-            exc_info=(exc_info[0], exc_info[1], None),
+            exc_info=True,
         )
         sys.exit(1)
 
@@ -75,8 +74,8 @@ class AliasedCli(click.Group):
     def list_commands(self, ctx):
         return ctx.command.commands.keys()
 
-    def get_command(self, ctx, name):
-        return ctx.command.commands[name]
+    def get_command(self, ctx, cmd_name):
+        return ctx.command.commands[cmd_name]
 
 
 @click.command(cls=AliasedCli)

bugwarrior/config/ini2toml_plugin.py

@@ -131,6 +131,6 @@ def unquote_flavors(file_contents: str) -> str:
 
 def activate(translator: Translator):
     profile = translator["bugwarriorrc"]
-    profile.description = "Convert 'bugwarriorrc' files to 'bugwarrior.toml'"
+    profile.help_text = "Convert 'bugwarriorrc' files to 'bugwarrior.toml'"
     profile.intermediate_processors.append(process_values)
     profile.post_processors.append(unquote_flavors)

bugwarrior/config/load.py

@@ -2,12 +2,13 @@
 import logging
 import os
 from pathlib import Path
+import sys
 from typing import Any
 
-try:
-    import tomllib  # python>=3.11
-except ImportError:
-    import tomli as tomllib  # backport
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib  # type: ignore[unresolved-import]
 
 from .validation import Config, validate_config
 
@@ -28,7 +29,7 @@ def configure_logging(logfile, loglevel):
         'requests.packages.urllib3.connectionpool',
     ]
     for spammer in spammers:
-        logging.getLogger(spammer).setLevel(logging.WARN)
+        logging.getLogger(spammer).setLevel(logging.WARNING)
 
 
 def get_config_path():
@@ -134,10 +135,10 @@ def __init__(self, *args, allow_no_value=True, **kwargs):
             *args, allow_no_value=allow_no_value, interpolation=None, **kwargs
         )
 
-    def getint(self, section, option):
+    def getint(self, section, option, **kwargs):
         """Accepts both integers and empty values."""
         try:
-            return super().getint(section, option)
+            return super().getint(section, option, **kwargs)
         except ValueError:
             if self.get(section, option) == '':
                 return None
@@ -148,7 +149,6 @@ def getint(self, section, option):
                     )
                 )
 
-    @staticmethod
-    def optionxform(option):
+    def optionxform(self, optionstr):
         """Do not lowercase key names."""
-        return option
+        return optionstr

bugwarrior/config/schema.py

@@ -3,7 +3,7 @@
 from pathlib import Path
 import re
 import typing
-from typing import Annotated, Any, Generic, Literal
+from typing import Annotated, Literal
 
 import pydantic
 from pydantic import (
@@ -19,6 +19,7 @@
 )
 from pydantic_core import PydanticCustomError
 import taskw
+import taskw.task
 
 from .data import BugwarriorData, get_data_path
 
@@ -120,9 +121,7 @@ def _validate_unsupported(value: T) -> T:
     return value
 
 
-class UnsupportedOption(Generic[T]):
-    def __class_getitem__(cls, item: type) -> Any:
-        return Annotated[item, AfterValidator(_validate_unsupported)]
+UnsupportedOption = Annotated[T, AfterValidator(_validate_unsupported)]
 
 
 class BaseConfig(pydantic.BaseModel):
@@ -181,7 +180,7 @@ class Notifications(BaseConfig):
 
 
 # Dynamically add template fields to model.
-_ServiceConfig = pydantic.create_model(
+_ServiceConfig = pydantic.create_model(  # type: ignore[no-matching-overload]
     "_ServiceConfig",
     __base__=BaseConfig,
     **{

bugwarrior/config/secrets.py

@@ -76,6 +76,8 @@ def oracle_eval(command):
         command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
     )
     p.wait()
+    assert p.stdout is not None
+    assert p.stderr is not None
     if p.returncode == 0:
         return p.stdout.readline().strip().decode('utf-8')
     else:

bugwarrior/db.py

@@ -302,7 +302,7 @@ def synchronize(issue_generator, conf: "Config", dry_run: bool = False):
                 try:
                     issue[key] = issue[key].decode('utf-8')
                 except UnicodeDecodeError:
-                    log.warn("Failed to interpret %r as utf-8" % key)
+                    log.warning("Failed to interpret %r as utf-8" % key)
 
         # Blank priority should mean *no* priority
         if issue['priority'] == '':

bugwarrior/docs/_ext/config.py

@@ -11,8 +11,8 @@ class Config(SphinxDirective):
 
     def _make_tab(self, lang: str):
         self.arguments = [lang]
-        tab = TabDirective.run(self)[0]
-        tab[1][0] = CodeBlock.run(self)[0]
+        tab = TabDirective.run(self)[0]  # type: ignore[arg-type]
+        tab[1][0] = CodeBlock.run(self)[0]  # type: ignore[arg-type]
         # While line breaks were previously separate elements, they're now
         # within the single CodeBlock element.
         del tab[1][1:]

bugwarrior/docs/_ext/extras.py

@@ -1,12 +1,13 @@
 import pathlib
+import sys
 
 from docutils import nodes
 from sphinx.util.docutils import SphinxDirective
 
-try:
-    import tomllib  # python>=3.11
-except ImportError:
-    import tomli as tomllib  # backport
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib  # type: ignore[unresolved-import]
 
 
 class Extras(SphinxDirective):

bugwarrior/docs/generate_service_template.py

@@ -1,4 +1,4 @@
-from functools import reduce
+from functools import cmp_to_key, reduce
 import inspect
 import os
 import sys
@@ -83,7 +83,7 @@ def row_comparator(left_row, right_row):
                     ]
                 )
 
-    rows = sorted(rows, cmp=row_comparator)
+    rows = sorted(rows, key=cmp_to_key(row_comparator))
     rows.insert(0, ['Field Name', 'Description', 'Type'])
 
     filename = os.path.join(os.path.dirname(__file__), 'service_template.html')