lvmdbusd: Correct imports

daemons/lvmdbusd/cfg.py

@@ -11,10 +11,8 @@ import os
 import multiprocessing
 import queue
 import itertools
-try:
+
-	from . import path
+from lvmdbusd import path
-except SystemError:
-	import path
 
 LVM_CMD = os.getenv('LVM_BINARY', path.LVM_BINARY)
 

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 lvmdbusd.cfg import LVM_CMD
-	from .cfg import LVM_CMD
+from lvmdbusd.utils import log_debug, log_error
-	from .utils import log_debug, log_error
-except:
-	from cfg import LVM_CMD
-	from utils import log_debug, log_error
 
 SHELL_PROMPT = "lvm> "
 

daemons/lvmdbusd/lvmdb.py

@@ -15,12 +15,8 @@ import pprint as prettyprint
 import os
 import sys
 
-try:
+from lvmdbusd import cmdhandler
-	from . import cmdhandler
+from lvmdbusd.utils import log_debug, log_error
-	from .utils import log_debug, log_error
-except SystemError:
-	import cmdhandler
-	from utils import log_debug
 
 
 class DataStore(object):

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())

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())