diff options
Diffstat (limited to 'testsuite/Testlib')
4 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py index 5b6d3b1dc..4f073e443 100644 --- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py +++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py @@ -5,7 +5,7 @@ import copy import difflib import binascii import lxml.etree -from Bcfg2.Bcfg2Py3k import b64encode, b64decode, u_str +from Bcfg2.Compat import b64encode, b64decode, u_str from mock import Mock, MagicMock, patch from Bcfg2.Client.Tools.POSIX.File import * diff --git a/testsuite/Testlib/TestOptions.py b/testsuite/Testlib/TestOptions.py index acb5c9bfc..e20a320b1 100644 --- a/testsuite/Testlib/TestOptions.py +++ b/testsuite/Testlib/TestOptions.py @@ -2,7 +2,7 @@ import os import sys from mock import Mock, MagicMock, patch from Bcfg2.Options import * -from Bcfg2.Bcfg2Py3k import ConfigParser +from Bcfg2.Compat import ConfigParser # add all parent testsuite directories to sys.path to allow (most) # relative imports in python 2.4 diff --git a/testsuite/Testlib/TestServer/TestPlugin.py b/testsuite/Testlib/TestServer/TestPlugin.py index c2dee9962..7ea5b9b42 100644 --- a/testsuite/Testlib/TestServer/TestPlugin.py +++ b/testsuite/Testlib/TestServer/TestPlugin.py @@ -5,7 +5,7 @@ import copy import logging import lxml.etree import Bcfg2.Server -from Bcfg2.Bcfg2Py3k import reduce +from Bcfg2.Compat import reduce from mock import Mock, MagicMock, patch from Bcfg2.Server.Plugin import * diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestSEModules.py b/testsuite/Testlib/TestServer/TestPlugins/TestSEModules.py index bacb80d3f..c319ed663 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestSEModules.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestSEModules.py @@ -2,7 +2,7 @@ import os import sys import lxml.etree import Bcfg2.Server.Plugin -from Bcfg2.Bcfg2Py3k import b64encode +from Bcfg2.Compat import b64encode from mock import Mock, MagicMock, patch from Bcfg2.Server.Plugins.SEModules import * |