treewide: apply fixes from ruff check

mweinelt · mweinelt · commit 9ee428dcccf1 · 2025-06-08T16:21:52.000+02:00
diff --git a/test/fuzz_fusil_2/runner.py b/test/fuzz_fusil_2/runner.py
@@ -8,7 +8,6 @@
 '''
 import os.path
 import random
-import sys
 
 from fusil.application import Application
 from fusil.process.create import ProjectProcess
diff --git a/wpull/application/app_test.py b/wpull/application/app_test.py
@@ -1,4 +1,3 @@
-import asyncio
 
 from typing import Optional
 
diff --git a/wpull/application/hook.py b/wpull/application/hook.py
@@ -5,14 +5,12 @@
 '''
 import collections.abc
 import enum
-import functools
 import gettext
 import logging
 
 from typing import Optional
 
 from wpull.application.plugin import WpullPlugin, PluginFunctionCategory
-from wpull.backport.logging import BraceMessage as __
 
 _ = gettext.gettext
 _logger = logging.getLogger(__name__)
diff --git a/wpull/application/tasks/conversion.py b/wpull/application/tasks/conversion.py
@@ -1,4 +1,3 @@
-import asyncio
 from typing import Optional
 
 from wpull.database.base import NotFound
diff --git a/wpull/application/tasks/database.py b/wpull/application/tasks/database.py
@@ -1,7 +1,6 @@
 import codecs
 import gettext
 import itertools
-import asyncio
 import logging
 import sys
 
diff --git a/wpull/application/tasks/log.py b/wpull/application/tasks/log.py
@@ -1,6 +1,5 @@
 import logging
 
-import asyncio
 
 from wpull.application.options import LOG_VERY_QUIET, LOG_QUIET, LOG_NO_VERBOSE, LOG_VERBOSE, LOG_DEBUG
 from wpull.pipeline.app import AppSession, new_encoded_stream
diff --git a/wpull/application/tasks/network.py b/wpull/application/tasks/network.py
@@ -1,9 +1,7 @@
 import functools
 import gettext
 import logging
-import asyncio
 
-from wpull.backport.logging import BraceMessage as __
 from wpull.network.connection import Connection, SSLConnection
 from wpull.network.dns import IPFamilyPreference
 from wpull.pipeline.pipeline import ItemTask
diff --git a/wpull/application/tasks/plugin.py b/wpull/application/tasks/plugin.py
@@ -1,15 +1,11 @@
-import asyncio
 import gettext
-import inspect
 import logging
 import os
 import re
 from configparser import ConfigParser
 
 from typing import cast
 from yapsy.IPluginLocator import IPluginLocator
-from yapsy.PluginFileLocator import PluginFileAnalyzerMathingRegex, \
-    PluginFileLocator
 from yapsy.PluginInfo import PluginInfo
 from yapsy.PluginManager import PluginManager
 
diff --git a/wpull/application/tasks/rule.py b/wpull/application/tasks/rule.py
@@ -1,7 +1,6 @@
 import gettext
 import logging
 
-import asyncio
 
 from wpull.urlfilter import HTTPSOnlyFilter, SchemeFilter, RecursiveFilter, \
     FollowFTPFilter, SpanHostsFilter, ParentFilter, BackwardDomainFilter, \
diff --git a/wpull/application/tasks/shutdown.py b/wpull/application/tasks/shutdown.py
@@ -1,21 +1,13 @@
-import datetime
 import gettext
 import logging
 
-import asyncio
 
 from wpull.application.app import Application
 from wpull.application.hook import HookableMixin
 from wpull.application.plugin import PluginFunctions, hook_interface
-from wpull.backport.logging import BraceMessage as __
 from wpull.pipeline.pipeline import ItemTask
-import wpull._string
-import wpull.url
-import wpull.util
-import wpull.warc
 from wpull.stats import Statistics
 from wpull.pipeline.app import AppSession
-import wpull.application.hook
 from wpull.application.hook import HookDisconnected
 
 
diff --git a/wpull/application/tasks/sslcontext.py b/wpull/application/tasks/sslcontext.py
@@ -1,6 +1,5 @@
 import gettext
 import logging
-import asyncio
 import os
 import ssl
 import tempfile
diff --git a/wpull/application/tasks/stats.py b/wpull/application/tasks/stats.py
@@ -2,7 +2,6 @@
 import gettext
 import logging
 
