From 30521dad9f963945807e3cd18cf2e60bf9e9f44a Mon Sep 17 00:00:00 2001
From: Plamen Dimitrov <pdimitrov@pevogam.com>
Date: Wed, 26 Sep 2018 23:25:19 +0800
Subject: [PATCH] Adapt all internal imports in relative fashion

We were modifying the system path before but now we can use
cleaner importing approach.
---
 src/arnied_wrapper.py |    7 ++++---
 src/dial.py           |    6 +++---
 src/mail_utils.py     |    2 +-
 src/mk_config.py      |    8 ++++----
 src/simple_cnf.py     |    8 ++++----
 src/web_interface.py  |    2 +-
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/arnied_wrapper.py b/src/arnied_wrapper.py
index 34c7cf3..bda410e 100644
--- a/src/arnied_wrapper.py
+++ b/src/arnied_wrapper.py
@@ -57,9 +57,10 @@ import tempfile
 import logging
 log = logging.getLogger('arnied_wrapper')
 
-from cnfline import build_cnfvar
-import cnfvar
-import sysmisc
+from .cnfline import build_cnfvar
+from . import cnfvar
+from . import sysmisc
+
 
 #: default set_cnf binary
 BIN_SET_CNF = "/usr/intranator/bin/set_cnf"
diff --git a/src/dial.py b/src/dial.py
index 5b778de..c4f9436 100644
--- a/src/dial.py
+++ b/src/dial.py
@@ -65,9 +65,9 @@ import time
 import logging
 log = logging.getLogger('dial')
 
-import arnied_wrapper
-import simple_cnf
-import sysmisc
+from . import arnied_wrapper
+from . import simple_cnf
+from . import sysmisc
 
 HAVE_IPADDRESS = True
 try:
diff --git a/src/mail_utils.py b/src/mail_utils.py
index a813931..cfdb0aa 100644
--- a/src/mail_utils.py
+++ b/src/mail_utils.py
@@ -55,7 +55,7 @@ from email.utils import formatdate
 from email.parser import Parser
 import mimetypes
 
-import arnied_wrapper
+from . import arnied_wrapper
 
 
 class EmailException(Exception):
diff --git a/src/mk_config.py b/src/mk_config.py
index 58a4d86..f616938 100644
--- a/src/mk_config.py
+++ b/src/mk_config.py
@@ -42,10 +42,10 @@ import logging
 log = logging.getLogger('mk_config')
 
 # custom imports
-import arnied_wrapper as aw
-from arnied_wrapper import Delete, Update, Add, Child, batch_update_cnf, build_cnf
-from cnfline import build_cnfvar, build_group, build_intraclient
-from cnfline import build_nic, build_provider, build_user
+from . import arnied_wrapper as aw
+from .arnied_wrapper import Delete, Update, Add, Child, batch_update_cnf, build_cnf
+from .cnfline import build_cnfvar, build_group, build_intraclient
+from .cnfline import build_nic, build_provider, build_user
 
 
 ###############################################################################
diff --git a/src/simple_cnf.py b/src/simple_cnf.py
index 6cd24d8..79680ce 100644
--- a/src/simple_cnf.py
+++ b/src/simple_cnf.py
@@ -59,15 +59,15 @@ INTERFACE
 """
 
 import os
+import json
 import tempfile
 import time
 import logging
 log = logging.getLogger('simple_cnf')
 
-import arnied_wrapper
-import cnfvar
-import sysmisc
-import json
+from . import arnied_wrapper
+from . import cnfvar
+from . import sysmisc
 
 ###############################################################################
 #                                  constants
diff --git a/src/web_interface.py b/src/web_interface.py
index abcdd6f..d2acb47 100644
--- a/src/web_interface.py
+++ b/src/web_interface.py
@@ -38,7 +38,7 @@ import urllib.parse as parse
 import logging
 log = logging.getLogger('web_interface')
 
-from arnied_wrapper import accept_licence
+from .arnied_wrapper import accept_licence
 
 
 def find_in_form(regex, form="status", escape=False):
-- 
1.7.1