summaryrefslogtreecommitdiffstats
path: root/testsuite/Testlib/TestOptions.py
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/Testlib/TestOptions.py')
-rw-r--r--testsuite/Testlib/TestOptions.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/testsuite/Testlib/TestOptions.py b/testsuite/Testlib/TestOptions.py
index e49fe6a25..102ef5166 100644
--- a/testsuite/Testlib/TestOptions.py
+++ b/testsuite/Testlib/TestOptions.py
@@ -2,7 +2,9 @@ import os
import sys
from mock import Mock, MagicMock, patch
from Bcfg2.Options import *
-from ..common import *
+# python 2.5 can't import * from relative imports
+from ..common import XI_NAMESPACE, XI, inPy3k, call, builtins, u, can_skip, \
+ skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, patchIf
# Compatibility imports
from Bcfg2.Bcfg2Py3k import ConfigParser