-import asyncio
 
 from wpull.application.plugin import PluginFunctions, event_interface
 from wpull.backport.logging import BraceMessage as __
diff --git a/wpull/application/tasks/warc.py b/wpull/application/tasks/warc.py
@@ -1,4 +1,3 @@
-import asyncio
 import gettext
 import json
 import logging
diff --git a/wpull/application/tasks/writer.py b/wpull/application/tasks/writer.py
@@ -1,7 +1,6 @@
 import gettext
 import logging
 
-import asyncio
 
 from wpull.pipeline.pipeline import ItemTask
 from wpull.pipeline.app import AppSession
diff --git a/wpull/conftest.py b/wpull/conftest.py
@@ -1,4 +1,3 @@
-import pytest
 import unittest
 
 def pytest_pycollect_makeitem(collector, name, obj):
diff --git a/wpull/cookie_test.py b/wpull/cookie_test.py
@@ -3,7 +3,6 @@
 from http.cookiejar import CookieJar
 import http.cookiejar
 import os
-import sys
 import tempfile
 import unittest
 import urllib.request
diff --git a/wpull/cookiewrapper_test.py b/wpull/cookiewrapper_test.py
@@ -1,5 +1,4 @@
 # encoding=utf-8
-import sys
 import unittest
 
 from wpull.protocol.http.request import Request, Response
diff --git a/wpull/database/sqltable_test.py b/wpull/database/sqltable_test.py
@@ -1,10 +1,9 @@
 # encoding=utf-8
 
 
-import time
 import unittest
 
-from wpull.database.base import NotFound, AddURLInfo
+from wpull.database.base import AddURLInfo
 from wpull.database.sqltable import SQLiteURLTable
 from wpull.pipeline.item import Status, URLProperties, URLResult
 
diff --git a/wpull/database/wrap.py b/wpull/database/wrap.py
@@ -1,10 +1,9 @@
 '''URL table wrappers.'''
 from wpull.application.plugin import event_interface, PluginFunctions
 from wpull.database.base import BaseURLTable
-from wpull.application.hook import HookableMixin, HookDisconnected
+from wpull.application.hook import HookableMixin
 from wpull.pipeline.item import Status, URLRecord
 from wpull.url import parse_url_or_log, URLInfo
-import wpull.application.hook
 
 
 class URLTableHookWrapper(BaseURLTable, HookableMixin):
diff --git a/wpull/driver/phantomjs.py b/wpull/driver/phantomjs.py
@@ -4,7 +4,6 @@
 import subprocess
 import tempfile
 
-import asyncio
 from dataclasses import dataclass, field
 from typing import List, Tuple, Optional, Dict
 
diff --git a/wpull/driver/phantomjs_test.py b/wpull/driver/phantomjs_test.py
@@ -1,4 +1,3 @@
-import contextlib
 import os
 
 from wpull.driver.phantomjs import PhantomJSDriver, PhantomJSDriverParams
diff --git a/wpull/driver/process.py b/wpull/driver/process.py
@@ -1,8 +1,6 @@
 '''RPC processes.'''
 
-import abc
 import gettext
-import json
 import logging
 import subprocess
 import atexit
@@ -11,7 +9,6 @@
 
 import asyncio
 
-from wpull.backport.logging import BraceMessage as __
 
 
 _ = gettext.gettext
diff --git a/wpull/network/connection_test.py b/wpull/network/connection_test.py
@@ -1,6 +1,5 @@
 # encoding=utf8
 
-import asyncio
 import socket
 import ssl
 import sys
diff --git a/wpull/network/pool_test.py b/wpull/network/pool_test.py
@@ -4,7 +4,7 @@
 
 import wpull.testing._async
 from wpull.network.connection import Connection
-from wpull.network.dns import Resolver, IPFamilyPreference
+from wpull.network.dns import Resolver
 from wpull.network.pool import ConnectionPool, HostPool, HappyEyeballsTable
 from wpull.testing.badapp import BadAppTestCase
 
diff --git a/wpull/pipeline/pipeline.py b/wpull/pipeline/pipeline.py
@@ -4,7 +4,6 @@
 import gettext
 import logging
 
-import time
 from typing import Optional, Sequence, TypeVar, Generic, Iterator, Tuple, Set
 from wpull.backport.logging import BraceMessage as __
 
