From c83391555c0773a02dfd9fd482b3415c5bba4104 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 7 Sep 2012 08:10:31 -0400 Subject: testsuite: fixed patch scoping issues in py3k --- .../Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py') diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py index 556487288..18855a631 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py @@ -13,9 +13,8 @@ while 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 +from common import call, skip, skipIf, skipUnless, Bcfg2TestCase, patchIf, \ + datastore from TestPlugin import TestDirectoryBacked, TestConnector, TestPlugin, \ TestFileBacked -- cgit v1.2.3-1-g7c22