chore: clean up after pyupgrade

src/scriv/config.py

@@ -6,7 +6,7 @@
 import pkgutil
 import re
 from pathlib import Path
-from typing import Any, List
+from typing import Any
 
 import attr
 

src/scriv/format.py

@@ -1,7 +1,7 @@
 """Dispatcher for format-based knowledge."""
 
 import abc
-from typing import Dict, List, Optional
+from typing import Optional
 
 from .config import Config
 

src/scriv/github.py

@@ -2,8 +2,8 @@
 
 import logging
 import os
-from typing import Any, Dict
 from collections.abc import Iterable
+from typing import Any
 
 import requests
 

src/scriv/gitinfo.py

@@ -6,7 +6,6 @@
 import subprocess
 import sys
 from pathlib import Path
-from typing import Set
 
 import click
 

src/scriv/literals.py

@@ -5,8 +5,8 @@
 import ast
 import configparser
 import os.path
-from typing import Any, Optional
 from collections.abc import MutableMapping
+from typing import Any, Optional
 
 from .exceptions import ScrivException
 from .optional import tomllib, yaml

src/scriv/scriv.py

@@ -6,8 +6,8 @@
 import re
 import textwrap
 from pathlib import Path
-from typing import List, Optional
 from collections.abc import Iterable
+from typing import Optional
 
 import jinja2
 

src/scriv/shell.py

@@ -3,7 +3,7 @@
 import logging
 import shlex
 import subprocess
-from typing import List, Tuple, Union
+from typing import Union
 
 # The return value of run_command.
 CmdResult = tuple[bool, str]

src/scriv/util.py

@@ -7,8 +7,8 @@
 import logging
 import re
 import sys
-from typing import Dict, Optional, Tuple, TypeVar
 from collections.abc import Sequence
+from typing import TypeVar
 
 import click_log
 

tests/conftest.py

@@ -3,8 +3,8 @@
 import os
 import sys
 import traceback
-from pathlib import Path
 from collections.abc import Iterable
+from pathlib import Path
 
 import pytest
 import responses

tests/faker.py

@@ -1,8 +1,8 @@
 """Fake implementations of some of our external information sources."""
 
 import shlex
-from typing import Callable, Dict, List, Optional, Set, Tuple
 from collections.abc import Iterable
+from typing import Callable, Optional
 
 from scriv.shell import CmdResult
 

tests/test_create.py

@@ -226,7 +226,7 @@ class TestCreateAdd:
     Tests of auto-adding created fragments.
     """
 
-    def test_create_add(
+    def test_create_add(  # pylint: disable=too-many-positional-arguments
         self, caplog, mocker, fake_git, cli_invoke, changelog_d
     ):
         # "scriv create --add" will invoke "git add" on the file.
@@ -261,7 +261,7 @@ def test_create_add_preference(
         )
         mock_call.assert_called_once_with(["git", "add", file_path])
 
-    def test_create_add_preference_no_add(
+    def test_create_add_preference_no_add(  # pylint: disable=too-many-positional-arguments
         self, caplog, mocker, fake_git, cli_invoke, changelog_d
     ):
         # The user can set a git configuration to default to --add, but --no-add
@@ -274,7 +274,7 @@ def test_create_add_preference_no_add(
         mock_call.assert_not_called()
         assert "Added" not in caplog.text
 
-    def test_create_add_fail(
+    def test_create_add_fail(  # pylint: disable=too-many-positional-arguments
         self, caplog, mocker, fake_git, cli_invoke, changelog_d
     ):
         # We properly handle failure to add.

tests/test_ghrel.py

@@ -2,7 +2,7 @@
 
 import json
 import logging
-from typing import Any, Dict
+from typing import Any
 from unittest.mock import call
 
 import pytest