renamed Bcfg2Py3k to Compat

62 files changed, 69 insertions, 66 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py
index 52d4e6a3f..31d3a1971 100644
--- a/src/lib/Bcfg2/Client/Tools/Action.py
+++ b/src/lib/Bcfg2/Client/Tools/Action.py
@@ -2,7 +2,7 @@
 
 import Bcfg2.Client.Tools
 from Bcfg2.Client.Frame import matches_white_list, passes_black_list
-from Bcfg2.Bcfg2Py3k import input
+from Bcfg2.Compat import input
 
 """
 <Action timing='pre|post|both'
diff --git a/src/lib/Bcfg2/Client/Tools/POSIX/File.py b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
index 26550078e..95a3e5ddf 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIX/File.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIX/File.py
@@ -9,7 +9,7 @@ try:
 except ImportError:
     # py3k, incompatible syntax with py2.4
     exec("from .base import POSIXTool")
-from Bcfg2.Bcfg2Py3k import unicode, b64encode, b64decode
+from Bcfg2.Compat import unicode, b64encode, b64decode
 
 class POSIXFile(POSIXTool):
     __req__ = ['name', 'perms', 'owner', 'group']
diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py
index 026c7ade0..b38eca739 100644
--- a/src/lib/Bcfg2/Client/Tools/__init__.py
+++ b/src/lib/Bcfg2/Client/Tools/__init__.py
@@ -7,7 +7,7 @@ import pkgutil
 from subprocess import Popen, PIPE
 
 import Bcfg2.Client.XML
-from Bcfg2.Bcfg2Py3k import input
+from Bcfg2.Compat import input
 
 if hasattr(pkgutil, 'walk_packages'):
     submodules = pkgutil.walk_packages(path=__path__)
diff --git a/src/lib/Bcfg2/Bcfg2Py3k.py b/src/lib/Bcfg2/Compat.py
index be5175e62..be3954f3b 100644
--- a/src/lib/Bcfg2/Bcfg2Py3k.py
+++ b/src/lib/Bcfg2/Compat.py
@@ -1,3 +1,6 @@
+""" Compatibility imports, mostly for Py3k support, but also for
+Python 2.4 and such-like """
+
 import sys
 
 try:
diff --git a/src/lib/Bcfg2/Component.py b/src/lib/Bcfg2/Component.py
index bb0e64102..b6c14e987 100644
--- a/src/lib/Bcfg2/Component.py
+++ b/src/lib/Bcfg2/Component.py
@@ -15,7 +15,7 @@ import Bcfg2.Logger
 from Bcfg2.Statistics import Statistics
 from Bcfg2.SSLServer import XMLRPCServer
 # Compatibility import
-from Bcfg2.Bcfg2Py3k import xmlrpclib, urlparse
+from Bcfg2.Compat import xmlrpclib, urlparse
 
 logger = logging.getLogger()
 
diff --git a/src/lib/Bcfg2/Encryption.py b/src/lib/Bcfg2/Encryption.py
index 62b22d7de..355b49814 100755
--- a/src/lib/Bcfg2/Encryption.py
+++ b/src/lib/Bcfg2/Encryption.py
@@ -4,7 +4,7 @@ import os
 import base64
 from M2Crypto import Rand
 from M2Crypto.EVP import Cipher, EVPError
-from Bcfg2.Bcfg2Py3k import StringIO
+from Bcfg2.Compat import StringIO
 
 try:
     from hashlib import md5
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py
index 1883bc222..72a7108e9 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -9,7 +9,7 @@ import shlex
 import sys
 import Bcfg2.Client.Tools
 # Compatibility imports
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
 from Bcfg2.version import __version__
 
 
diff --git a/src/lib/Bcfg2/Proxy.py b/src/lib/Bcfg2/Proxy.py
index 220b89b5f..5a5129939 100644
--- a/src/lib/Bcfg2/Proxy.py
+++ b/src/lib/Bcfg2/Proxy.py
@@ -21,7 +21,7 @@ import sys
 import time
 
 # Compatibility imports
-from Bcfg2.Bcfg2Py3k import httplib, xmlrpclib, urlparse
+from Bcfg2.Compat import httplib, xmlrpclib, urlparse
 
 version = sys.version_info[:2]
 has_py26 = version >= (2, 6)
diff --git a/src/lib/Bcfg2/SSLServer.py b/src/lib/Bcfg2/SSLServer.py
index aef44e419..f0ee82815 100644
--- a/src/lib/Bcfg2/SSLServer.py
+++ b/src/lib/Bcfg2/SSLServer.py
@@ -15,7 +15,7 @@ import ssl
 import threading
 import time
 # Compatibility imports
-from Bcfg2.Bcfg2Py3k import xmlrpclib, SimpleXMLRPCServer, SocketServer
+from Bcfg2.Compat import xmlrpclib, SimpleXMLRPCServer, SocketServer
 
 
 class ForkedChild(Exception):
diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py
index fefd17d6a..c024f3228 100644
--- a/src/lib/Bcfg2/Server/Admin/Init.py
+++ b/src/lib/Bcfg2/Server/Admin/Init.py
@@ -10,7 +10,7 @@ import subprocess
 import Bcfg2.Server.Admin
 import Bcfg2.Server.Plugin
 import Bcfg2.Options
-from Bcfg2.Bcfg2Py3k import input
+from Bcfg2.Compat import input
 
 # default config file
 config = '''
diff --git a/src/lib/Bcfg2/Server/Admin/Pull.py b/src/lib/Bcfg2/Server/Admin/Pull.py
index 64327e018..1ddb9c2ad 100644
--- a/src/lib/Bcfg2/Server/Admin/Pull.py
+++ b/src/lib/Bcfg2/Server/Admin/Pull.py
@@ -2,7 +2,7 @@ import getopt
 import sys
 
 import Bcfg2.Server.Admin
-from Bcfg2.Bcfg2Py3k import input
+from Bcfg2.Compat import input
 
 
 class Pull(Bcfg2.Server.Admin.MetadataCore):
diff --git a/src/lib/Bcfg2/Server/Admin/Reports.py b/src/lib/Bcfg2/Server/Admin/Reports.py
index 335d6a1e7..7d78c3dc1 100644
--- a/src/lib/Bcfg2/Server/Admin/Reports.py
+++ b/src/lib/Bcfg2/Server/Admin/Reports.py
@@ -11,7 +11,7 @@ import traceback
 from lxml.etree import XML, XMLSyntaxError
 
 # Compatibility import
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
 
 # FIXME: Remove when server python dep is 2.5 or greater
 if sys.version_info >= (2, 5):
diff --git a/src/lib/Bcfg2/Server/Admin/Snapshots.py b/src/lib/Bcfg2/Server/Admin/Snapshots.py
index 8bc56f1f1..36e3dfe02 100644
--- a/src/lib/Bcfg2/Server/Admin/Snapshots.py
+++ b/src/lib/Bcfg2/Server/Admin/Snapshots.py
@@ -9,7 +9,7 @@ import Bcfg2.Server.Snapshots.model
 from Bcfg2.Server.Snapshots.model import Snapshot, Client, Metadata, Base, \
      File, Group, Package, Service
 # Compatibility import
-from Bcfg2.Bcfg2Py3k import u_str
+from Bcfg2.Compat import u_str
 
 class Snapshots(Bcfg2.Server.Admin.Mode):
     __shorthelp__ = "Interact with the Snapshots system"
diff --git a/src/lib/Bcfg2/Server/Admin/Tidy.py b/src/lib/Bcfg2/Server/Admin/Tidy.py
index 65aa955b4..8a417a427 100644
--- a/src/lib/Bcfg2/Server/Admin/Tidy.py
+++ b/src/lib/Bcfg2/Server/Admin/Tidy.py
@@ -3,7 +3,7 @@ import re
 import socket
 
 import Bcfg2.Server.Admin
-from Bcfg2.Bcfg2Py3k import input
+from Bcfg2.Compat import input
 
 
 class Tidy(Bcfg2.Server.Admin.Mode):
diff --git a/src/lib/Bcfg2/Server/Admin/Xcmd.py b/src/lib/Bcfg2/Server/Admin/Xcmd.py
index 140465468..ca07f50aa 100644
--- a/src/lib/Bcfg2/Server/Admin/Xcmd.py
+++ b/src/lib/Bcfg2/Server/Admin/Xcmd.py
@@ -5,7 +5,7 @@ import Bcfg2.Proxy
 import Bcfg2.Server.Admin
 
 # Compatibility import
-from Bcfg2.Bcfg2Py3k import xmlrpclib
+from Bcfg2.Compat import xmlrpclib
 
 
 class Xcmd(Bcfg2.Server.Admin.Mode):
diff --git a/src/lib/Bcfg2/Server/Admin/__init__.py b/src/lib/Bcfg2/Server/Admin/__init__.py
index 3a7ba45cf..a33b4cc13 100644
--- a/src/lib/Bcfg2/Server/Admin/__init__.py
+++ b/src/lib/Bcfg2/Server/Admin/__init__.py
@@ -24,7 +24,7 @@ import sys
 import Bcfg2.Server.Core
 import Bcfg2.Options
 # Compatibility import
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
 
 
 class ModeOperationError(Exception):
diff --git a/src/lib/Bcfg2/Server/BuiltinCore.py b/src/lib/Bcfg2/Server/BuiltinCore.py
index c52c49931..0a3e740cb 100644
--- a/src/lib/Bcfg2/Server/BuiltinCore.py
+++ b/src/lib/Bcfg2/Server/BuiltinCore.py
@@ -6,7 +6,7 @@ import time
 import socket
 import logging
 from Bcfg2.Server.Core import BaseCore
-from Bcfg2.Bcfg2Py3k import xmlrpclib, urlparse
+from Bcfg2.Compat import xmlrpclib, urlparse
 from Bcfg2.SSLServer import XMLRPCServer
 
 logger = logging.getLogger()
diff --git a/src/lib/Bcfg2/Server/CherryPyCore.py b/src/lib/Bcfg2/Server/CherryPyCore.py
index 91e7f89bd..7fc73fd19 100644
--- a/src/lib/Bcfg2/Server/CherryPyCore.py
+++ b/src/lib/Bcfg2/Server/CherryPyCore.py
@@ -5,7 +5,7 @@ import base64
 import atexit
 import cherrypy
 import Bcfg2.Options
-from Bcfg2.Bcfg2Py3k import urlparse, xmlrpclib
+from Bcfg2.Compat import urlparse, xmlrpclib
 from Bcfg2.Server.Core import BaseCore
 from cherrypy.lib import xmlrpcutil
 from cherrypy._cptools import ErrorTool
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index f39453edd..749e4b7d8 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -14,7 +14,7 @@ import Bcfg2.settings
 import Bcfg2.Server
 import Bcfg2.Logger
 import Bcfg2.Server.FileMonitor
-from Bcfg2.Bcfg2Py3k import xmlrpclib, reduce
+from Bcfg2.Compat import xmlrpclib, reduce
 from Bcfg2.Server.Plugin import PluginInitError, PluginExecutionError
 
 try:
diff --git a/src/lib/Bcfg2/Server/FileMonitor/Inotify.py b/src/lib/Bcfg2/Server/FileMonitor/Inotify.py
index 880ac7e8d..32390c4eb 100644
--- a/src/lib/Bcfg2/Server/FileMonitor/Inotify.py
+++ b/src/lib/Bcfg2/Server/FileMonitor/Inotify.py
@@ -5,7 +5,7 @@ import operator
 import os
 import pyinotify
 import sys
-from Bcfg2.Bcfg2Py3k import reduce
+from Bcfg2.Compat import reduce
 from Bcfg2.Server.FileMonitor import Event
 from Bcfg2.Server.FileMonitor.Pseudo import Pseudo
 
diff --git a/src/lib/Bcfg2/Server/Hostbase/settings.py b/src/lib/Bcfg2/Server/Hostbase/settings.py
index 4e641f13c..7660e1bdc 100644
--- a/src/lib/Bcfg2/Server/Hostbase/settings.py
+++ b/src/lib/Bcfg2/Server/Hostbase/settings.py
@@ -1,6 +1,6 @@
 import os.path
 # Compatibility import
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
 
 PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__))
 
diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py
index 910bc0108..c6476eb90 100644
--- a/src/lib/Bcfg2/Server/Plugin.py
+++ b/src/lib/Bcfg2/Server/Plugin.py
@@ -10,7 +10,7 @@ import threading
 import lxml.etree
 import Bcfg2.Server
 import Bcfg2.Options
-from Bcfg2.Bcfg2Py3k import ConfigParser, CmpMixin, reduce, Queue, Empty, \
+from Bcfg2.Compat import ConfigParser, CmpMixin, reduce, Queue, Empty, \
     Full, cPickle
 
 try:
diff --git a/src/lib/Bcfg2/Server/Plugins/Base.py b/src/lib/Bcfg2/Server/Plugins/Base.py
index 2020f7795..66515ede2 100644
--- a/src/lib/Bcfg2/Server/Plugins/Base.py
+++ b/src/lib/Bcfg2/Server/Plugins/Base.py
@@ -3,7 +3,7 @@
 import copy
 import lxml.etree
 import sys
-from Bcfg2.Bcfg2Py3k import reduce
+from Bcfg2.Compat import reduce
 import Bcfg2.Server.Plugin
 
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
index 6605cca7c..140d4a486 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
@@ -1,5 +1,5 @@
 import logging
-from Bcfg2.Bcfg2Py3k import StringIO
+from Bcfg2.Compat import StringIO
 from Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator import CfgGenshiGenerator
 from Bcfg2.Server.Plugins.Cfg.CfgEncryptedGenerator import decrypt, \
     CfgEncryptedGenerator
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
index fe993ab54..1cce36f4b 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
@@ -9,7 +9,7 @@ import logging
 import lxml.etree
 import Bcfg2.Options
 import Bcfg2.Server.Plugin
-from Bcfg2.Bcfg2Py3k import u_str, unicode, b64encode
+from Bcfg2.Compat import u_str, unicode, b64encode
 import Bcfg2.Server.Lint
 
 logger = logging.getLogger(__name__)
diff --git a/src/lib/Bcfg2/Server/Plugins/DBStats.py b/src/lib/Bcfg2/Server/Plugins/DBStats.py
index 63c590f0f..ea3b1b69e 100644
--- a/src/lib/Bcfg2/Server/Plugins/DBStats.py
+++ b/src/lib/Bcfg2/Server/Plugins/DBStats.py
@@ -13,7 +13,7 @@ except ImportError:
 import Bcfg2.Server.Plugin
 from Bcfg2.Server.Reports.importscript import load_stat
 from Bcfg2.Server.Reports.reports.models import Client
-from Bcfg2.Bcfg2Py3k import b64decode
+from Bcfg2.Compat import b64decode
 
 # for debugging output only
 logger = logging.getLogger('Bcfg2.Plugins.DBStats')
diff --git a/src/lib/Bcfg2/Server/Plugins/FileProbes.py b/src/lib/Bcfg2/Server/Plugins/FileProbes.py
index 632d586e8..a278e3486 100644
--- a/src/lib/Bcfg2/Server/Plugins/FileProbes.py
+++ b/src/lib/Bcfg2/Server/Plugins/FileProbes.py
@@ -11,7 +11,7 @@ import lxml.etree
 import Bcfg2.Options
 import Bcfg2.Server
 import Bcfg2.Server.Plugin
-from Bcfg2.Bcfg2Py3k import b64decode
+from Bcfg2.Compat import b64decode
 
 probecode = """#!/usr/bin/env python
 
