namespace issue fixed!

aif/disk/__init__.py

@@ -1,28 +1,29 @@
-try:
-    from . import block
-except ImportError:
-    from . import block_fallback as block
-try:
-    from . import filesystem_fallback
-except ImportError:
-    from . import filesystem_fallback as filesystem
-
-try:
-    from . import luks_fallback
-except ImportError:
-    from . import luks_fallback as luks
-
-try:
-    from . import lvm_fallback
-except ImportError:
-    from . import lvm_fallback as lvm
-
-try:
-    from . import mdadm_fallback
-except ImportError:
-    from . import mdadm_fallback as mdadm
-
 try:
     from . import _common
 except ImportError:
     pass  # GI isn't supported, so we don't even use a fallback.
+
+try:
+    from . import block
+except ImportError:
+    from . import block_fallback as block
+
+try:
+    from . import filesystem
+except ImportError:
+    from . import filesystem_fallback as filesystem
+
+try:
+    from . import luks
+except ImportError:
+    from . import luks_fallback as luks
+
+try:
+    from . import lvm
+except ImportError:
+    from . import lvm_fallback as lvm
+
+try:
+    from . import mdadm
+except ImportError:
+    from . import mdadm_fallback as mdadm

aif/disk/block.py

@@ -1,13 +1,14 @@
 import re
 ##
-import parted
+import parted  # Do I need this if I can have libblockdev's mounts API? Is there a way to get current mounts?
 import psutil
 ##
 import aif.constants
-import aif.disk._common
 import aif.utils
+from . import _common
 
-_BlockDev = aif.disk._common.BlockDev
+
+_BlockDev = _common.BlockDev
 
 
 class Partition(object):