diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-22 15:15:43 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-22 15:15:43 -0400 |
| commit | 2b898c094a88f99e987f48a7d116d4a6009b456c (patch) | |
| tree | 8ed5419373109592dc05398f41e1f8af79b71dd2 /testsuite/Testlib/TestOptions.py | |
| parent | a899adb987e3bdce30d7241ad0dc1ff77606f4b9 (diff) | |
| download | bcfg2-2b898c094a88f99e987f48a7d116d4a6009b456c.tar.gz bcfg2-2b898c094a88f99e987f48a7d116d4a6009b456c.tar.bz2 bcfg2-2b898c094a88f99e987f48a7d116d4a6009b456c.zip | |
tweaked tests for python 2.5
Diffstat (limited to 'testsuite/Testlib/TestOptions.py')
| -rw-r--r-- | testsuite/Testlib/TestOptions.py | 4 |
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 |