@@ -19,7 +19,7 @@ import os
 import pwd
 import grp
 import lxml.etree
-from Bcfg2.Bcfg2Py3k import b64encode
+from Bcfg2.Compat import b64encode
 
 path = "%s"
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Hostbase.py b/src/lib/Bcfg2/Server/Plugins/Hostbase.py
index 69b019160..875fcd04c 100644
--- a/src/lib/Bcfg2/Server/Plugins/Hostbase.py
+++ b/src/lib/Bcfg2/Server/Plugins/Hostbase.py
@@ -13,7 +13,7 @@ from Bcfg2.Server.Plugin import PluginExecutionError, PluginInitError
 from django.template import Context, loader
 from django.db import connection
 # Compatibility imports
-from Bcfg2.Bcfg2Py3k import StringIO
+from Bcfg2.Compat import StringIO
 
 try:
     set
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py
index a5fa78088..efb03d3ee 100644
--- a/src/lib/Bcfg2/Server/Plugins/Metadata.py
+++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py
@@ -14,7 +14,7 @@ import Bcfg2.Server
 import Bcfg2.Server.Lint
 import Bcfg2.Server.Plugin
 import Bcfg2.Server.FileMonitor
-from Bcfg2.Bcfg2Py3k import MutableMapping
+from Bcfg2.Compat import MutableMapping
 from Bcfg2.version import Bcfg2VersionInfo
 
 try:
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
index d182453e6..d6baf6d30 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
@@ -2,7 +2,7 @@ import re
 import gzip
 from Bcfg2.Server.Plugins.Packages.Collection import Collection
 from Bcfg2.Server.Plugins.Packages.Source import Source
