From 200f79387247eefa01d60e4f6e573ba5162054bc Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 5 Jun 2012 17:00:40 -0500 Subject: PY3K: Refactor input code Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Server/Plugins/Snapshots.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins') diff --git a/src/lib/Bcfg2/Server/Plugins/Snapshots.py b/src/lib/Bcfg2/Server/Plugins/Snapshots.py index aeb3b9f74..232dbb0c3 100644 --- a/src/lib/Bcfg2/Server/Plugins/Snapshots.py +++ b/src/lib/Bcfg2/Server/Plugins/Snapshots.py @@ -14,6 +14,7 @@ import threading # Compatibility import from Bcfg2.Bcfg2Py3k import Queue +from Bcfg2.Bcfg2Py3k import u_str logger = logging.getLogger('Snapshots') @@ -28,14 +29,6 @@ datafields = { } -# py3k compatibility -def u_str(string): - if sys.hexversion >= 0x03000000: - return string - else: - return unicode(string) - - def build_snap_ent(entry): basefields = [] if entry.tag in ['Package', 'Service']: -- cgit v1.2.3-1-g7c22