1 files changed, 6 insertions, 21 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Snapshots.py b/src/lib/Bcfg2/Server/Plugins/Snapshots.py
index aeb3b9f74..e62638b4f 100644
--- a/src/lib/Bcfg2/Server/Plugins/Snapshots.py
+++ b/src/lib/Bcfg2/Server/Plugins/Snapshots.py
@@ -1,9 +1,5 @@
-#import lxml.etree
 import logging
-import binascii
 import difflib
-#import sqlalchemy
-#import sqlalchemy.orm
 import Bcfg2.Server.Plugin
 import Bcfg2.Server.Snapshots
 import Bcfg2.Logger
@@ -13,7 +9,7 @@ import time
 import threading
 
 # Compatibility import
-from Bcfg2.Bcfg2Py3k import Queue
+from Bcfg2.Bcfg2Py3k import Queue, u_str, b64decode
 
 logger = logging.getLogger('Snapshots')
 
@@ -28,14 +24,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']:
@@ -52,13 +40,12 @@ def build_snap_ent(entry):
             if entry.get('encoding', 'ascii') == 'ascii':
                 desired['contents'] = u_str(entry.text)
             else:
-                desired['contents'] = u_str(binascii.a2b_base64(entry.text))
+                desired['contents'] = u_str(b64decode(entry.text))
 
         if 'current_bfile' in entry.attrib:
-            state['contents'] = u_str(binascii.a2b_base64( \
-                entry.get('current_bfile')))
+            state['contents'] = u_str(b64decode(entry.get('current_bfile')))
         elif 'current_bdiff' in entry.attrib:
-            diff = binascii.a2b_base64(entry.get('current_bdiff'))
+            diff = b64decode(entry.get('current_bdiff'))
             state['contents'] = u_str( \
                 '\n'.join(difflib.restore(diff.split('\n'), 1)))
 
@@ -69,14 +56,12 @@ def build_snap_ent(entry):
     return [desired, state]
 
 
-class Snapshots(Bcfg2.Server.Plugin.Statistics,
-                Bcfg2.Server.Plugin.Plugin):
+class Snapshots(Bcfg2.Server.Plugin.Statistics):
     name = 'Snapshots'
     experimental = True
 
     def __init__(self, core, datastore):
-        Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
-        Bcfg2.Server.Plugin.Statistics.__init__(self)
+        Bcfg2.Server.Plugin.Statistics.__init__(self, core, datastore)
         self.session = Bcfg2.Server.Snapshots.setup_session(core.cfile)
         self.work_queue = Queue()
         self.loader = threading.Thread(target=self.load_snapshot)