-from Bcfg2.Bcfg2Py3k import cPickle
+from Bcfg2.Compat import cPickle
 
 class AptCollection(Collection):
     def get_group(self, group):
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
index 046fee68f..533701b2f 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
@@ -1,6 +1,6 @@
 import gzip
 import tarfile
-from Bcfg2.Bcfg2Py3k import cPickle
+from Bcfg2.Compat import cPickle
 from Bcfg2.Server.Plugins.Packages.Collection import Collection
 from Bcfg2.Server.Plugins.Packages.Source import Source
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
index 918c36afe..710d10dd6 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
@@ -2,7 +2,7 @@ import os
 import re
 import sys
 import Bcfg2.Server.Plugin
-from Bcfg2.Bcfg2Py3k import HTTPError, HTTPBasicAuthHandler, \
+from Bcfg2.Compat import HTTPError, HTTPBasicAuthHandler, \
      HTTPPasswordMgrWithDefaultRealm, install_opener, build_opener, \
      urlopen, cPickle
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index 858916abf..3dc71130d 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -7,7 +7,7 @@ import logging
 import lxml.etree
 from subprocess import Popen, PIPE
 import Bcfg2.Server.Plugin
-from Bcfg2.Bcfg2Py3k import StringIO, cPickle, HTTPError, URLError, \
+from Bcfg2.Compat import StringIO, cPickle, HTTPError, URLError, \
     ConfigParser
 from Bcfg2.Server.Plugins.Packages.Collection import Collection
 from Bcfg2.Server.Plugins.Packages.Source import SourceInitError, Source, \
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index d3095300a..a4c0f98ca 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -7,7 +7,7 @@ import shutil
 import lxml.etree
 import Bcfg2.Logger
 import Bcfg2.Server.Plugin
