1 files changed, 29 insertions, 15 deletions
diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py
index 44c76303c..049236e03 100644
--- a/src/lib/Bcfg2/Compat.py
+++ b/src/lib/Bcfg2/Compat.py
@@ -10,7 +10,7 @@ Python 2.4 and such-like """
 
 import sys
 
-# pylint: disable=E0611,W0611,W0622,C0103
+# pylint: disable=E0601,E0602,E0611,W0611,W0622,C0103
 
 try:
     from email.Utils import formatdate
@@ -79,21 +79,35 @@ except NameError:
 def u_str(string, encoding=None):
     """ print to file compatibility """
     if sys.hexversion >= 0x03000000:
-        if encoding is not None:
-            return string.encode(encoding)
-        else:
-            return string
+        return string
     else:
         if encoding is not None:
             return unicode(string, encoding)
         else:
             return unicode(string)
 
+try:
+    from functools import wraps
+except ImportError:
+    def wraps(wrapped):  # pylint: disable=W0613
+        """ implementation of functools.wraps() for python 2.4 """
+        return lambda f: f
+
+
 # base64 compat
 if sys.hexversion >= 0x03000000:
     from base64 import b64encode as _b64encode, b64decode as _b64decode
-    b64encode = lambda s: _b64encode(s.encode('UTF-8')).decode('UTF-8')
-    b64decode = lambda s: _b64decode(s.encode('UTF-8')).decode('UTF-8')
+
+    @wraps(_b64encode)
+    def b64encode(val, **kwargs):  # pylint: disable=C0111
+        try:
+            return _b64encode(val, **kwargs)
+        except TypeError:
+            return _b64encode(val.encode('UTF-8'), **kwargs).decode('UTF-8')
+
+    @wraps(_b64decode)
+    def b64decode(val, **kwargs):  # pylint: disable=C0111
+        return _b64decode(val.encode('UTF-8'), **kwargs).decode('UTF-8')
 else:
     from base64 import b64encode, b64decode
 
@@ -242,14 +256,6 @@ except ImportError:
     from md5 import md5
 
 
-try:
-    from functools import wraps
-except ImportError:
-    def wraps(wrapped):  # pylint: disable=W0613
-        """ implementation of functools.wraps() for python 2.4 """
-        return lambda f: f
-
-
 def oct_mode(mode):
     """ Convert a decimal number describing a POSIX permissions mode
     to a string giving the octal mode.  In Python 2, this is a synonym
@@ -270,3 +276,11 @@ try:
 except NameError:
     # longs are just ints in py3k
     long = int
+
+
+try:
+    cmp = cmp
+except NameError:
+    def cmp(a, b):
+        """ Py3k implementation of cmp() """
+        return (a > b) - (a < b)