[blivet:master 2/5] Do not use implicit relative imports

mulhern amulhern at redhat.com
Wed Apr 2 18:30:45 UTC 2014


Import explicitly.

Note that "from <relative import> import <name>" seems to actually fail,
even though "import <relative import>" seems to succeed.

Signed-off-by: mulhern <amulhern at redhat.com>
---
 tests/action_test.py                 | 2 +-
 tests/devicelibs_test/btrfs_test.py  | 3 ++-
 tests/devicelibs_test/crypto_test.py | 3 ++-
 tests/devicelibs_test/lvm_test.py    | 3 ++-
 tests/devicelibs_test/mdraid_test.py | 3 ++-
 tests/devicelibs_test/swap_test.py   | 3 ++-
 tests/formats_test/fslabeling.py     | 2 +-
 tests/formats_test/labeling_test.py  | 2 +-
 tests/formats_test/selinux_test.py   | 2 +-
 9 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/tests/action_test.py b/tests/action_test.py
index 8f6b82f..4da2139 100644
--- a/tests/action_test.py
+++ b/tests/action_test.py
@@ -3,7 +3,7 @@
 import unittest
 from mock import Mock
 
-from storagetestcase import StorageTestCase
+from tests.storagetestcase import StorageTestCase
 import blivet
 from blivet.formats import getFormat
 from blivet.size import Size
diff --git a/tests/devicelibs_test/btrfs_test.py b/tests/devicelibs_test/btrfs_test.py
index 43e9a89..012d557 100755
--- a/tests/devicelibs_test/btrfs_test.py
+++ b/tests/devicelibs_test/btrfs_test.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-import baseclass
 import os
 import os.path
 import subprocess
@@ -9,6 +8,8 @@ import unittest
 import blivet.devicelibs.btrfs as btrfs
 import blivet.util as util
 
+import tests.devicelibs_test.baseclass as baseclass
+
 class BTRFSMountDevice(baseclass.DevicelibsTestCase):
     """A superclass that mounts and unmounts the filesystem.
        It must create the filesystem on its chosen devices before mounting.
diff --git a/tests/devicelibs_test/crypto_test.py b/tests/devicelibs_test/crypto_test.py
index 1a96fd4..e395dfa 100755
--- a/tests/devicelibs_test/crypto_test.py
+++ b/tests/devicelibs_test/crypto_test.py
@@ -1,10 +1,11 @@
 #!/usr/bin/python
-import baseclass
 import unittest
 
 import tempfile
 import os
 
+from tests.devicelibs_test import baseclass
+
 #FIXME: some of these tests expect behavior which is not correct
 #
 #The following is a list of the known incorrect behaviors:
diff --git a/tests/devicelibs_test/lvm_test.py b/tests/devicelibs_test/lvm_test.py
index 98c5bd0..ada2128 100755
--- a/tests/devicelibs_test/lvm_test.py
+++ b/tests/devicelibs_test/lvm_test.py
@@ -1,11 +1,12 @@
 #!/usr/bin/python
-import baseclass
 import os
 import unittest
 
 import blivet.devicelibs.lvm as lvm
 from blivet.size import Size
 
+from tests.devicelibs_test import baseclass
+
 class LVMTestCase(unittest.TestCase):
 
     def testGetPossiblePhysicalExtents(self):
diff --git a/tests/devicelibs_test/mdraid_test.py b/tests/devicelibs_test/mdraid_test.py
index 1ff710f..19a16ef 100755
--- a/tests/devicelibs_test/mdraid_test.py
+++ b/tests/devicelibs_test/mdraid_test.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-import baseclass
 import os
 import unittest
 import time
@@ -8,6 +7,8 @@ import blivet.devicelibs.mdraid as mdraid
 import blivet.errors as errors
 from blivet.size import Size
 
+from tests.devicelibs_test import baseclass
+
 class MDRaidTestCase(unittest.TestCase):
 
     def testMDRaid(self):
diff --git a/tests/devicelibs_test/swap_test.py b/tests/devicelibs_test/swap_test.py
index a71c1af..4a721f6 100755
--- a/tests/devicelibs_test/swap_test.py
+++ b/tests/devicelibs_test/swap_test.py
@@ -1,8 +1,9 @@
 #!/usr/bin/python
-import baseclass
 import os
 import unittest
 
+from tests.devicelibs_test import baseclass
+
 class SwapTestCase(baseclass.DevicelibsTestCase):
 
     @unittest.skipUnless(os.geteuid() == 0, "requires root privileges")
diff --git a/tests/formats_test/fslabeling.py b/tests/formats_test/fslabeling.py
index 0babedf..4f24c8d 100644
--- a/tests/formats_test/fslabeling.py
+++ b/tests/formats_test/fslabeling.py
@@ -3,7 +3,7 @@
 import os
 import unittest
 
-from devicelibs_test import baseclass
+from tests.devicelibs_test import baseclass
 
 import blivet.formats.fs as fs
 
diff --git a/tests/formats_test/labeling_test.py b/tests/formats_test/labeling_test.py
index a560c39..ff08629 100755
--- a/tests/formats_test/labeling_test.py
+++ b/tests/formats_test/labeling_test.py
@@ -2,7 +2,7 @@
 import os
 import unittest
 
-from devicelibs_test import baseclass
+from tests.devicelibs_test import baseclass
 from blivet.formats import device_formats
 import blivet.formats.fs as fs
 import blivet.formats.swap as swap
diff --git a/tests/formats_test/selinux_test.py b/tests/formats_test/selinux_test.py
index edd299e..f26b907 100755
--- a/tests/formats_test/selinux_test.py
+++ b/tests/formats_test/selinux_test.py
@@ -5,7 +5,7 @@ import tempfile
 import unittest
 
 import blivet
-from devicelibs_test import baseclass
+from tests.devicelibs_test import baseclass
 from blivet.formats import device_formats
 import blivet.formats.fs as fs
 
-- 
1.8.3.1



More information about the anaconda-patches mailing list