move utils package into top level

src/kiwi/executable.py

@@ -4,7 +4,7 @@ import os
 import subprocess
 
 # parent
-from ...config import LoadedConfig
+from .config import LoadedConfig
 
 
 def _update_kwargs(**kwargs):

src/kiwi/project.py

@@ -3,8 +3,8 @@ import os
 
 from .executable import Executable
 
-from ..._constants import CONF_DIRECTORY_NAME
-from ...config import LoadedConfig
+from ._constants import CONF_DIRECTORY_NAME
+from .config import LoadedConfig
 
 
 class Project:

src/kiwi/rootkit.py

@@ -4,11 +4,9 @@ import os
 import subprocess
 
 # local
+from ._constants import IMAGES_DIRECTORY_NAME, LOCAL_IMAGES_NAME, DEFAULT_IMAGE_NAME
 from .executable import Executable
 
-# parent
-from ..._constants import IMAGES_DIRECTORY_NAME, LOCAL_IMAGES_NAME, DEFAULT_IMAGE_NAME
-
 
 def _prefix_path(prefix, path):
     if isinstance(path, str):

src/kiwi/runner.py

@@ -4,7 +4,7 @@ import subprocess
 
 # local
 from . import subcommands
-from .subcommands.utils.executable import Executable
+from .executable import Executable
 from .parser import Parser
 
 

src/kiwi/subcommands/_subcommand.py

@@ -2,11 +2,9 @@
 import logging
 import os
 
-# local
-from .utils.project import Projects
-
 # parent
 from ..parser import Parser
+from ..project import Projects
 
 
 class SubCommand:

src/kiwi/subcommands/conf.py

@@ -1,16 +1,15 @@
 # system
 import logging
-import os
 import subprocess
 
 # local
 from ._subcommand import SubCommand
-from .utils.project import Projects
-from .utils.rootkit import Rootkit, prefix_path_mnt
 
 # parent
 from .._constants import CONF_DIRECTORY_NAME
 from ..config import LoadedConfig
+from ..project import Projects
+from ..rootkit import Rootkit, prefix_path_mnt
 
 
 class ConfCopyCommand(SubCommand):

src/kiwi/subcommands/disable.py

@@ -1,5 +1,4 @@
 # local
-from .utils.project import Projects
 from ._subcommand import ProjectCommand
 
 

src/kiwi/subcommands/down.py

@@ -1,6 +1,6 @@
 # local
 from ._subcommand import ServiceCommand
-from .utils.misc import are_you_sure
+from ..misc import are_you_sure
 
 
 class DownCommand(ServiceCommand):

src/kiwi/subcommands/enable.py

@@ -1,5 +1,4 @@
 # local
-from .utils.project import Projects
 from ._subcommand import ProjectCommand
 
 

src/kiwi/subcommands/list.py

@@ -5,7 +5,9 @@ import yaml
 
 # local
 from ._subcommand import ServiceCommand
-from .utils.project import Project, Projects
+
+# parent
+from ..project import Project, Projects
 
 
 def _print_list(strings):

src/kiwi/subcommands/net.py

@@ -4,11 +4,11 @@ import subprocess
 
 # local
 from ._subcommand import SubCommand
-from .utils.executable import Executable
-from .utils.misc import are_you_sure
 
 # parent
 from ..config import LoadedConfig
+from ..executable import Executable
+from ..misc import are_you_sure
 
 
 def _find_net(net_name):

src/kiwi/subcommands/new.py

@@ -4,7 +4,6 @@ import os
 import shutil
 
 # local
-from .utils.project import Projects
 from ._subcommand import ProjectCommand
 
 # parent

src/kiwi/subcommands/update.py

@@ -1,6 +1,8 @@
 # local
 from ._subcommand import ServiceCommand
-from .utils.misc import are_you_sure
+
+# parent
+from ..misc import are_you_sure
 
 
 class UpdateCommand(ServiceCommand):

src/kiwi/subcommands/utils/__init__.py

@@ -1 +0,0 @@
-# git keep