typing: Make things stricter (3/4)

Check untyped functions.

Signed-off-by: Stephen Finucane <stephen@that.guru>

Author: stephenfin

git_pw/api.py

@@ -234,7 +234,7 @@ def version() -> tuple[int, int]:
     return (1, 0)
 
 
-def get(url: str, params: Filters | None) -> dict[str, Any]:
+def get(url: str, params: Filters | None = None) -> dict[str, Any]:
     """Get a JSON document from the API and return it as a dict."""
     return _get(url, params, stream=False).json()
 

git_pw/bundle.py

@@ -172,13 +172,13 @@ def list_cmd(owners, limit, page, sort, fmt, headers, name):
 
     # Format and print output
 
-    output = []
+    output: list[Any] = []
 
     for bundle in bundles:
         item = [
             bundle.get('id'),
             utils.trim(bundle.get('name') or ''),
-            bundle.get('owner').get('username'),
+            (bundle.get('owner') or {}).get('username'),
             'yes' if bundle.get('public') else 'no',
         ]
 

git_pw/config.py

@@ -25,20 +25,20 @@ def parse_boolean(value: str) -> bool:
 
 
 class Config:
+    debug: bool
+    token: str | None
+    username: str | None
+    password: str | None
+    server: str | None
+    project: str | None
+    applyPatchDeps: str
+    states: str
+
     def __init__(self) -> None:
         self._git_config: dict[str, str] = {}
 
-    def __getattribute__(self, name: str) -> str:
-        # attempt to use any attributes first
-        try:
-            value = super().__getattribute__(name)
-        except AttributeError:
-            value = None
-        if value:
-            LOG.debug(f"Retrieved '{name}' setting from cache")
-            return value
-
-        # fallback to reading from git config otherwise
+    def __getattr__(self, name: str) -> str:
+        # fallback to reading from git config
         value = utils.git_config(f'pw.{name}')
         if value:
             LOG.debug(f"Retrieved '{name}' setting from git-config")

git_pw/patch.py

@@ -5,6 +5,7 @@
 import logging
 import os
 import sys
+from typing import Any
 
 import arrow
 import click
@@ -90,9 +91,13 @@ def apply_cmd(patch_id, series, deps, args):
     elif not deps:
         series = None
 
-    mbox = api.download(patch['mbox'], {'series': series})
+    mbox = api.download(
+        patch['mbox'],
+        [('series', str(series))] if series is not None else None,
+    )
 
-    utils.git_am(mbox, args)
+    if mbox:
+        utils.git_am(mbox, args)
 
 
 @click.command(name='download')