-from Bcfg2.Bcfg2Py3k import ConfigParser, urlopen
+from Bcfg2.Compat import ConfigParser, urlopen
 from Bcfg2.Server.Plugins.Packages import Collection
 from Bcfg2.Server.Plugins.Packages.PackagesSources import PackagesSources
 
diff --git a/src/lib/Bcfg2/Server/Plugins/SEModules.py b/src/lib/Bcfg2/Server/Plugins/SEModules.py
index 62b3fb10a..8e1dd15f6 100644
--- a/src/lib/Bcfg2/Server/Plugins/SEModules.py
+++ b/src/lib/Bcfg2/Server/Plugins/SEModules.py
@@ -1,7 +1,7 @@
 import os
 import logging
 import Bcfg2.Server.Plugin
-from Bcfg2.Bcfg2Py3k import b64encode
+from Bcfg2.Compat import b64encode
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py
index cbe8d0d9b..89862f464 100644
--- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py
+++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py
@@ -9,7 +9,7 @@ import logging
 import tempfile
 from subprocess import Popen, PIPE
 import Bcfg2.Server.Plugin
-from Bcfg2.Bcfg2Py3k import u_str, reduce, b64encode
+from Bcfg2.Compat import u_str, reduce, b64encode
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/lib/Bcfg2/Server/Plugins/SSLCA.py b/src/lib/Bcfg2/Server/Plugins/SSLCA.py
index 9293fc978..b02802ac8 100644
--- a/src/lib/Bcfg2/Server/Plugins/SSLCA.py
+++ b/src/lib/Bcfg2/Server/Plugins/SSLCA.py
@@ -6,7 +6,7 @@ import tempfile
 import os
 from subprocess import Popen, PIPE, STDOUT
 # Compatibility import
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
 
 try:
     from hashlib import md5
