organized imports

src/kiwi-config.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python3
+
+# system
 import logging
 
+# local
 import kiwi
 
 

src/kiwi/__init__.py

@@ -1,3 +1,4 @@
+# local
 from .parser import Parser
 from .runner import Runner
 

src/kiwi/_constants.py

@@ -1,3 +1,4 @@
+# system
 import os
 
 KIWI_ROOT = os.getenv('KIWI_ROOT', ".")

src/kiwi/config.py

@@ -1,9 +1,11 @@
+# system
 import copy
 import logging
-import re
 import os
+import re
 import yaml
 
+# local
 from ._constants import KIWI_ROOT, KIWI_CONF_NAME
 
 ###########

src/kiwi/parser.py

@@ -1,3 +1,4 @@
+# system
 import argparse
 
 

src/kiwi/runner.py

@@ -1,5 +1,7 @@
+# system
 import logging
 
+# local
 from .config import LoadedConfig
 from .parser import Parser
 from .subcommands import *

src/kiwi/subcommands/__init__.py

@@ -1,9 +1,10 @@
+# local
 from .init import InitCommand
-from .show import ShowCommand
 from .logs import LogsCommand
+from .show import ShowCommand
 
 __all__ = [
     'InitCommand',
-    'ShowCommand',
+    'LogsCommand',
-    'LogsCommand'
+    'ShowCommand'
 ]

src/kiwi/subcommands/_subcommand.py

@@ -1,3 +1,4 @@
+# parent
 from ..parser import Parser
 
 
@@ -14,5 +15,3 @@ class SubCommand:
 
     def run(self, config, args):
         pass
-
-

src/kiwi/subcommands/init.py

@@ -1,9 +1,11 @@
+# system
 import logging
 import os
 
+# parent (display purposes only)
 from .._constants import KIWI_CONF_NAME
-from ..config import DefaultConfig
 
+# local
 from ._subcommand import SubCommand
 
 
@@ -37,6 +39,8 @@ class InitCommand(SubCommand):
         logging.info(f"Initializing kiwi-config instance in '{os.getcwd()}'")
 
         if args.force and os.path.isfile(KIWI_CONF_NAME):
+            from ..config import DefaultConfig
+
             logging.warning(f"Overwriting existing '{KIWI_CONF_NAME}'!")
             config = DefaultConfig.get()
 

src/kiwi/subcommands/logs.py

@@ -1,5 +1,7 @@
+# system
 import logging
 
+# local
 from ._subcommand import SubCommand
 from .utils.dockercommand import DockerCommand
 

src/kiwi/subcommands/show.py

@@ -1,3 +1,4 @@
+# local
 from ._subcommand import SubCommand
 
 

src/kiwi/subcommands/utils/dockercommand.py

@@ -1,5 +1,7 @@
+# system
 import subprocess
 
+# local
 from .executable import Executable
 
 

src/kiwi/subcommands/utils/executable.py

@@ -1,5 +1,6 @@
-import os
+# system
 import logging
+import os
 import subprocess