Cleanup imports part 2

[nitsi.git] / src / nitsi / machine.py

diff --git a/src/nitsi/machine.py b/src/nitsi/machine.py
index 4e60323a159420531cbf1e652a6d34040a3bbacd..0b4617aed8dcbb0df1ec094a414dbfce73621e42 100644 (file)
--- a/src/nitsi/machine.py
+++ b/src/nitsi/machine.py
@@ -5,8 +5,8 @@ import logging
 import os
 import xml.etree.ElementTree as ET
 
-from .disk import disk
-from .serial_connection import serial_connection
+from . import disk
+from . import serial_connection
 
 logger = logging.getLogger("nitsi.machine")
 
@@ -41,7 +41,7 @@ class machine():
             self.log.error("No such file: {}".format(self.image))
 
         self.root_uid = root_uid
-        self.disk = disk(image)
+        self.disk = disk.disk(image)
 
         self.username = username
         self.password = password
@@ -106,7 +106,7 @@ class machine():
         return elem.text
 
     def check_is_booted_up(self):
-        serial_con = serial_connection(self.get_serial_device())
+        serial_con = serial_connection.serial_connection(self.get_serial_device())
 
         serial_con.write("\n")
         # This will block till the domain is booted up
@@ -116,7 +116,7 @@ class machine():
 
     def login(self, log_file, log_start_time=None, longest_machine_name=10):
         try:
-            self.serial_con = serial_connection(self.get_serial_device(),
+            self.serial_con = serial_connection.serial_connection(self.get_serial_device(),
                                 username=self.username,
                                 log_file=log_file,
                                 log_start_time=log_start_time,