diff --git a/wpull/pipeline/pipeline_test.py b/wpull/pipeline/pipeline_test.py
@@ -1,7 +1,7 @@
 import asyncio
 import logging
 
-from typing import Optional, List, Iterable
+from typing import Optional, Iterable
 
 from wpull.pipeline.pipeline import ItemTask, ItemSource, Pipeline, ItemQueue, \
     PipelineSeries
diff --git a/wpull/pipeline/progress.py b/wpull/pipeline/progress.py
@@ -1,7 +1,6 @@
 import datetime
 import enum
 import gettext
-import logging
 import sys
 import time
 import itertools
diff --git a/wpull/pipeline/session.py b/wpull/pipeline/session.py
@@ -1,4 +1,3 @@
-import asyncio
 import gettext
 import logging
 
@@ -10,8 +9,7 @@
     URLData, LinkType
 from wpull.pipeline.pipeline import ItemSource
 from wpull.backport.logging import BraceMessage as __
-from wpull.protocol.abstract.request import URLPropertyMixin, \
-    ProtocolResponseMixin, BaseResponse, BaseRequest
+from wpull.protocol.abstract.request import BaseResponse, BaseRequest
 from wpull.url import parse_url_or_log
 
 _logger = logging.getLogger(__name__)
diff --git a/wpull/processor/base.py b/wpull/processor/base.py
@@ -4,7 +4,6 @@
 import gettext
 import logging
 
-import asyncio
 
 from wpull.backport.logging import StyleAdapter
 from wpull.errors import ServerError, ProtocolError, SSLVerificationError, \
diff --git a/wpull/processor/coprocessor/proxy.py b/wpull/processor/coprocessor/proxy.py
@@ -1,8 +1,7 @@
 import gettext
 import logging
-from http.cookiejar import CookieJar
 
-from typing import Optional, cast
+from typing import cast
 
 import wpull._string
 from wpull.application.hook import Actions
diff --git a/wpull/processor/coprocessor/youtubedl.py b/wpull/processor/coprocessor/youtubedl.py
@@ -2,12 +2,10 @@
 import gettext
 import glob
 import logging
-import os
 import tempfile
 import subprocess
 
 
-import asyncio
 
 from wpull.backport.logging import BraceMessage as __
 from wpull.document.html import HTMLReader
diff --git a/wpull/processor/delegate.py b/wpull/processor/delegate.py
@@ -3,7 +3,6 @@
 import logging
 
 
-import asyncio
 
 from wpull.backport.logging import StyleAdapter
 from wpull.pipeline.session import ItemSession
diff --git a/wpull/processor/ftp.py b/wpull/processor/ftp.py
@@ -27,7 +27,7 @@
 from wpull.protocol.ftp.util import FTPServerError
 from wpull.scraper.util import urljoin_safe
 from wpull.url import parse_url_or_log, URLInfo
-from wpull.writer import NullWriter, BaseFileWriter
+from wpull.writer import BaseFileWriter
 
 _logger = StyleAdapter(logging.getLogger(__name__))
 _ = gettext.gettext
diff --git a/wpull/processor/rule.py b/wpull/processor/rule.py
@@ -1,5 +1,4 @@
 '''Fetching rules.'''
-import asyncio
 import logging
 import random
 
diff --git a/wpull/protocol/abstract/client.py b/wpull/protocol/abstract/client.py
@@ -1,6 +1,5 @@
 '''Client abstractions'''
 import abc
-import asyncio
 import contextlib
 import enum
 import logging
diff --git a/wpull/protocol/abstract/stream.py b/wpull/protocol/abstract/stream.py
@@ -1,7 +1,6 @@
 '''Abstract stream classes'''
 import functools
 
-import asyncio
 
 from typing import Callable
 
diff --git a/wpull/protocol/ftp/client.py b/wpull/protocol/ftp/client.py
@@ -11,7 +11,6 @@
 from typing import IO, Tuple
 from typing import Optional
 
-from wpull.application.hook import HookableMixin
 from wpull.protocol.abstract.client import BaseClient, BaseSession, DurationTimeout
 from wpull.body import Body
 from wpull.errors import ProtocolError, AuthenticationError
diff --git a/wpull/protocol/ftp/client_test.py b/wpull/protocol/ftp/client_test.py
@@ -1,7 +1,6 @@
 import io
 import logging
 
