From 5859e50e446032fa071dae288007efa90f64a03d Mon Sep 17 00:00:00 2001
From: ohemorange <erica@eff.org>
Date: Thu, 7 Aug 2025 15:10:02 -0700
Subject: [PATCH] Run ruff to fix test errors (#10398)

This is mostly removing unused imports, plus one unused `import as`. Had
to put back imports being used with `eval` -- see the second commit.
---
 acme/src/acme/_internal/tests/challenges_test.py             | 1 -
 acme/src/acme/_internal/tests/crypto_util_test.py            | 5 -----
 acme/src/acme/_internal/tests/fields_test.py                 | 1 -
 acme/src/acme/_internal/tests/jose_test.py                   | 2 +-
 acme/src/acme/_internal/tests/standalone_test.py             | 4 ----
 .../src/certbot_apache/_internal/tests/autohsts_test.py      | 1 -
 .../src/certbot_apache/_internal/tests/centos_test.py        | 1 -
 .../certbot_apache/_internal/tests/complex_parsing_test.py   | 1 -
 .../_internal/tests/configurator_reverter_test.py            | 1 -
 .../src/certbot_apache/_internal/tests/debian_test.py        | 1 -
 .../src/certbot_apache/_internal/tests/fedora_test.py        | 1 -
 .../src/certbot_apache/_internal/tests/gentoo_test.py        | 1 -
 .../src/certbot_apache/_internal/tests/http_01_test.py       | 1 -
 .../src/certbot_apache/_internal/tests/parser_test.py        | 1 -
 certbot-dns-cloudflare/setup.py                              | 1 -
 certbot-dns-digitalocean/setup.py                            | 1 -
 certbot-dns-dnsimple/setup.py                                | 1 -
 certbot-dns-dnsmadeeasy/setup.py                             | 1 -
 certbot-dns-gehirn/setup.py                                  | 1 -
 certbot-dns-google/setup.py                                  | 1 -
 certbot-dns-linode/setup.py                                  | 1 -
 .../certbot_dns_linode/_internal/tests/dns_linode_test.py    | 2 --
 certbot-dns-luadns/setup.py                                  | 1 -
 certbot-dns-nsone/setup.py                                   | 1 -
 certbot-dns-ovh/setup.py                                     | 1 -
 certbot-dns-rfc2136/setup.py                                 | 1 -
 certbot-dns-route53/setup.py                                 | 1 -
 certbot-dns-sakuracloud/setup.py                             | 1 -
 .../src/certbot_nginx/_internal/tests/display_ops_test.py    | 1 -
 .../src/certbot_nginx/_internal/tests/http_01_test.py        | 1 -
 certbot-nginx/src/certbot_nginx/_internal/tests/test_util.py | 1 -
 certbot/src/certbot/_internal/tests/cli_test.py              | 1 -
 certbot/src/certbot/_internal/tests/lock_test.py             | 1 -
 certbot/src/certbot/_internal/tests/plugins/manual_test.py   | 1 -
 .../src/certbot/_internal/tests/plugins/selection_test.py    | 1 -
 .../src/certbot/_internal/tests/plugins/standalone_test.py   | 2 --
 certbot/src/certbot/_internal/tests/renewal_test.py          | 2 --
 certbot/src/certbot/_internal/tests/renewupdater_test.py     | 1 -
 certbot/src/certbot/_internal/tests/reverter_test.py         | 1 -
 certbot/src/certbot/_internal/tests/storage_test.py          | 2 --
 letstest/letstest/multitester.py                             | 5 +----
 linter_plugin.py                                             | 1 -
 tools/finish_release.py                                      | 4 ----
 tools/snap/build_remote.py                                   | 2 --
 44 files changed, 2 insertions(+), 62 deletions(-)

diff --git a/acme/src/acme/_internal/tests/challenges_test.py b/acme/src/acme/_internal/tests/challenges_test.py
index ca238cad1..f95fecfb2 100644
--- a/acme/src/acme/_internal/tests/challenges_test.py
+++ b/acme/src/acme/_internal/tests/challenges_test.py
@@ -9,7 +9,6 @@ from josepy.jwk import JWKEC
 import pytest
 import requests
 
-from acme import errors
 from acme._internal.tests import test_util
 
 CERT = test_util.load_cert('cert.pem')
diff --git a/acme/src/acme/_internal/tests/crypto_util_test.py b/acme/src/acme/_internal/tests/crypto_util_test.py
index 463a0cc36..d149cdb87 100644
--- a/acme/src/acme/_internal/tests/crypto_util_test.py
+++ b/acme/src/acme/_internal/tests/crypto_util_test.py
@@ -1,11 +1,7 @@
 """Tests for acme.crypto_util."""
 import ipaddress
 import itertools
-import socket
-import socketserver
 import sys
-import threading
-import time
 from typing import List
 import unittest
 from unittest import mock
@@ -16,7 +12,6 @@ from cryptography import x509
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import rsa, x25519
 
-from acme import errors
 from acme._internal.tests import test_util
 
 
diff --git a/acme/src/acme/_internal/tests/fields_test.py b/acme/src/acme/_internal/tests/fields_test.py
index c3a476d1f..49d82725c 100644
--- a/acme/src/acme/_internal/tests/fields_test.py
+++ b/acme/src/acme/_internal/tests/fields_test.py
@@ -2,7 +2,6 @@
 import datetime
 import sys
 import unittest
-import warnings
 
 import josepy as jose
 import pytest
diff --git a/acme/src/acme/_internal/tests/jose_test.py b/acme/src/acme/_internal/tests/jose_test.py
index 74654434d..83787db15 100644
--- a/acme/src/acme/_internal/tests/jose_test.py
+++ b/acme/src/acme/_internal/tests/jose_test.py
@@ -20,7 +20,7 @@ def _test_it(submodule, attribute):
 
     # We use the imports below with eval, but pylint doesn't
     # understand that.
-    import josepy  # pylint: disable=unused-import
+    import josepy # pylint: disable=unused-import
 
     import acme  # pylint: disable=unused-import
     acme_jose_mod = eval(acme_jose_path)  # pylint: disable=eval-used
diff --git a/acme/src/acme/_internal/tests/standalone_test.py b/acme/src/acme/_internal/tests/standalone_test.py
index fce475b76..7eae74b1f 100644
--- a/acme/src/acme/_internal/tests/standalone_test.py
+++ b/acme/src/acme/_internal/tests/standalone_test.py
@@ -11,12 +11,8 @@ from unittest import mock
 import josepy as jose
 import pytest
 import requests
-from cryptography import x509
-from cryptography.hazmat.primitives import serialization
 
 from acme import challenges
-from acme import crypto_util
-from acme import errors
 from acme._internal.tests import test_util
 
 
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/autohsts_test.py b/certbot-apache/src/certbot_apache/_internal/tests/autohsts_test.py
index f6d5b2957..073029fc8 100644
--- a/certbot-apache/src/certbot_apache/_internal/tests/autohsts_test.py
+++ b/certbot-apache/src/certbot_apache/_internal/tests/autohsts_test.py
@@ -2,7 +2,6 @@
 """Test for certbot_apache._internal.configurator AutoHSTS functionality"""
 import re
 import sys
-import unittest
 from unittest import mock
 
 import pytest
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/centos_test.py b/certbot-apache/src/certbot_apache/_internal/tests/centos_test.py
index c6b8e4399..7ca77c6dd 100644
--- a/certbot-apache/src/certbot_apache/_internal/tests/centos_test.py
+++ b/certbot-apache/src/certbot_apache/_internal/tests/centos_test.py
@@ -1,6 +1,5 @@
 """Test for certbot_apache._internal.configurator for Centos overrides"""
 import sys
-import unittest
 from unittest import mock
 
 import pytest
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/complex_parsing_test.py b/certbot-apache/src/certbot_apache/_internal/tests/complex_parsing_test.py
index 6a24b00d1..a07362b02 100644
--- a/certbot-apache/src/certbot_apache/_internal/tests/complex_parsing_test.py
+++ b/certbot-apache/src/certbot_apache/_internal/tests/complex_parsing_test.py
@@ -1,7 +1,6 @@
 """Tests for certbot_apache._internal.parser."""
 import shutil
 import sys
-import unittest
 
 import pytest
 
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/configurator_reverter_test.py b/certbot-apache/src/certbot_apache/_internal/tests/configurator_reverter_test.py
index 3cbee9474..f8c77308a 100644
--- a/certbot-apache/src/certbot_apache/_internal/tests/configurator_reverter_test.py
+++ b/certbot-apache/src/certbot_apache/_internal/tests/configurator_reverter_test.py
@@ -1,7 +1,6 @@
 """Test for certbot_apache._internal.configurator implementations of reverter"""
 import shutil
 import sys
-import unittest
 from unittest import mock
 
 import pytest
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/debian_test.py b/certbot-apache/src/certbot_apache/_internal/tests/debian_test.py
index 50649b67c..e97524417 100644
--- a/certbot-apache/src/certbot_apache/_internal/tests/debian_test.py
+++ b/certbot-apache/src/certbot_apache/_internal/tests/debian_test.py
@@ -1,7 +1,6 @@
 """Test for certbot_apache._internal.configurator for Debian overrides"""
 import shutil
 import sys
-import unittest
 from unittest import mock
 
 import pytest
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/fedora_test.py b/certbot-apache/src/certbot_apache/_internal/tests/fedora_test.py
index a2c198534..dde7e063a 100644
--- a/certbot-apache/src/certbot_apache/_internal/tests/fedora_test.py
+++ b/certbot-apache/src/certbot_apache/_internal/tests/fedora_test.py
@@ -1,6 +1,5 @@
 """Test for certbot_apache._internal.configurator for Fedora 29+ overrides"""
 import sys
-import unittest
 from unittest import mock
 
 import pytest
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/gentoo_test.py b/certbot-apache/src/certbot_apache/_internal/tests/gentoo_test.py
index 0a4cc178d..087535e2c 100644
--- a/certbot-apache/src/certbot_apache/_internal/tests/gentoo_test.py
+++ b/certbot-apache/src/certbot_apache/_internal/tests/gentoo_test.py
@@ -1,6 +1,5 @@
 """Test for certbot_apache._internal.configurator for Gentoo overrides"""
 import sys
-import unittest
 from unittest import mock
 
 import pytest
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/http_01_test.py b/certbot-apache/src/certbot_apache/_internal/tests/http_01_test.py
index 20e096b21..9f11a0288 100644
--- a/certbot-apache/src/certbot_apache/_internal/tests/http_01_test.py
+++ b/certbot-apache/src/certbot_apache/_internal/tests/http_01_test.py
@@ -2,7 +2,6 @@
 import errno
 import sys
 from typing import List
-import unittest
 from unittest import mock
 
 import pytest
diff --git a/certbot-apache/src/certbot_apache/_internal/tests/parser_test.py b/certbot-apache/src/certbot_apache/_internal/tests/parser_test.py
index 6bbc33385..0711128bb 100644
--- a/certbot-apache/src/certbot_apache/_internal/tests/parser_test.py
+++ b/certbot-apache/src/certbot_apache/_internal/tests/parser_test.py
@@ -1,7 +1,6 @@
 """Tests for certbot_apache._internal.parser."""
 import shutil
 import sys
-import unittest
 from unittest import mock
 
 import pytest
diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py
index 69b06554b..40f91b4c0 100644
--- a/certbot-dns-cloudflare/setup.py
+++ b/certbot-dns-cloudflare/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py
index a1ede89ff..e6574dce4 100644
--- a/certbot-dns-digitalocean/setup.py
+++ b/certbot-dns-digitalocean/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py
index 2c12a6a65..177e1ceea 100644
--- a/certbot-dns-dnsimple/setup.py
+++ b/certbot-dns-dnsimple/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py
index ebc27a5ef..f16a40454 100644
--- a/certbot-dns-dnsmadeeasy/setup.py
+++ b/certbot-dns-dnsmadeeasy/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py
index 0a699f91e..50ebf6e07 100644
--- a/certbot-dns-gehirn/setup.py
+++ b/certbot-dns-gehirn/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py
index f98cc0328..424026e67 100644
--- a/certbot-dns-google/setup.py
+++ b/certbot-dns-google/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py
index 9ab0b5098..606725345 100644
--- a/certbot-dns-linode/setup.py
+++ b/certbot-dns-linode/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-dns-linode/src/certbot_dns_linode/_internal/tests/dns_linode_test.py b/certbot-dns-linode/src/certbot_dns_linode/_internal/tests/dns_linode_test.py
index 1ecd4f454..dfc1bce04 100644
--- a/certbot-dns-linode/src/certbot_dns_linode/_internal/tests/dns_linode_test.py
+++ b/certbot-dns-linode/src/certbot_dns_linode/_internal/tests/dns_linode_test.py
@@ -1,12 +1,10 @@
 """Tests for certbot_dns_linode._internal.dns_linode."""
 
 import sys
-import unittest
 from unittest import mock
 
 import pytest
 
-from certbot import errors
 from certbot.compat import os
 from certbot.plugins import dns_test_common
 from certbot.plugins import dns_test_common_lexicon
diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py
index b2acf6128..fda460a3a 100644
--- a/certbot-dns-luadns/setup.py
+++ b/certbot-dns-luadns/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py
index 73d9f2f82..32d121e65 100644
--- a/certbot-dns-nsone/setup.py
+++ b/certbot-dns-nsone/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py
index fab380bb1..a40349d28 100644
--- a/certbot-dns-ovh/setup.py
+++ b/certbot-dns-ovh/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py
index 465a06725..4f7f71830 100644
--- a/certbot-dns-rfc2136/setup.py
+++ b/certbot-dns-rfc2136/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py
index 2f0d8b46d..54cd7f69c 100644
--- a/certbot-dns-route53/setup.py
+++ b/certbot-dns-route53/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py
index 042b80c44..1ebb9b0ee 100644
--- a/certbot-dns-sakuracloud/setup.py
+++ b/certbot-dns-sakuracloud/setup.py
@@ -1,5 +1,4 @@
 import os
-import sys
 
 from setuptools import find_packages
 from setuptools import setup
diff --git a/certbot-nginx/src/certbot_nginx/_internal/tests/display_ops_test.py b/certbot-nginx/src/certbot_nginx/_internal/tests/display_ops_test.py
index 3246b3255..4d1256b0d 100644
--- a/certbot-nginx/src/certbot_nginx/_internal/tests/display_ops_test.py
+++ b/certbot-nginx/src/certbot_nginx/_internal/tests/display_ops_test.py
@@ -1,6 +1,5 @@
 """Test certbot_nginx._internal.display_ops."""
 import sys
-import unittest
 
 import pytest
 
diff --git a/certbot-nginx/src/certbot_nginx/_internal/tests/http_01_test.py b/certbot-nginx/src/certbot_nginx/_internal/tests/http_01_test.py
index c81357607..920ab10f7 100644
--- a/certbot-nginx/src/certbot_nginx/_internal/tests/http_01_test.py
+++ b/certbot-nginx/src/certbot_nginx/_internal/tests/http_01_test.py
@@ -1,6 +1,5 @@
 """Tests for certbot_nginx._internal.http_01"""
 import sys
-import unittest
 from unittest import mock
 
 import josepy as jose
diff --git a/certbot-nginx/src/certbot_nginx/_internal/tests/test_util.py b/certbot-nginx/src/certbot_nginx/_internal/tests/test_util.py
index b849c6e16..cf73b3d42 100644
--- a/certbot-nginx/src/certbot_nginx/_internal/tests/test_util.py
+++ b/certbot-nginx/src/certbot_nginx/_internal/tests/test_util.py
@@ -3,7 +3,6 @@ import copy
 import importlib.resources
 import shutil
 import tempfile
-import sys
 from contextlib import contextmanager
 from unittest import mock
 
diff --git a/certbot/src/certbot/_internal/tests/cli_test.py b/certbot/src/certbot/_internal/tests/cli_test.py
index 132f97a6a..5602734f3 100644
--- a/certbot/src/certbot/_internal/tests/cli_test.py
+++ b/certbot/src/certbot/_internal/tests/cli_test.py
@@ -1,7 +1,6 @@
 """Tests for certbot._internal.cli."""
 import argparse
 import copy
-from importlib import reload as reload_module
 import io
 import sys
 import tempfile
diff --git a/certbot/src/certbot/_internal/tests/lock_test.py b/certbot/src/certbot/_internal/tests/lock_test.py
index f2d856f6d..f8ff8b59a 100644
--- a/certbot/src/certbot/_internal/tests/lock_test.py
+++ b/certbot/src/certbot/_internal/tests/lock_test.py
@@ -2,7 +2,6 @@
 import functools
 import multiprocessing
 import sys
-import unittest
 from unittest import mock
 
 import pytest
diff --git a/certbot/src/certbot/_internal/tests/plugins/manual_test.py b/certbot/src/certbot/_internal/tests/plugins/manual_test.py
index b4125c659..f1366ac21 100644
--- a/certbot/src/certbot/_internal/tests/plugins/manual_test.py
+++ b/certbot/src/certbot/_internal/tests/plugins/manual_test.py
@@ -1,7 +1,6 @@
 """Tests for certbot._internal.plugins.manual"""
 import sys
 import textwrap
-import unittest
 from unittest import mock
 
 import pytest
diff --git a/certbot/src/certbot/_internal/tests/plugins/selection_test.py b/certbot/src/certbot/_internal/tests/plugins/selection_test.py
index 1b89c7bb2..cf934913c 100644
--- a/certbot/src/certbot/_internal/tests/plugins/selection_test.py
+++ b/certbot/src/certbot/_internal/tests/plugins/selection_test.py
@@ -220,7 +220,6 @@ class TestChooseConfiguratorPlugins(unittest.TestCase):
         return mock_ep
 
     def _parseArgs(self, args):
-        from certbot import configuration
         from certbot._internal import cli
         return cli.prepare_and_parse_args(self.plugins, args.split())
 
diff --git a/certbot/src/certbot/_internal/tests/plugins/standalone_test.py b/certbot/src/certbot/_internal/tests/plugins/standalone_test.py
index 9e998013e..c51f0cba0 100644
--- a/certbot/src/certbot/_internal/tests/plugins/standalone_test.py
+++ b/certbot/src/certbot/_internal/tests/plugins/standalone_test.py
@@ -2,9 +2,7 @@
 import errno
 import socket
 import sys
-from typing import Dict
 from typing import Set
-from typing import Tuple
 import unittest
 from unittest import mock
 
diff --git a/certbot/src/certbot/_internal/tests/renewal_test.py b/certbot/src/certbot/_internal/tests/renewal_test.py
index 0b35c45f0..a0f2facd1 100644
--- a/certbot/src/certbot/_internal/tests/renewal_test.py
+++ b/certbot/src/certbot/_internal/tests/renewal_test.py
@@ -18,7 +18,6 @@ import certbot.tests.util as test_util
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives import serialization, hashes
 from cryptography import x509
-from cryptography.x509 import Certificate
 
 def make_cert_with_lifetime(not_before: datetime.datetime, lifetime_days: int) -> bytes:
     """Return PEM of a self-signed certificate with the given notBefore and lifetime."""
@@ -451,7 +450,6 @@ class RenewalTest(test_util.ConfigTestCase):
     @mock.patch('certbot._internal.storage.RenewableCert.ocsp_revoked')
     def test_resilient_ari_check(self, mock_ocsp):
         from certbot._internal import renewal
-        from acme import messages
 
         rc_path = test_util.make_lineage(self.config.config_dir, 'sample-renewal.conf')
         renewable_cert = storage.RenewableCert(rc_path, self.config)
diff --git a/certbot/src/certbot/_internal/tests/renewupdater_test.py b/certbot/src/certbot/_internal/tests/renewupdater_test.py
index 22caae349..31154c13e 100644
--- a/certbot/src/certbot/_internal/tests/renewupdater_test.py
+++ b/certbot/src/certbot/_internal/tests/renewupdater_test.py
@@ -1,6 +1,5 @@
 """Tests for renewal updater interfaces"""
 import sys
-import unittest
 from unittest import mock
 
 import pytest
diff --git a/certbot/src/certbot/_internal/tests/reverter_test.py b/certbot/src/certbot/_internal/tests/reverter_test.py
index c484a87f1..146bd7ead 100644
--- a/certbot/src/certbot/_internal/tests/reverter_test.py
+++ b/certbot/src/certbot/_internal/tests/reverter_test.py
@@ -4,7 +4,6 @@ import logging
 import shutil
 import sys
 import tempfile
-import unittest
 from unittest import mock
 
 import pytest
diff --git a/certbot/src/certbot/_internal/tests/storage_test.py b/certbot/src/certbot/_internal/tests/storage_test.py
index 0f961625a..ffdaa4848 100644
--- a/certbot/src/certbot/_internal/tests/storage_test.py
+++ b/certbot/src/certbot/_internal/tests/storage_test.py
@@ -12,14 +12,12 @@ import configobj
 import pytest
 
 import certbot
-from certbot import configuration
 from certbot import errors
 from certbot._internal.storage import ALL_FOUR
 from certbot.compat import filesystem
 from certbot.compat import os
 import certbot.tests.util as test_util
 
-from typing import Optional, Any
 
 def unlink_all(rc_object):
     """Unlink all four items associated with this RenewableCert."""
diff --git a/letstest/letstest/multitester.py b/letstest/letstest/multitester.py
index 69e88ad94..c5f2a6b5f 100644
--- a/letstest/letstest/multitester.py
+++ b/letstest/letstest/multitester.py
@@ -36,11 +36,8 @@ import sys
 import tempfile
 import time
 import traceback
-import urllib.error as urllib_error
-import urllib.request as urllib_request
 
 import boto3
-from botocore.exceptions import ClientError
 from fabric import Config
 from fabric import Connection
 import yaml
@@ -185,7 +182,7 @@ def block_until_ssh_open(ipstring, wait_time=10, timeout=120):
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             sock.connect((ipstring, 22))
             reached = True
-        except OSError as err:
+        except OSError:
             time.sleep(wait_time)
             t_elapsed += wait_time
     sock.close()
diff --git a/linter_plugin.py b/linter_plugin.py
index c48640a33..0660d1717 100644
--- a/linter_plugin.py
+++ b/linter_plugin.py
@@ -7,7 +7,6 @@ See https://github.com/PyCQA/pylint/blob/b20a2984c94e2946669d727dbda78735882bf50
 See https://docs.pytest.org/en/latest/writing_plugins.html
 """
 import os.path
-import re
 
 from pylint.checkers import BaseChecker
 
diff --git a/tools/finish_release.py b/tools/finish_release.py
index 56b92d2a1..ddcd79bef 100755
--- a/tools/finish_release.py
+++ b/tools/finish_release.py
@@ -23,17 +23,13 @@ should execute successfully.
 """
 
 import argparse
-import getpass
 import glob
 import os.path
 import re
 import subprocess
 import sys
-import tempfile
-from zipfile import ZipFile
 
 from azure.devops.connection import Connection
-import requests
 
 # Path to the root directory of the Certbot repository containing this script
 REPO_ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
diff --git a/tools/snap/build_remote.py b/tools/snap/build_remote.py
index b904fa247..c818a9857 100755
--- a/tools/snap/build_remote.py
+++ b/tools/snap/build_remote.py
@@ -10,12 +10,10 @@ from multiprocessing.managers import SyncManager
 import os
 from os.path import basename
 from os.path import dirname
-from os.path import exists
 from os.path import join
 from os.path import realpath
 import random
 import re
-import shutil
 import string
 import subprocess
 import sys