From c07cc475cbafec24e747d6907f3bf7257e441934 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 27 Aug 2012 15:02:39 -0400
Subject: renamed Bcfg2Py3k to Compat

---
 src/lib/Bcfg2/Server/Admin/Init.py      | 2 +-
 src/lib/Bcfg2/Server/Admin/Pull.py      | 2 +-
 src/lib/Bcfg2/Server/Admin/Reports.py   | 2 +-
 src/lib/Bcfg2/Server/Admin/Snapshots.py | 2 +-
 src/lib/Bcfg2/Server/Admin/Tidy.py      | 2 +-
 src/lib/Bcfg2/Server/Admin/Xcmd.py      | 2 +-
 src/lib/Bcfg2/Server/Admin/__init__.py  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/lib/Bcfg2/Server/Admin')

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):
-- 
cgit v1.2.3-1-g7c22