diff --git a/src/lib/Bcfg2/Server/Plugins/Snapshots.py b/src/lib/Bcfg2/Server/Plugins/Snapshots.py
index e62638b4f..74bed40df 100644
--- a/src/lib/Bcfg2/Server/Plugins/Snapshots.py
+++ b/src/lib/Bcfg2/Server/Plugins/Snapshots.py
@@ -9,7 +9,7 @@ import time
 import threading
 
 # Compatibility import
-from Bcfg2.Bcfg2Py3k import Queue, u_str, b64decode
+from Bcfg2.Compat import Queue, u_str, b64decode
 
 logger = logging.getLogger('Snapshots')
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Statistics.py b/src/lib/Bcfg2/Server/Plugins/Statistics.py
index 984efb76c..c584af2a7 100644
--- a/src/lib/Bcfg2/Server/Plugins/Statistics.py
+++ b/src/lib/Bcfg2/Server/Plugins/Statistics.py
@@ -8,7 +8,7 @@ import os
 import sys
 from time import asctime, localtime, time, strptime, mktime
 import threading
-from Bcfg2.Bcfg2Py3k import b64decode
+from Bcfg2.Compat import b64decode
 import Bcfg2.Server.Plugin
 
 
diff --git a/src/lib/Bcfg2/Server/Plugins/TCheetah.py b/src/lib/Bcfg2/Server/Plugins/TCheetah.py
index 2bf475363..f2c59ce29 100644
--- a/src/lib/Bcfg2/Server/Plugins/TCheetah.py
+++ b/src/lib/Bcfg2/Server/Plugins/TCheetah.py
@@ -5,7 +5,7 @@ import sys
 import traceback
 import Bcfg2.Server.Plugin
 
