Merge pull request #249 from JonathonReinhart/no-wildcard-imports

Don't use wildcard imports

scuba/config.py

@@ -10,8 +10,8 @@
 import yaml
 import yaml.nodes
 
-from .constants import *
-from .utils import *
+from .constants import DEFAULT_SHELL, SCUBA_YML
+from .utils import expand_env_vars, parse_env_var
 from .dockerutil import make_vol_opt
 
 CfgNode = Any

tests/test_config.py

@@ -1,12 +1,13 @@
 # coding=utf-8
-from .utils import *
-import pytest
-
 import logging
 import os
 from os.path import join
 from pathlib import Path
+import pytest
 from shutil import rmtree
+from unittest import mock
+
+from .utils import assert_paths_equal, assert_vol
 
 import scuba.config
 

tests/test_dockerutil.py

@@ -1,11 +1,11 @@
 # coding=utf-8
-from unittest import mock
-import pytest
-
 from pathlib import Path
+import pytest
 import subprocess
 from typing import Sequence
-from .const import *
+from unittest import mock
+
+from .const import ALT_DOCKER_IMAGE, DOCKER_IMAGE
 
 import scuba.dockerutil as uut
 

tests/test_main.py

@@ -1,25 +1,29 @@
-from .utils import *
-from unittest import mock
-import pytest
-import warnings
-
+from grp import getgrgid
 import logging
 import os
-import sys
 from pathlib import Path
-from tempfile import TemporaryFile, NamedTemporaryFile
-import subprocess
-import shlex
 from pwd import getpwuid
-from grp import getgrgid
+import pytest
+import re
+import shlex
+import subprocess
+import sys
+from tempfile import TemporaryFile, NamedTemporaryFile
+from unittest import mock
+import warnings
 
 import scuba.__main__ as main
-import scuba.constants
 import scuba.dockerutil
-import scuba
-import re
 
 from .const import DOCKER_IMAGE
+from .utils import (
+    assert_seq_equal,
+    assert_str_equalish,
+    InTempDir,
+    make_executable,
+    skipUnlessTty,
+)
+
 
 SCUBAINIT_EXIT_FAIL = 99
 

tests/test_utils.py

@@ -1,11 +1,11 @@
-import shlex
+import io
 from itertools import chain
 import os
-import io
+import pytest
+import shlex
 from typing import List, Sequence
 
-from .utils import *
-import pytest
+from .utils import assert_seq_equal
 
 import scuba.utils