-import asyncio
 from wpull.protocol.abstract.client import DurationTimeout
 from wpull.errors import ProtocolError
 
diff --git a/wpull/protocol/ftp/command.py b/wpull/protocol/ftp/command.py
@@ -2,7 +2,6 @@
 import logging
 
 
-import asyncio
 
 from typing import Sequence, Tuple, Callable, IO
 from typing import Union
diff --git a/wpull/protocol/ftp/request.py b/wpull/protocol/ftp/request.py
@@ -3,7 +3,7 @@
 import urllib.parse
 
 from wpull.protocol.abstract.request import SerializableMixin, DictableMixin, \
-    URLPropertyMixin, ProtocolResponseMixin, BaseResponse, BaseRequest
+    URLPropertyMixin, BaseResponse, BaseRequest
 from wpull.errors import ProtocolError
 import wpull.protocol.ftp.util
 
diff --git a/wpull/protocol/http/chunked.py b/wpull/protocol/http/chunked.py
@@ -4,9 +4,7 @@
 import gettext
 import logging
 
-import asyncio
 
-from wpull.backport.logging import BraceMessage as __
 from wpull.errors import ProtocolError, NetworkError
 
 
diff --git a/wpull/protocol/http/client.py b/wpull/protocol/http/client.py
@@ -10,7 +10,6 @@
 
 from typing import Optional, Union, IO, Callable
 
-from wpull.application.hook import HookableMixin
 from wpull.protocol.abstract.client import BaseClient, BaseSession, DurationTimeout
 from wpull.backport.logging import BraceMessage as __
 from wpull.body import Body
diff --git a/wpull/protocol/http/request.py b/wpull/protocol/http/request.py
@@ -4,7 +4,7 @@
 import re
 
 from wpull.protocol.abstract.request import SerializableMixin, DictableMixin, \
-    URLPropertyMixin, ProtocolResponseMixin, BaseResponse, BaseRequest
+    BaseResponse, BaseRequest
 from wpull.errors import ProtocolError
 from wpull.namevalue import NameValueRecord
 import wpull._string
diff --git a/wpull/protocol/http/request_test.py b/wpull/protocol/http/request_test.py
@@ -1,6 +1,5 @@
 # encoding=utf-8
 
-import copy
 import unittest
 from wpull.body import Body
 
diff --git a/wpull/protocol/http/robots.py b/wpull/protocol/http/robots.py
diff --git a/wpull/protocol/http/robots_test.py b/wpull/protocol/http/robots_test.py
diff --git a/wpull/protocol/http/stream.py b/wpull/protocol/http/stream.py
diff --git a/wpull/protocol/http/stream_test.py b/wpull/protocol/http/stream_test.py
diff --git a/wpull/protocol/http/web.py b/wpull/protocol/http/web.py
diff --git a/wpull/proxy/client.py b/wpull/proxy/client.py
diff --git a/wpull/proxy/proxy_test.py b/wpull/proxy/proxy_test.py
diff --git a/wpull/proxy/server.py b/wpull/proxy/server.py
diff --git a/wpull/scraper/base.py b/wpull/scraper/base.py
diff --git a/wpull/stats.py b/wpull/stats.py
diff --git a/wpull/testing/integration/http_app_test.py b/wpull/testing/integration/http_app_test.py
diff --git a/wpull/testing/integration/https_test.py b/wpull/testing/integration/https_test.py
diff --git a/wpull/testing/integration/sample_user_scripts/extensive.plugin.py b/wpull/testing/integration/sample_user_scripts/extensive.plugin.py
diff --git a/wpull/thirdparty/dammit.py b/wpull/thirdparty/dammit.py
diff --git a/wpull/thirdparty/test_dammit.py b/wpull/thirdparty/test_dammit.py
diff --git a/wpull/url.py b/wpull/url.py
diff --git a/wpull/urlfilter.py b/wpull/urlfilter.py
diff --git a/wpull/urlrewrite_test.py b/wpull/urlrewrite_test.py
diff --git a/wpull/warc/recorder.py b/wpull/warc/recorder.py
diff --git a/wpull/writer_test.py b/wpull/writer_test.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import asyncio`
`2`	`1`
`3`	`2`	`from typing import Optional`
`4`	`3`