Sort imports: part 1

Fixes: #11717
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

diff --git a/nitsi.in b/nitsi.in
index f45dbe637fcf129aa03298e293cecc0f73851065..9296e19979ef16713ef9e3f992187296beafb9fb 100755 (executable)
--- a/nitsi.in
+++ b/nitsi.in
@@ -1,13 +1,11 @@
 #!/usr/bin/python3
 
-from nitsi.test import test
-from nitsi.logger import init_logging
-import logging
 import argparse
+import logging
 
+from nitsi.logger import init_logging
 from nitsi.recipe import RecipeExeption
-
-from nitsi.test import TestException
+from nitsi.test import TestException, test
 
 logger = logging.getLogger("nitsi")
 logger.setLevel(logging.DEBUG)
@@ -68,4 +66,4 @@ def main():
     return 0
 
 if __name__ == "__main__":
-    main()
\ No newline at end of file
+    main()

diff --git a/src/nitsi/disk.py b/src/nitsi/disk.py
index 44f9054a12a0e57d296070573f00dc68205edc15..29782574282ef39779c5b28c039fe78d5b52ea7e 100755 (executable)
--- a/src/nitsi/disk.py
+++ b/src/nitsi/disk.py
@@ -1,12 +1,10 @@
 #!/usr/bin/python3
 
 import guestfs
-
-import tempfile
-import tarfile
-import os
-
 import logging
+import os
+import tarfile
+import tempfile
 
 logger = logging.getLogger("nitsi.disk")
 
@@ -49,4 +47,4 @@ class disk():
 # test.mount("45598e92-3487-4a1b-961d-79aa3dd42a7d", "/")
 # test.copy_in("/home/jonatan/nitsi/libguestfs-test", "/root/")
 # test.umount("/")
-# test.close()
\ No newline at end of file
+# test.close()

diff --git a/src/nitsi/machine.py b/src/nitsi/machine.py
index 795a0b8d1a9551fbcff1d81a28d5599b18bc9ccc..4e60323a159420531cbf1e652a6d34040a3bbacd 100644 (file)
--- a/src/nitsi/machine.py
+++ b/src/nitsi/machine.py
@@ -1,15 +1,12 @@
 #!/usr/bin/python3
 
-import xml.etree.ElementTree as ET
-
-from nitsi.disk import disk
-
-from nitsi.serial_connection import serial_connection
-
-import os
 import libvirt
-
 import logging
+import os
+import xml.etree.ElementTree as ET
+
+from .disk import disk
+from .serial_connection import serial_connection
 
 logger = logging.getLogger("nitsi.machine")
 
@@ -142,4 +139,4 @@ class machine():
             self.log.error(e)
         finally:
             self.disk.umount("/")
-            self.disk.close()
\ No newline at end of file
+            self.disk.close()

diff --git a/src/nitsi/recipe.py b/src/nitsi/recipe.py
index 394f50b264574ab86335ba8c432599309cb6910d..56f1e755e63161a941f93626ca428679b6d42710 100644 (file)
--- a/src/nitsi/recipe.py
+++ b/src/nitsi/recipe.py
@@ -1,8 +1,7 @@
 #!/usr/bin/python3
 
-import os
-
 import logging
+import os
 
 logger = logging.getLogger("nitsi.recipe")
 

diff --git a/src/nitsi/serial_connection.py b/src/nitsi/serial_connection.py
index f9c04fea625c435c73b57fd521d246e41ece333f..35683161eebcb201e2cc2eb205de0b423fde7eeb 100644 (file)
--- a/src/nitsi/serial_connection.py
+++ b/src/nitsi/serial_connection.py
@@ -1,14 +1,13 @@
 #!/usr/bin/python3
-import serial
 
-import re
+import logging
 import os
-
-from time import sleep
+import re
+import serial
 import sys
-import logging
+import time
 
-from nitsi.logger import TestFormatter
+from .logger import TestFormatter
 
 logger = logging.getLogger("nitsi.serial")
 
@@ -213,4 +212,4 @@ class serial_connection():
         data = data.decode().replace("END: ", "")
         self.log.debug(data)
         self.log.debug(data.strip())
-        return data.strip()
\ No newline at end of file
+        return data.strip()

diff --git a/src/nitsi/test.py b/src/nitsi/test.py
index 1f7728f2f3b4747c40e5960b72b64a8e4abe2583..95db2136a047f96fc652d6e028b11da2dd5cab75 100755 (executable)
--- a/src/nitsi/test.py
+++ b/src/nitsi/test.py
@@ -1,18 +1,13 @@
 #!/usr/bin/python3
 
-
+import configparser
 import libvirt
-
+import logging
 import os
-
-import configparser
-
 import time
 
-from nitsi.virtual_environ import virtual_environ
-from nitsi.recipe import recipe
-
-import logging
+from .recipe import recipe
+from .virtual_environ import virtual_environ
 
 logger = logging.getLogger("nitsi.test")
 
@@ -124,6 +119,3 @@ class test():
 
         for name in self.virtual_environ.network_names:
             self.virtual_networks[name].undefine()
-
-
-

diff --git a/src/nitsi/virtual_environ.py b/src/nitsi/virtual_environ.py
index 3dc86fdae9329f368d45cccdad1ca987ec022bd5..1a086b51a886b7f8d2a76fb91c12f755cba5494c 100644 (file)
--- a/src/nitsi/virtual_environ.py
+++ b/src/nitsi/virtual_environ.py
@@ -1,13 +1,12 @@
 #!/usr/bin/python3
 
-from nitsi.machine import machine
-
-from nitsi.network import network
-
-import os
 import configparser
 import libvirt
 import logging
+import os
+
+from .machine import machine
+from .network import network
 
 logger = logging.getLogger("nitsi.virtual_environ")
 
@@ -96,4 +95,4 @@ class virtual_environ():
                 if len(_machine) > self._longest_machine_name:
                     self._longest_machine_name = len(_machine)
 
-            return self._longest_machine_name
\ No newline at end of file
+            return self._longest_machine_name