renamed Bcfg2Py3k to Compat

19 files changed, 20 insertions, 20 deletions

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')