move subcommand.py

src/kiwi/executable.py

@@ -3,7 +3,7 @@ import logging
 import os
 import subprocess
 
-# parent
+# local
 from .config import LoadedConfig
 
 

src/kiwi/subcommand.py

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

src/kiwi/subcommands/build.py

@@ -1,5 +1,5 @@
 # local
-from ._subcommand import ServiceCommand
+from ..subcommand import ServiceCommand
 
 
 class BuildCommand(ServiceCommand):

src/kiwi/subcommands/cmd.py

@@ -2,7 +2,7 @@
 import logging
 
 # local
-from ._subcommand import ProjectCommand
+from ..subcommand import ProjectCommand
 
 
 class CmdCommand(ProjectCommand):

src/kiwi/subcommands/conf.py

@@ -3,10 +3,8 @@ import logging
 import subprocess
 
 # local
-from ._subcommand import SubCommand
-
-# parent
 from .._constants import CONF_DIRECTORY_NAME
+from ..subcommand import SubCommand
 from ..config import LoadedConfig
 from ..project import Projects
 from ..rootkit import Rootkit, prefix_path_mnt

src/kiwi/subcommands/disable.py

@@ -1,5 +1,5 @@
 # local
-from ._subcommand import ProjectCommand
+from ..subcommand import ProjectCommand
 
 
 class DisableCommand(ProjectCommand):

src/kiwi/subcommands/down.py

@@ -1,5 +1,5 @@
 # local
-from ._subcommand import ServiceCommand
+from ..subcommand import ServiceCommand
 from ..misc import are_you_sure
 
 

src/kiwi/subcommands/enable.py

@@ -1,5 +1,5 @@
 # local
-from ._subcommand import ProjectCommand
+from ..subcommand import ProjectCommand
 
 
 class EnableCommand(ProjectCommand):

src/kiwi/subcommands/init.py

@@ -3,10 +3,8 @@ import logging
 import os
 
 # local
-from ._subcommand import SubCommand
-
-# parent (display purposes only)
 from .._constants import KIWI_CONF_NAME
+from ..subcommand import SubCommand
 from ..config import DefaultConfig, LoadedConfig
 
 

src/kiwi/subcommands/list.py

@@ -4,9 +4,7 @@ import os
 import yaml
 
 # local
-from ._subcommand import ServiceCommand
-
-# parent
+from ..subcommand import ServiceCommand
 from ..project import Project, Projects
 
 

src/kiwi/subcommands/logs.py

@@ -1,5 +1,5 @@
 # local
-from ._subcommand import ServiceCommand
+from ..subcommand import ServiceCommand
 
 
 class LogsCommand(ServiceCommand):

src/kiwi/subcommands/net.py

@@ -3,9 +3,7 @@ import logging
 import subprocess
 
 # local
-from ._subcommand import SubCommand
-
-# parent
+from ..subcommand import SubCommand
 from ..config import LoadedConfig
 from ..executable import Executable
 from ..misc import are_you_sure

src/kiwi/subcommands/new.py

@@ -4,10 +4,8 @@ import os
 import shutil
 
 # local
-from ._subcommand import ProjectCommand
-
-# parent
 from .._constants import DEFAULT_DOCKER_COMPOSE_NAME
+from ..subcommand import ProjectCommand
 
 
 class NewCommand(ProjectCommand):

src/kiwi/subcommands/pull.py

@@ -1,5 +1,5 @@
 # local
-from ._subcommand import ServiceCommand
+from ..subcommand import ServiceCommand
 
 
 class PullCommand(ServiceCommand):

src/kiwi/subcommands/push.py

@@ -1,5 +1,5 @@
 # local
-from ._subcommand import ServiceCommand
+from ..subcommand import ServiceCommand
 
 
 class PushCommand(ServiceCommand):

src/kiwi/subcommands/sh.py

@@ -3,9 +3,7 @@ import logging
 import subprocess
 
 # local
-from ._subcommand import ServiceCommand
-
-# parent
+from ..subcommand import ServiceCommand
 from ..config import LoadedConfig
 
 

src/kiwi/subcommands/show.py

@@ -1,7 +1,5 @@
 # local
-from ._subcommand import SubCommand
-
-# parent
+from ..subcommand import SubCommand
 from ..config import LoadedConfig
 
 

src/kiwi/subcommands/up.py

@@ -1,5 +1,5 @@
 # local
-from ._subcommand import ServiceCommand
+from ..subcommand import ServiceCommand
 
 
 class UpCommand(ServiceCommand):

src/kiwi/subcommands/update.py

@@ -1,7 +1,5 @@
 # local
-from ._subcommand import ServiceCommand
-
-# parent
+from ..subcommand import ServiceCommand
 from ..misc import are_you_sure