@@ -415,16 +420,16 @@ def list_cmd(
 
     # Format and print output
 
-    output = []
+    output: list[Any] = []
 
     for patch in patches:
         item = [
             patch.get('id'),
-            arrow.get(patch.get('date')).humanize(),
-            utils.trim(patch.get('name')),
+            arrow.get(patch['date']).humanize(),
+            utils.trim(patch.get('name') or ''),
             '{} ({})'.format(
-                patch.get('submitter').get('name'),
-                patch.get('submitter').get('email'),
+                (patch.get('submitter') or {}).get('name'),
+                (patch.get('submitter') or {}).get('email'),
             ),
             patch.get('state'),
             'yes' if patch.get('archived') else 'no',

git_pw/series.py

@@ -3,14 +3,15 @@
 """
 
 import logging
+import os.path
+import sys
+from typing import Any
 
 import arrow
 import click
 
 from git_pw import api
 from git_pw import utils
-import os.path
-import sys
 
 LOG = logging.getLogger(__name__)
 
@@ -44,7 +45,7 @@ def apply_cmd(series_id, args, deps):
     series = api.detail('series', series_id)
 
     # .mbox files are applied in the order they appear in this list.
-    to_apply = []
+    to_apply: list[Any] = []
 
     if deps:
         if dependencies := series.get('dependencies'):
@@ -66,7 +67,8 @@ def apply_cmd(series_id, args, deps):
 
     for mbox_url in to_apply:
         mbox = api.download(mbox_url)
-        utils.git_am(mbox, args)
+        if mbox:
+            utils.git_am(mbox, args)
 
 
 @click.command(name='download')
@@ -109,7 +111,7 @@ def download_cmd(series_id, output, fmt):
             )
             sys.exit(1)
 
-        for patch in series.get('patches'):
+        for patch in series.get('patches') or []:
             path = api.download(patch['mbox'], output=output)
             if path:
                 LOG.info(
@@ -149,15 +151,15 @@ def _format_submission(submission):
         (
             'Submitter',
             '{} ({})'.format(
-                series.get('submitter').get('name'),
-                series.get('submitter').get('email'),
+                (series.get('submitter') or {}).get('name'),
+                (series.get('submitter') or {}).get('email'),
             ),
         ),
-        ('Project', series.get('project').get('name')),
+        ('Project', (series.get('project') or {}).get('name')),
         ('Version', series.get('version')),
         (
             'Received',
-            '%d of %d' % (series.get('received_total'), series.get('total')),
+            '%d of %d' % (series['received_total'], series['total']),
         ),
         ('Complete', series.get('received_all')),
         (
@@ -171,7 +173,7 @@ def _format_submission(submission):
     ]
 
     prefix = 'Patches'
-    for patch in series.get('patches'):
+    for patch in series.get('patches') or []:
         output.append((prefix, _format_submission(patch)))
         prefix = ''
 
@@ -239,17 +241,17 @@ def list_cmd(submitters, limit, page, sort, fmt, headers, name, since, before):
 
     # Format and print output
 
-    output = []
+    output: list[Any] = []
 
     for series_ in series:
         item = [
             series_.get('id'),
-            arrow.get(series_.get('date')).humanize(),
+            arrow.get(series_['date']).humanize(),
             utils.trim(series_.get('name') or ''),
             series_.get('version'),
             '{} ({})'.format(
-                series_.get('submitter').get('name'),
-                series_.get('submitter').get('email'),
+                (series_.get('submitter') or {}).get('name'),
+                (series_.get('submitter') or {}).get('email'),
             ),
         ]
 

pyproject.toml

@@ -65,7 +65,7 @@ show_column_numbers = true
 show_error_context = true
 ignore_missing_imports = false
 follow_imports = "normal"
-check_untyped_defs = false
+check_untyped_defs = true
 warn_unused_ignores = true
 # many of the following are false while we incrementally add typing
 warn_return_any = false

tests/test_patch.py

@@ -24,7 +24,7 @@ def test_apply(self, mock_git_am, mock_download, mock_detail):
 
         assert result.exit_code == 0, result
         mock_detail.assert_called_once_with('patches', 123)
-        mock_download.assert_called_once_with(rsp['mbox'], {'series': '*'})
+        mock_download.assert_called_once_with(rsp['mbox'], [('series', '*')])
         mock_git_am.assert_called_once_with(mock_download.return_value, ())
 
     def test_apply_with_series(self, mock_git_am, mock_download, mock_detail):
@@ -39,7 +39,7 @@ def test_apply_with_series(self, mock_git_am, mock_download, mock_detail):
 
         assert result.exit_code == 0, result
         mock_detail.assert_called_once_with('patches', 123)
-        mock_download.assert_called_once_with(rsp['mbox'], {'series': 3})
+        mock_download.assert_called_once_with(rsp['mbox'], [('series', '3')])
         mock_git_am.assert_called_once_with(mock_download.return_value, ())
 
     def test_apply_without_deps(self, mock_git_am, mock_download, mock_detail):
@@ -54,7 +54,7 @@ def test_apply_without_deps(self, mock_git_am, mock_download, mock_detail):
 
         assert result.exit_code == 0, result
         mock_detail.assert_called_once_with('patches', 123)
-        mock_download.assert_called_once_with(rsp['mbox'], {'series': None})
+        mock_download.assert_called_once_with(rsp['mbox'], None)
         mock_git_am.assert_called_once_with(mock_download.return_value, ())
 
     def test_apply_with_args(self, mock_git_am, mock_download, mock_detail):
@@ -69,7 +69,7 @@ def test_apply_with_args(self, mock_git_am, mock_download, mock_detail):
 
         assert result.exit_code == 0, result
         mock_detail.assert_called_once_with('patches', 123)
-        mock_download.assert_called_once_with(rsp['mbox'], {'series': '*'})
+        mock_download.assert_called_once_with(rsp['mbox'], [('series', '*')])
         mock_git_am.assert_called_once_with(
             mock_download.return_value, ('-3',)
         )