summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-27 15:02:39 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-27 20:59:58 -0400
commitc07cc475cbafec24e747d6907f3bf7257e441934 (patch)
treefee9fec976c1b18eaddb17a027350ff908286847 /testsuite
parenta9a7ba9da3c67766bf27f462bd4d32c0dd2caa6c (diff)
downloadbcfg2-c07cc475cbafec24e747d6907f3bf7257e441934.tar.gz
bcfg2-c07cc475cbafec24e747d6907f3bf7257e441934.tar.bz2
bcfg2-c07cc475cbafec24e747d6907f3bf7257e441934.zip
renamed Bcfg2Py3k to Compat
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py2
-rw-r--r--testsuite/Testlib/TestOptions.py2
-rw-r--r--testsuite/Testlib/TestServer/TestPlugin.py2
-rw-r--r--testsuite/Testlib/TestServer/TestPlugins/TestSEModules.py2
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 *