From d5b6f91f6fbb0bf4abc7c57446c89bfaa58783fa Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 12 Jan 2021 17:38:50 +0200 Subject: [PATCH] imports: Remove unused imports The linter now understands our imports (yay), and complains a lot (boo): * Remove really unused imports * disable lints for tuf.log and securesystemslib imports: these imports have logging side-effects (they set default loggers for tuf and securesystemslib respectively) and I'm cautious about just removing them Signed-off-by: Jussi Kukkonen --- tuf/client/updater.py | 2 +- tuf/developer_tool.py | 7 ++----- tuf/download.py | 2 +- tuf/keydb.py | 2 +- tuf/log.py | 1 - tuf/mirrors.py | 3 +-- tuf/repository_lib.py | 3 +-- tuf/repository_tool.py | 1 - tuf/roledb.py | 4 +--- tuf/scripts/client.py | 1 - tuf/scripts/repo.py | 3 +-- tuf/sig.py | 3 +-- 12 files changed, 10 insertions(+), 22 deletions(-) diff --git a/tuf/client/updater.py b/tuf/client/updater.py index d22c0a19..80475a14 100755 --- a/tuf/client/updater.py +++ b/tuf/client/updater.py @@ -143,7 +143,7 @@ from tuf import exceptions from tuf import formats from tuf import keydb -from tuf import log +from tuf import log # pylint: disable=unused-import from tuf import mirrors from tuf import roledb from tuf import settings diff --git a/tuf/developer_tool.py b/tuf/developer_tool.py index 788240ad..df1c17c2 100755 --- a/tuf/developer_tool.py +++ b/tuf/developer_tool.py @@ -40,22 +40,19 @@ import six -import securesystemslib +import securesystemslib # pylint: disable=unused-import from securesystemslib import exceptions as sslib_exceptions from securesystemslib import formats as sslib_formats from securesystemslib import storage as sslib_storage from securesystemslib import util as sslib_util -import tuf from tuf import exceptions from tuf import formats from tuf import keydb -from tuf import log +from tuf import log # pylint: disable=unused-import from tuf import repository_lib as repo_lib from tuf import roledb from tuf import sig -import tuf.keydb -import tuf.repository_tool from tuf.repository_tool import Targets from tuf.repository_lib import _check_role_keys diff --git a/tuf/download.py b/tuf/download.py index 2dfb159c..2378e7ce 100755 --- a/tuf/download.py +++ b/tuf/download.py @@ -36,7 +36,7 @@ import timeit import tempfile -import securesystemslib +import securesystemslib # pylint: disable=unused-import from securesystemslib import formats as sslib_formats import tuf diff --git a/tuf/keydb.py b/tuf/keydb.py index e261bfa7..71ef1058 100755 --- a/tuf/keydb.py +++ b/tuf/keydb.py @@ -44,7 +44,7 @@ import logging import copy -import securesystemslib +import securesystemslib # pylint: disable=unused-import from securesystemslib import exceptions as sslib_exceptions from securesystemslib import formats as sslib_formats from securesystemslib import keys as sslib_keys diff --git a/tuf/log.py b/tuf/log.py index cdeb98f5..36884533 100755 --- a/tuf/log.py +++ b/tuf/log.py @@ -75,7 +75,6 @@ from securesystemslib import exceptions as sslib_exceptions from securesystemslib import formats as sslib_formats -import tuf from tuf import exceptions from tuf import settings diff --git a/tuf/mirrors.py b/tuf/mirrors.py index f01166a2..78d50534 100755 --- a/tuf/mirrors.py +++ b/tuf/mirrors.py @@ -32,12 +32,11 @@ import os -import securesystemslib +import securesystemslib # pylint: disable=unused-import from securesystemslib import exceptions as sslib_exceptions from securesystemslib import formats as sslib_formats from securesystemslib.util import file_in_confined_directories -import tuf from tuf import formats import six diff --git a/tuf/repository_lib.py b/tuf/repository_lib.py index f6cf9e96..d3158cb6 100644 --- a/tuf/repository_lib.py +++ b/tuf/repository_lib.py @@ -40,7 +40,7 @@ import six import tempfile -import securesystemslib +import securesystemslib # pylint: disable=unused-import from securesystemslib import exceptions as sslib_exceptions from securesystemslib import formats as sslib_formats from securesystemslib import hash as sslib_hash @@ -49,7 +49,6 @@ from securesystemslib import util as sslib_util from securesystemslib import storage as sslib_storage -import tuf from tuf import exceptions from tuf import formats from tuf import keydb diff --git a/tuf/repository_tool.py b/tuf/repository_tool.py index 04681ac5..9d195da0 100755 --- a/tuf/repository_tool.py +++ b/tuf/repository_tool.py @@ -48,7 +48,6 @@ from securesystemslib import util as sslib_util from securesystemslib import storage as sslib_storage -import tuf from tuf import exceptions from tuf import formats from tuf import keydb diff --git a/tuf/roledb.py b/tuf/roledb.py index e5914af9..62f83bb8 100755 --- a/tuf/roledb.py +++ b/tuf/roledb.py @@ -52,14 +52,12 @@ import logging import copy -import securesystemslib +import securesystemslib # pylint: disable=unused-import from securesystemslib import exceptions as sslib_exceptions from securesystemslib import formats as sslib_formats -import tuf from tuf import exceptions from tuf import formats -from tuf import log import six diff --git a/tuf/scripts/client.py b/tuf/scripts/client.py index 0f4ffea3..c1c7bd7c 100755 --- a/tuf/scripts/client.py +++ b/tuf/scripts/client.py @@ -71,7 +71,6 @@ import argparse import logging -import tuf from tuf import exceptions from tuf import log from tuf import settings diff --git a/tuf/scripts/repo.py b/tuf/scripts/repo.py index 9c1b6982..5866a885 100755 --- a/tuf/scripts/repo.py +++ b/tuf/scripts/repo.py @@ -148,7 +148,7 @@ import fnmatch import six -import securesystemslib +import securesystemslib # pylint: disable=unused-import from securesystemslib import exceptions as sslib_exceptions from securesystemslib import formats as sslib_formats from securesystemslib import interface as sslib_interface @@ -156,7 +156,6 @@ from securesystemslib import settings as sslib_settings from securesystemslib import util as sslib_util -import tuf from tuf import exceptions from tuf import formats from tuf import keydb diff --git a/tuf/sig.py b/tuf/sig.py index 0b04240f..cc572ae6 100755 --- a/tuf/sig.py +++ b/tuf/sig.py @@ -50,12 +50,11 @@ import logging -import securesystemslib +import securesystemslib # pylint: disable=unused-import from securesystemslib import exceptions as sslib_exceptions from securesystemslib import formats as sslib_formats from securesystemslib import keys as sslib_keys -import tuf from tuf import exceptions from tuf import formats from tuf import keydb