From 2b898c094a88f99e987f48a7d116d4a6009b456c Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Wed, 22 Aug 2012 15:15:43 -0400
Subject: tweaked tests for python 2.5

---
 testsuite/Testlib/TestOptions.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'testsuite/Testlib/TestOptions.py')

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
-- 
cgit v1.2.3-1-g7c22