From 4d3e89b06977362707ccb0d7f70311181b4e0da8 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 23 Aug 2012 07:38:54 -0400 Subject: removed relative imports from testsuite for py2.4 compat --- testsuite/Testlib/TestOptions.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'testsuite/Testlib/TestOptions.py') diff --git a/testsuite/Testlib/TestOptions.py b/testsuite/Testlib/TestOptions.py index b3bd51eed..acb5c9bfc 100644 --- a/testsuite/Testlib/TestOptions.py +++ b/testsuite/Testlib/TestOptions.py @@ -2,14 +2,21 @@ import os import sys from mock import Mock, MagicMock, patch from Bcfg2.Options import * -# python 2.5 can't import * from relative imports -from ..common import XI_NAMESPACE, XI, inPy3k, call, builtins, u, can_skip, \ +from Bcfg2.Bcfg2Py3k import ConfigParser + +# add all parent testsuite directories to sys.path to allow (most) +# relative imports in python 2.4 +path = os.path.dirname(__file__) +while path != '/': + if os.path.basename(path).lower().startswith("test"): + sys.path.append(path) + if os.path.basename(path) == "testsuite": + break + path = os.path.dirname(path) +from common import XI_NAMESPACE, XI, inPy3k, call, builtins, u, can_skip, \ skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \ patchIf, datastore -# Compatibility imports -from Bcfg2.Bcfg2Py3k import ConfigParser - class TestDefaultConfigParser(Bcfg2TestCase): @patch("%s.ConfigParser.get" % ConfigParser.__name__) def test_get(self, mock_get): -- cgit v1.2.3-1-g7c22