-from Bcfg2.Bcfg2Py3k import unicode, b64encode
+from Bcfg2.Compat import unicode, b64encode
 
 logger = logging.getLogger('Bcfg2.Plugins.TCheetah')
 
diff --git a/src/lib/Bcfg2/Server/Plugins/TGenshi.py b/src/lib/Bcfg2/Server/Plugins/TGenshi.py
index c7335a0c0..809587d91 100644
--- a/src/lib/Bcfg2/Server/Plugins/TGenshi.py
+++ b/src/lib/Bcfg2/Server/Plugins/TGenshi.py
@@ -4,7 +4,7 @@ import logging
 import sys
 import Bcfg2.Server.Plugin
 
-from Bcfg2.Bcfg2Py3k import unicode, b64encode
+from Bcfg2.Compat import unicode, b64encode
 
 logger = logging.getLogger('Bcfg2.Plugins.TGenshi')
 
diff --git a/src/lib/Bcfg2/Server/Reports/importscript.py b/src/lib/Bcfg2/Server/Reports/importscript.py
index 4eced8340..ace07a75d 100755
--- a/src/lib/Bcfg2/Server/Reports/importscript.py
+++ b/src/lib/Bcfg2/Server/Reports/importscript.py
@@ -34,7 +34,7 @@ import Bcfg2.Logger
 import platform
 
 # Compatibility import
-from Bcfg2.Bcfg2Py3k import ConfigParser, b64decode
+from Bcfg2.Compat import ConfigParser, b64decode
 
 
 def build_reason_kwargs(r_ent, encoding, logger):
