Enable pyupgrade (U) checks

Author: stephenfin

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # git-pw documentation build configuration file
 

git_pw/api.py

@@ -19,7 +19,7 @@
 CONF = config.CONF
 LOG = logging.getLogger(__name__)
 
-Filters = ty.List[ty.Tuple[str, str]]
+Filters = list[tuple[str, str]]
 
 
 class HTTPTokenAuth(requests.auth.AuthBase):
@@ -38,10 +38,10 @@ def __call__(
     @staticmethod
     def _token_auth_str(token: str) -> str:
         """Return a Token auth string."""
-        return 'Token {}'.format(token.strip())
+        return f'Token {token.strip()}'
 
 
-def _get_auth(optional: bool = False) -> ty.Optional[requests.auth.AuthBase]:
+def _get_auth(optional: bool = False) -> requests.auth.AuthBase | None:
     if CONF.token:
         return HTTPTokenAuth(CONF.token)
     elif CONF.username and CONF.password:
@@ -56,9 +56,9 @@ def _get_auth(optional: bool = False) -> ty.Optional[requests.auth.AuthBase]:
     return None
 
 
-def _get_headers() -> ty.Dict[str, str]:
+def _get_headers() -> dict[str, str]:
     return {
-        'User-Agent': 'git-pw ({})'.format(git_pw.__version__),
+        'User-Agent': f'git-pw ({git_pw.__version__})',
     }
 
 
@@ -123,7 +123,7 @@ def _handle_error(
 
     else:
         LOG.error(
-            'Failed to %s resource. Is your configuration correct?' % operation
+            f'Failed to {operation} resource. Is your configuration correct?'
         )
         LOG.error("Use the '--debug' flag for more information")
 
@@ -135,7 +135,7 @@ def _handle_error(
 
 def _get(
     url: str,
-    params: ty.Optional[Filters] = None,
+    params: Filters | None = None,
     stream: bool = False,
 ) -> requests.Response:
     """Make GET request and handle errors."""
@@ -163,7 +163,7 @@ def _get(
 
 def _post(
     url: str,
-    data: ty.List[ty.Tuple[str, ty.Any]],
+    data: list[tuple[str, ty.Any]],
 ) -> requests.Response:
     """Make POST request and handle errors."""
     LOG.debug('POST %s, data=%r', url, data)
@@ -183,7 +183,7 @@ def _post(
 
 def _patch(
     url: str,
-    data: ty.List[ty.Tuple[str, ty.Any]],
+    data: list[tuple[str, ty.Any]],
 ) -> requests.Response:
     """Make PATCH request and handle errors."""
     LOG.debug('PATCH %s, data=%r', url, data)
@@ -219,7 +219,7 @@ def _delete(url: str) -> requests.Response:
     return rsp
 
 
-def version() -> ty.Tuple[int, int]:
+def version() -> tuple[int, int]:
     """Get the version of the server from the URL, if present."""
     server = _get_server()
 
@@ -231,16 +231,16 @@ def version() -> ty.Tuple[int, int]:
     return (1, 0)
 
 
-def get(url: str, params: ty.Optional[Filters]) -> ty.Dict:
+def get(url: str, params: Filters | None) -> dict:
     """Get a JSON document from the API and return it as a dict."""
     return _get(url, params, stream=False).json()
 
 
 def download(
     url: str,
-    params: ty.Optional[Filters] = None,
-    output: ty.Optional[ty.Optional[str]] = None,
-) -> ty.Optional[str]:
+    params: Filters | None = None,
+    output: str | None = None,
+) -> str | None:
     """Retrieve a specific API resource and save it to a file/stdout.
 
     The ``Content-Disposition`` header is assumed to be present and
@@ -295,7 +295,7 @@ def download(
     return output_path
 
 
-def index(resource_type: str, params: ty.Optional[Filters] = None) -> dict:
+def index(resource_type: str, params: Filters | None = None) -> dict:
     """List API resources.
 
     GET /{resource}/
@@ -323,9 +323,9 @@ def index(resource_type: str, params: ty.Optional[Filters] = None) -> dict:
 
 def detail(
     resource_type: str,
-    resource_id: ty.Union[str, int],
-    params: ty.Optional[Filters] = None,
-) -> ty.Dict:
+    resource_id: str | int,
+    params: Filters | None = None,
+) -> dict:
     """Retrieve a specific API resource.
 
     GET /{resource}/{resourceID}/
@@ -346,7 +346,7 @@ def detail(
 
 def create(
     resource_type: str,
-    data: ty.List[ty.Tuple[str, ty.Any]],
+    data: list[tuple[str, ty.Any]],
 ) -> dict:
     """Create a new API resource.
 
@@ -365,7 +365,7 @@ def create(
     return _post(url, data).json()
 
 
-def delete(resource_type: str, resource_id: ty.Union[str, int]) -> None:
+def delete(resource_type: str, resource_id: str | int) -> None:
     """Delete a specific API resource.
 
     DELETE /{resource}/{resourceID}/
@@ -385,8 +385,8 @@ def delete(resource_type: str, resource_id: ty.Union[str, int]) -> None:
 
 def update(
     resource_type: str,
-    resource_id: ty.Union[str, int],
-    data: ty.List[ty.Tuple[str, ty.Any]],
+    resource_id: str | int,
+    data: list[tuple[str, ty.Any]],
 ) -> dict:
     """Update a specific API resource.
 
@@ -407,7 +407,7 @@ def update(
 
 
 def validate_minimum_version(
-    min_version: ty.Tuple[int, int],
+    min_version: tuple[int, int],
     msg: str,
 ) -> ty.Callable[[ty.Any], ty.Any]:
     def inner(f):
@@ -458,7 +458,7 @@ def retrieve_filter_ids(
     resource_type: str,
     filter_name: str,
     filter_value: str,
-) -> ty.List[ty.Tuple[str, str]]:
+) -> list[tuple[str, str]]:
     """Retrieve IDs for items passed through by filter.
 
     Some filters require client-side filtering, e.g. filtering patches by

git_pw/bundle.py

@@ -4,7 +4,6 @@
 
 import logging
 import sys
-import typing as ty
 
 import click
 
@@ -46,7 +45,7 @@ def _get_bundle(bundle_id: str) -> dict:
 )
 @click.argument('bundle_id')
 @click.argument('args', nargs=-1, type=click.UNPROCESSED)
-def apply_cmd(bundle_id: str, args: ty.Tuple[str]) -> None:
+def apply_cmd(bundle_id: str, args: tuple[str]) -> None:
     """Apply bundle.
 
     Apply a bundle locally using the 'git-am' command. Any additional ARGS
@@ -68,7 +67,7 @@ def apply_cmd(bundle_id: str, args: ty.Tuple[str]) -> None:
     type=click.Path(file_okay=True, writable=True, readable=True),
     required=False,
 )
-def download_cmd(bundle_id: str, output: ty.Optional[str]) -> None:
+def download_cmd(bundle_id: str, output: str | None) -> None:
     """Download bundle in mbox format.
 
     Download a bundle but do not apply it. ``OUTPUT`` is optional and can be an
@@ -210,7 +209,7 @@ def list_cmd(owners, limit, page, sort, fmt, headers, name):
 @utils.format_options
 def create_cmd(
     name: str,
-    patch_ids: ty.Tuple[int],
+    patch_ids: tuple[int],
     public: bool,
     fmt: str,
 ) -> None:
@@ -264,7 +263,7 @@ def create_cmd(
 def update_cmd(
     bundle_id: str,
     name: str,
-    patch_ids: ty.List[int],
+    patch_ids: list[int],
     public: bool,
     fmt: str,
 ) -> None:
@@ -327,7 +326,7 @@ def delete_cmd(bundle_id: str, fmt: str) -> None:
     'Modifying bundles is only supported from API version 1.2',
 )
 @utils.format_options
-def add_cmd(bundle_id: str, patch_ids: ty.Tuple[int], fmt: str) -> None:
+def add_cmd(bundle_id: str, patch_ids: tuple[int], fmt: str) -> None:
     """Add one or more patches to a bundle.
 
     Append the provided PATCH_IDS to bundle BUNDLE_ID.
@@ -357,7 +356,7 @@ def add_cmd(bundle_id: str, patch_ids: ty.Tuple[int], fmt: str) -> None:
 @utils.format_options
 def remove_cmd(
     bundle_id: str,
-    patch_ids: ty.Tuple[int],
+    patch_ids: tuple[int],
     fmt: str,
 ) -> None:
     """Remove one or more patches from a bundle.

git_pw/config.py

@@ -3,7 +3,6 @@
 """
 
 import logging
-import typing as ty
 
 from git_pw import utils
 
@@ -21,28 +20,28 @@ def parse_boolean(value: str) -> bool:
     if value in ('no', 'off', 'false', '0'):
         return False
 
-    LOG.error("'{}' is not a valid boolean value".format(value))
+    LOG.error(f"'{value}' is not a valid boolean value")
     return False
 
 
-class Config(object):
+class Config:
     def __init__(self) -> None:
-        self._git_config: ty.Dict[str, str] = {}
+        self._git_config: dict[str, str] = {}
 
     def __getattribute__(self, name: str) -> str:
         # attempt to use any attributes first
         try:
-            value = super(Config, self).__getattribute__(name)
+            value = super().__getattribute__(name)
         except AttributeError:
             value = None
         if value:
-            LOG.debug("Retrieved '{}' setting from cache".format(name))
+            LOG.debug(f"Retrieved '{name}' setting from cache")
             return value
 
         # fallback to reading from git config otherwise
-        value = utils.git_config('pw.{}'.format(name))
+        value = utils.git_config(f'pw.{name}')
         if value:
-            LOG.debug("Retrieved '{}' setting from git-config".format(name))
+            LOG.debug(f"Retrieved '{name}' setting from git-config")
 
         setattr(self, name, value)
 

git_pw/patch.py

@@ -161,8 +161,7 @@ def _format_series(series):
         ('URL', patch.get('web_url')),
         (
             'Submitter',
-            '%s (%s)'
-            % (
+            '{} ({})'.format(
                 patch.get('submitter').get('name'),
                 patch.get('submitter').get('email'),
             ),
@@ -423,8 +422,7 @@ def list_cmd(
             patch.get('id'),
             arrow.get(patch.get('date')).humanize(),
             utils.trim(patch.get('name')),
-            '%s (%s)'
-            % (
+            '{} ({})'.format(
                 patch.get('submitter').get('name'),
                 patch.get('submitter').get('email'),
             ),

git_pw/series.py

@@ -148,8 +148,7 @@ def _format_submission(submission):
         ('URL', series.get('web_url')),
         (
             'Submitter',
-            '%s (%s)'
-            % (
+            '{} ({})'.format(
                 series.get('submitter').get('name'),
                 series.get('submitter').get('email'),
             ),
@@ -248,8 +247,7 @@ def list_cmd(submitters, limit, page, sort, fmt, headers, name, since, before):
             arrow.get(series_.get('date')).humanize(),
             utils.trim(series_.get('name') or ''),
             series_.get('version'),
-            '%s (%s)'
-            % (
+            '{} ({})'.format(
                 series_.get('submitter').get('name'),
                 series_.get('submitter').get('email'),
             ),

git_pw/utils.py

@@ -52,7 +52,7 @@ def git_config(value: str) -> str:
     return output.decode('utf-8').strip()
 
 
-def git_am(mbox: str, args: ty.Tuple[str, ...]) -> None:
+def git_am(mbox: str, args: tuple[str, ...]) -> None:
     """Execute git-am on a given mbox file."""
     cmd = ['git', 'am']
     if args:
@@ -74,8 +74,8 @@ def git_am(mbox: str, args: ty.Tuple[str, ...]) -> None:
 
 
 def _tabulate(
-    output: ty.List[ty.Tuple[str, ty.Any]],
-    headers: ty.List[str],
+    output: list[tuple[str, ty.Any]],
+    headers: list[str],
     fmt: str,
 ) -> str:
     fmt = fmt or git_config('pw.format') or 'table'
@@ -115,7 +115,7 @@ def _echo_via_pager(pager: str, output: str) -> None:
 
     try:
         proc.communicate(input=output.encode('utf-8', 'strict'))
-    except (IOError, KeyboardInterrupt):
+    except (OSError, KeyboardInterrupt):
         pass
     else:
         if proc.stdin:
@@ -131,8 +131,8 @@ def _echo_via_pager(pager: str, output: str) -> None:
 
 
 def echo_via_pager(
-    output: ty.List[ty.Tuple[str, ty.Any]],
-    headers: ty.List[str],
+    output: list[tuple[str, ty.Any]],
+    headers: list[str],
     fmt: str,
 ) -> None:
     """Echo using git's default pager.
@@ -165,15 +165,15 @@ def echo_via_pager(
 
 
 def echo(
-    output: ty.List[ty.Tuple[str, ty.Any]],
-    headers: ty.List[str],
+    output: list[tuple[str, ty.Any]],
+    headers: list[str],
     fmt: str,
 ) -> None:
     click.echo(_tabulate(output, headers, fmt))
 
 
 def pagination_options(
-    sort_fields: ty.Tuple[str, ...],
+    sort_fields: tuple[str, ...],
     default_sort: str,
 ) -> ty.Callable:
     """Shared pagination options."""
@@ -230,8 +230,8 @@ def _date_options(f):
 
 
 def format_options(
-    original_function: ty.Optional[ty.Callable] = None,
-    headers: ty.Optional[ty.Tuple[str, ...]] = None,
+    original_function: ty.Callable | None = None,
+    headers: tuple[str, ...] | None = None,
 ) -> ty.Callable:
     """Shared output format options."""