Skip to content

Commit dabc57d

Browse files
author
Jussi Kukkonen
committed
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 <[email protected]>
1 parent 62c392e commit dabc57d

12 files changed

+10
-21
lines changed

tuf/client/updater.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
from tuf import exceptions
145145
from tuf import formats
146146
from tuf import keydb
147-
from tuf import log
147+
from tuf import log # pylint: disable=unused-import
148148
from tuf import mirrors
149149
from tuf import roledb
150150
from tuf import settings

tuf/developer_tool.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,19 @@
4040
import six
4141

4242

43-
import securesystemslib
43+
import securesystemslib # pylint: disable=unused-import
4444
from securesystemslib import exceptions as sslib_exceptions
4545
from securesystemslib import formats as sslib_formats
4646
from securesystemslib import storage as sslib_storage
4747
from securesystemslib import util as sslib_util
4848

49-
import tuf
5049
from tuf import exceptions
5150
from tuf import formats
5251
from tuf import keydb
53-
from tuf import log
52+
from tuf import log # pylint: disable=unused-import
5453
from tuf import repository_lib as repo_lib
5554
from tuf import roledb
5655
from tuf import sig
57-
import tuf.repository_tool
5856

5957
from tuf.repository_tool import Targets
6058
from tuf.repository_lib import _check_role_keys

tuf/download.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import six
4040
from urllib3.exceptions import ReadTimeoutError
4141

42-
import securesystemslib
42+
import securesystemslib # pylint: disable=unused-import
4343
from securesystemslib import formats as sslib_formats
4444

4545
import tuf

tuf/keydb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import logging
4545
import copy
4646

47-
import securesystemslib
47+
import securesystemslib # pylint: disable=unused-import
4848
from securesystemslib import exceptions as sslib_exceptions
4949
from securesystemslib import formats as sslib_formats
5050
from securesystemslib import keys as sslib_keys

tuf/log.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
from securesystemslib import exceptions as sslib_exceptions
7676
from securesystemslib import formats as sslib_formats
7777

78-
import tuf
7978
from tuf import exceptions
8079
from tuf import settings
8180

tuf/mirrors.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,11 @@
3232

3333
import os
3434

35-
import securesystemslib
35+
import securesystemslib # pylint: disable=unused-import
3636
from securesystemslib import exceptions as sslib_exceptions
3737
from securesystemslib import formats as sslib_formats
3838
from securesystemslib.util import file_in_confined_directories
3939

40-
import tuf
4140
from tuf import formats
4241

4342
import six

tuf/repository_lib.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import six
4141
import tempfile
4242

43-
import securesystemslib
43+
import securesystemslib # pylint: disable=unused-import
4444
from securesystemslib import exceptions as sslib_exceptions
4545
from securesystemslib import formats as sslib_formats
4646
from securesystemslib import hash as sslib_hash
@@ -49,7 +49,6 @@
4949
from securesystemslib import util as sslib_util
5050
from securesystemslib import storage as sslib_storage
5151

52-
import tuf
5352
from tuf import exceptions
5453
from tuf import formats
5554
from tuf import keydb

tuf/repository_tool.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
from securesystemslib import util as sslib_util
4949
from securesystemslib import storage as sslib_storage
5050

51-
import tuf
5251
from tuf import exceptions
5352
from tuf import formats
5453
from tuf import keydb

tuf/roledb.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,12 @@
5252
import logging
5353
import copy
5454

55-
import securesystemslib
55+
import securesystemslib # pylint: disable=unused-import
5656
from securesystemslib import exceptions as sslib_exceptions
5757
from securesystemslib import formats as sslib_formats
5858

59-
import tuf
6059
from tuf import exceptions
6160
from tuf import formats
62-
from tuf import log
6361

6462
import six
6563

tuf/scripts/client.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
import argparse
7272
import logging
7373

74-
import tuf
7574
from tuf import exceptions
7675
from tuf import log
7776
from tuf import settings

tuf/scripts/repo.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,15 +150,14 @@
150150

151151
# 'pip install securesystemslib[crypto,pynacl]' is required for the CLI,
152152
# which installs the cryptography and pynacl.
153-
import securesystemslib
153+
import securesystemslib # pylint: disable=unused-import
154154
from securesystemslib import exceptions as sslib_exceptions
155155
from securesystemslib import formats as sslib_formats
156156
from securesystemslib import interface as sslib_interface
157157
from securesystemslib import keys as sslib_keys
158158
from securesystemslib import settings as sslib_settings
159159
from securesystemslib import util as sslib_util
160160

161-
import tuf
162161
from tuf import exceptions
163162
from tuf import formats
164163
from tuf import keydb

tuf/sig.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,11 @@
5050

5151
import logging
5252

53-
import securesystemslib
53+
import securesystemslib # pylint: disable=unused-import
5454
from securesystemslib import exceptions as sslib_exceptions
5555
from securesystemslib import formats as sslib_formats
5656
from securesystemslib import keys as sslib_keys
5757

58-
import tuf
5958
from tuf import exceptions
6059
from tuf import formats
6160
from tuf import keydb

0 commit comments

Comments
 (0)