diff --git a/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py b/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
index 0d4c6501d..b2814b445 100644
--- a/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
+++ b/src/lib/Bcfg2/Server/Reports/reports/templatetags/syntax_coloring.py
@@ -4,7 +4,7 @@ from django.utils.encoding import smart_unicode
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 
-from Bcfg2.Bcfg2Py3k import u_str
+from Bcfg2.Compat import u_str
 
 register = template.Library()
 
diff --git a/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py b/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py
index 304b36636..79c144811 100644
--- a/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py
+++ b/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py
@@ -7,7 +7,7 @@ import re
 import sys
 import traceback
 
-from Bcfg2.Bcfg2Py3k import CmpMixin
+from Bcfg2.Compat import CmpMixin
 from Bcfg2.Server.models import InternalDatabaseVersion
 from Bcfg2.Server.SchemaUpdater.Routines import UpdaterRoutineException, \
                 UpdaterRoutine
diff --git a/src/lib/Bcfg2/Server/Snapshots/__init__.py b/src/lib/Bcfg2/Server/Snapshots/__init__.py
index 7c901adb2..d42aa0525 100644
--- a/src/lib/Bcfg2/Server/Snapshots/__init__.py
+++ b/src/lib/Bcfg2/Server/Snapshots/__init__.py
@@ -3,7 +3,7 @@ __all__ = ['models', 'db_from_config', 'setup_session']
 import sqlalchemy
 import sqlalchemy.orm
 # Compatibility import
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
 
 
 def db_from_config(cfile):
diff --git a/src/lib/Bcfg2/Server/Snapshots/model.py b/src/lib/Bcfg2/Server/Snapshots/model.py
index 0bbd206da..d578cd2c0 100644
--- a/src/lib/Bcfg2/Server/Snapshots/model.py
+++ b/src/lib/Bcfg2/Server/Snapshots/model.py
@@ -6,7 +6,7 @@ import sqlalchemy.exceptions
 from sqlalchemy.orm import relation, backref
 from sqlalchemy.ext.declarative import declarative_base
 
-from Bcfg2.Bcfg2Py3k import u_str
+from Bcfg2.Compat import u_str
 
 
 class Uniquer(object):
diff --git a/src/lib/Bcfg2/Server/models.py b/src/lib/Bcfg2/Server/models.py
index effd4d298..bae6497a9 100644
--- a/src/lib/Bcfg2/Server/models.py
+++ b/src/lib/Bcfg2/Server/models.py
@@ -3,7 +3,7 @@ import logging
 import Bcfg2.Options
 import Bcfg2.Server.Plugins
 from django.db import models
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
 
 logger = logging.getLogger('Bcfg2.Server.models')
 
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 3fbeb0a62..f41479d77 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -16,7 +16,7 @@ import Bcfg2.Client.XML
 import Bcfg2.Client.Frame
 import Bcfg2.Client.Tools
 # Compatibility imports
-from Bcfg2.Bcfg2Py3k import xmlrpclib
+from Bcfg2.Compat import xmlrpclib
 
 from Bcfg2.version import __version__
 
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index 24e9eaac4..47dd923d4 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -7,7 +7,7 @@ import Bcfg2.Logger
 import Bcfg2.Options
 import Bcfg2.Server.Admin
 # Compatibility import
-from Bcfg2.Bcfg2Py3k import StringIO
+from Bcfg2.Compat import StringIO
 
 log = logging.getLogger('bcfg2-admin')
 
