Skip to content

Commit

Permalink
imports: Remove unused imports
Browse files Browse the repository at this point in the history
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 <jkukkonen@vmware.com>
  • Loading branch information
Jussi Kukkonen committed Jan 21, 2021
1 parent 62c392e commit dabc57d
Show file tree
Hide file tree
Showing 12 changed files with 10 additions and 21 deletions.
2 changes: 1 addition & 1 deletion tuf/client/updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,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
Expand Down
6 changes: 2 additions & 4 deletions tuf/developer_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +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.repository_tool

from tuf.repository_tool import Targets
from tuf.repository_lib import _check_role_keys
Expand Down
2 changes: 1 addition & 1 deletion tuf/download.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import six
from urllib3.exceptions import ReadTimeoutError

import securesystemslib
import securesystemslib # pylint: disable=unused-import
from securesystemslib import formats as sslib_formats

import tuf
Expand Down
2 changes: 1 addition & 1 deletion tuf/keydb.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tuf/log.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions tuf/mirrors.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions tuf/repository_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion tuf/repository_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions tuf/roledb.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion tuf/scripts/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
import argparse
import logging

import tuf
from tuf import exceptions
from tuf import log
from tuf import settings
Expand Down
3 changes: 1 addition & 2 deletions tuf/scripts/repo.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,14 @@

# 'pip install securesystemslib[crypto,pynacl]' is required for the CLI,
# which installs the cryptography and pynacl.
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
from securesystemslib import keys as sslib_keys
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
Expand Down
3 changes: 1 addition & 2 deletions tuf/sig.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit dabc57d

Please sign in to comment.