From 2b898c094a88f99e987f48a7d116d4a6009b456c Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 22 Aug 2012 15:15:43 -0400 Subject: tweaked tests for python 2.5 --- testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py') diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py index 3eae8fe6b..29c17a320 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py @@ -5,7 +5,9 @@ import time import socket import lxml.etree from mock import Mock, patch -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 import Bcfg2.Server import Bcfg2.Server.Plugin from Bcfg2.Server.Plugins.Metadata import * -- cgit v1.2.3-1-g7c22