diff --git a/src/sbin/bcfg2-build-reports b/src/sbin/bcfg2-build-reports
index 318e9de5d..df6997d38 100755
--- a/src/sbin/bcfg2-build-reports
+++ b/src/sbin/bcfg2-build-reports
@@ -13,7 +13,7 @@ import sys
 from time import asctime, strptime
 from lxml.etree import XML, XSLT, parse, Element, ElementTree, SubElement, tostring, XMLSyntaxError
 # Compatibility imports
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
 
 def generatereport(rspec, nrpt):
     """
diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint
index 1038beca8..0e9a32e49 100755
--- a/src/sbin/bcfg2-lint
+++ b/src/sbin/bcfg2-lint
@@ -10,7 +10,7 @@ import Bcfg2.Options
 import Bcfg2.Server.Core
 import Bcfg2.Server.Lint
 # Compatibility imports
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
 
 logger = logging.getLogger('bcfg2-lint')
 
diff --git a/src/sbin/bcfg2-reports b/src/sbin/bcfg2-reports
index cb553c0ba..9baef3e4c 100755
--- a/src/sbin/bcfg2-reports
+++ b/src/sbin/bcfg2-reports
@@ -5,7 +5,7 @@ import os
 import sys
 import datetime
 from optparse import OptionParser, OptionGroup, make_option
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
 
 try:
     import Bcfg2.Server.Reports.settings
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 *
 
diff --git a/tools/create-debian-pkglist-gp.py b/tools/create-debian-pkglist-gp.py
index cefb8f3fb..91c087e54 100644
--- a/tools/create-debian-pkglist-gp.py
+++ b/tools/create-debian-pkglist-gp.py
@@ -10,9 +10,9 @@ import sys
 import subprocess
 
 # Compatibility imports
-from Bcfg2.Bcfg2Py3k import StringIO
-from Bcfg2.Bcfg2Py3k import ConfigParser
-from Bcfg2.Bcfg2Py3k import urlopen
+from Bcfg2.Compat import StringIO
+from Bcfg2.Compat import ConfigParser
+from Bcfg2.Compat import urlopen
 
 def debug(msg):
     '''print debug messages'''
diff --git a/tools/create-debian-pkglist.py b/tools/create-debian-pkglist.py
index 4b268c6ee..7dce2b340 100755
--- a/tools/create-debian-pkglist.py
+++ b/tools/create-debian-pkglist.py
@@ -11,9 +11,9 @@ import re
 import sys
 
 # Compatibility imports
-from Bcfg2.Bcfg2Py3k import StringIO
-from Bcfg2.Bcfg2Py3k import ConfigParser
-from Bcfg2.Bcfg2Py3k import urlopen
+from Bcfg2.Compat import StringIO
+from Bcfg2.Compat import ConfigParser
+from Bcfg2.Compat import urlopen
 
 apt_pkg.init()
 
diff --git a/tools/pkgmgr_gen.py b/tools/pkgmgr_gen.py
index 7101ba17d..51387abf0 100755
--- a/tools/pkgmgr_gen.py
+++ b/tools/pkgmgr_gen.py
@@ -23,7 +23,7 @@ import xml.sax
 from xml.sax.handler import ContentHandler
 
 # Compatibility imports
-from Bcfg2.Bcfg2Py3k import urljoin
+from Bcfg2.Compat import urljoin
 
 
 def info(object, spacing=10, collapse=1):
diff --git a/tools/pkgmgr_update.py b/tools/pkgmgr_update.py
index 05d645786..a4d25ec46 100755
--- a/tools/pkgmgr_update.py
+++ b/tools/pkgmgr_update.py
@@ -22,7 +22,7 @@ import rpm
 import sys
 
 # Compatibility imports
-from Bcfg2.Bcfg2Py3k import urljoin
+from Bcfg2.Compat import urljoin
 
 try:
     from lxml.etree import parse, tostring
diff --git a/tools/upgrade/1.2/packages-convert.py b/tools/upgrade/1.2/packages-convert.py
index c7b43279f..d65ce90a2 100755
--- a/tools/upgrade/1.2/packages-convert.py
+++ b/tools/upgrade/1.2/packages-convert.py
@@ -3,7 +3,7 @@
 import os
 import sys
 import lxml.etree
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
 import Bcfg2.Options
 
 XI_NAMESPACE = "http://www.w3.org/2001/XInclude"
diff --git a/tools/upgrade/1.3/migrate_configs.py b/tools/upgrade/1.3/migrate_configs.py
index dd8e5708b..b7adb2528 100755
--- a/tools/upgrade/1.3/migrate_configs.py
+++ b/tools/upgrade/1.3/migrate_configs.py
@@ -2,7 +2,7 @@
 
 import os
 import sys
-from Bcfg2.Bcfg2Py3k import ConfigParser
+from Bcfg2.Compat import ConfigParser
 import Bcfg2.Options
 
 def copy_section(src_file, tgt_cfg, section, newsection=None):