lvmdbusd: Correct imports

5 files changed, 9 insertions, 23 deletions

diff --git a/daemons/lvmdbusd/cfg.py b/daemons/lvmdbusd/cfg.py
index 1d773c315..8965ec73d 100644
--- a/daemons/lvmdbusd/cfg.py
+++ b/daemons/lvmdbusd/cfg.py
@@ -11,10 +11,8 @@ import os
 import multiprocessing
 import queue
 import itertools
-try:
-	from . import path
-except SystemError:
-	import path
+
+from lvmdbusd import path
 
 LVM_CMD = os.getenv('LVM_BINARY', path.LVM_BINARY)
 
diff --git a/daemons/lvmdbusd/lvm_shell_proxy.py b/daemons/lvmdbusd/lvm_shell_proxy.py
index 3455342a7..910ac2c63 100755
--- a/daemons/lvmdbusd/lvm_shell_proxy.py
+++ b/daemons/lvmdbusd/lvm_shell_proxy.py
@@ -23,18 +23,13 @@ import select
 import copy
 
 try:
-	from simplejson.scanner import JSONDecodeError
 	import simplejson as json
 except ImportError:
 	import json
 
 
-try:
-	from .cfg import LVM_CMD
-	from .utils import log_debug, log_error
-except:
-	from cfg import LVM_CMD
-	from utils import log_debug, log_error
+from lvmdbusd.cfg import LVM_CMD
+from lvmdbusd.utils import log_debug, log_error
 
 SHELL_PROMPT = "lvm> "
 
diff --git a/daemons/lvmdbusd/lvmdb.py b/daemons/lvmdbusd/lvmdb.py
index 187a930d9..ac60a80a2 100755
--- a/daemons/lvmdbusd/lvmdb.py
+++ b/daemons/lvmdbusd/lvmdb.py
@@ -15,12 +15,8 @@ import pprint as prettyprint
 import os
 import sys
 
-try:
-	from . import cmdhandler
-	from .utils import log_debug, log_error
-except SystemError:
-	import cmdhandler
-	from utils import log_debug
+from lvmdbusd import cmdhandler
+from lvmdbusd.utils import log_debug, log_error
 
 
 class DataStore(object):
diff --git a/daemons/lvmdbusd/lvmdbusd b/daemons/lvmdbusd/lvmdbusd
index 7ea243baa..73d0f130d 100755
--- a/daemons/lvmdbusd/lvmdbusd
+++ b/daemons/lvmdbusd/lvmdbusd
@@ -10,7 +10,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import sys
-import lvmdbusd
+from lvmdbusd import main
 
 if __name__ == '__main__':
-	sys.exit(lvmdbusd.main())
+	sys.exit(main())
diff --git a/daemons/lvmdbusd/utils.py b/daemons/lvmdbusd/utils.py
index c80290f2d..06301cd75 100644
--- a/daemons/lvmdbusd/utils.py
+++ b/daemons/lvmdbusd/utils.py
@@ -18,11 +18,8 @@ import datetime
 import dbus
 import dbus.service
 import dbus.mainloop.glib
+from lvmdbusd import cfg
 
-try:
-	from . import cfg
-except SystemError:
-	import cfg
 
 STDOUT_TTY = os.isatty(sys.stdout.fileno())