From 30b066f08260b73fc26256b5484a180468b9d0a6 Mon Sep 17 00:00:00 2001 From: Mads Jensen Date: Sun, 9 Jan 2022 22:51:06 +0100 Subject: [PATCH] Remove outdated pylint comments (#9167) * Remove outdated pylint: disable=unused-import annotations. * remove # pylint: disable=ungrouped-imports annotations. * Remove single pylint: disable = unused-argument in DeleteIfAppropriateTest.test_opt_in_deletion. --- certbot-apache/certbot_apache/_internal/http_01.py | 2 +- certbot-nginx/certbot_nginx/_internal/configurator.py | 2 +- certbot/certbot/_internal/account.py | 4 +++- certbot/certbot/ocsp.py | 2 +- certbot/tests/display/completer_test.py | 6 +++--- certbot/tests/main_test.py | 3 +-- certbot/tests/plugins/standalone_test.py | 5 ++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/certbot-apache/certbot_apache/_internal/http_01.py b/certbot-apache/certbot_apache/_internal/http_01.py index 749a57634..117eec2a5 100644 --- a/certbot-apache/certbot_apache/_internal/http_01.py +++ b/certbot-apache/certbot_apache/_internal/http_01.py @@ -9,7 +9,7 @@ from certbot import errors from certbot.compat import filesystem from certbot.compat import os from certbot.plugins import common -from certbot_apache._internal.obj import VirtualHost # pylint: disable=unused-import +from certbot_apache._internal.obj import VirtualHost from certbot_apache._internal.parser import get_aug_path if TYPE_CHECKING: diff --git a/certbot-nginx/certbot_nginx/_internal/configurator.py b/certbot-nginx/certbot_nginx/_internal/configurator.py index ede184159..46ec7d57e 100644 --- a/certbot-nginx/certbot_nginx/_internal/configurator.py +++ b/certbot-nginx/certbot_nginx/_internal/configurator.py @@ -28,7 +28,7 @@ from certbot_nginx._internal import constants from certbot_nginx._internal import display_ops from certbot_nginx._internal import http_01 from certbot_nginx._internal import nginxparser -from certbot_nginx._internal import obj # pylint: disable=unused-import +from certbot_nginx._internal import obj from certbot_nginx._internal import parser NAME_RANK = 0 diff --git a/certbot/certbot/_internal/account.py b/certbot/certbot/_internal/account.py index 07a869789..041fe9cf5 100644 --- a/certbot/certbot/_internal/account.py +++ b/certbot/certbot/_internal/account.py @@ -20,7 +20,7 @@ import pytz from acme import fields as acme_fields from acme import messages -from acme.client import ClientBase # pylint: disable=unused-import +from acme.client import ClientBase from certbot import configuration from certbot import errors from certbot import interfaces @@ -125,6 +125,7 @@ class AccountMemoryStorage(interfaces.AccountStorage): except KeyError: raise errors.AccountNotFound(account_id) + class RegistrationResourceWithNewAuthzrURI(messages.RegistrationResource): """A backwards-compatible RegistrationResource with a new-authz URI. @@ -136,6 +137,7 @@ class RegistrationResourceWithNewAuthzrURI(messages.RegistrationResource): """ new_authzr_uri = jose.Field('new_authzr_uri') + class AccountFileStorage(interfaces.AccountStorage): """Accounts file storage. diff --git a/certbot/certbot/ocsp.py b/certbot/certbot/ocsp.py index 51d486b6b..2a51fe834 100644 --- a/certbot/certbot/ocsp.py +++ b/certbot/certbot/ocsp.py @@ -22,7 +22,7 @@ from certbot import crypto_util from certbot import errors from certbot import util from certbot.compat.os import getenv -from certbot.interfaces import RenewableCert # pylint: disable=unused-import +from certbot.interfaces import RenewableCert logger = logging.getLogger(__name__) diff --git a/certbot/tests/display/completer_test.py b/certbot/tests/display/completer_test.py index 75b11d1d7..a6ada8b9a 100644 --- a/certbot/tests/display/completer_test.py +++ b/certbot/tests/display/completer_test.py @@ -10,9 +10,9 @@ import string import sys import unittest -from certbot.compat import filesystem # pylint: disable=ungrouped-imports -from certbot.compat import os # pylint: disable=ungrouped-imports -import certbot.tests.util as test_util # pylint: disable=ungrouped-imports +from certbot.compat import filesystem +from certbot.compat import os +import certbot.tests.util as test_util try: import mock diff --git a/certbot/tests/main_test.py b/certbot/tests/main_test.py index 9a67f0853..18c8b8081 100644 --- a/certbot/tests/main_test.py +++ b/certbot/tests/main_test.py @@ -18,7 +18,7 @@ import pytz from certbot import crypto_util, configuration from certbot import errors -from certbot import interfaces # pylint: disable=unused-import +from certbot import interfaces from certbot import util from certbot._internal import account from certbot._internal import cli @@ -529,7 +529,6 @@ class DeleteIfAppropriateTest(test_util.ConfigTestCase): def test_opt_in_deletion(self, mock_get_utility, mock_delete, mock_cert_path_to_lineage, mock_full_archive_dir, mock_match_and_check_overlaps, mock_renewal_file_for_certname): - # pylint: disable = unused-argument config = self.config config.namespace.delete_after_revoke = True config.cert_path = "/some/reasonable/path" diff --git a/certbot/tests/plugins/standalone_test.py b/certbot/tests/plugins/standalone_test.py index 3c990a3f5..2649abae9 100644 --- a/certbot/tests/plugins/standalone_test.py +++ b/certbot/tests/plugins/standalone_test.py @@ -7,10 +7,10 @@ from typing import Tuple import unittest import josepy as jose -import OpenSSL.crypto # pylint: disable=unused-import +import OpenSSL.crypto from acme import challenges -from acme import standalone as acme_standalone # pylint: disable=unused-import +from acme import standalone as acme_standalone from certbot import achallenges from certbot import errors from certbot.tests import acme_util @@ -22,7 +22,6 @@ except ImportError: # pragma: no cover from unittest import mock - class ServerManagerTest(unittest.TestCase): """Tests for certbot._internal.plugins.standalone.ServerManager."""