summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Compat.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Compat.py')
-rw-r--r--src/lib/Bcfg2/Compat.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py
index a245d3634..820dd9d1e 100644
--- a/src/lib/Bcfg2/Compat.py
+++ b/src/lib/Bcfg2/Compat.py
@@ -92,9 +92,12 @@ except:
unicode = str
# base64 compat
-from base64 import b64encode as _b64encode, b64decode as _b64decode
-b64encode = lambda s: _b64encode(s.encode('ascii')).decode('ascii')
-b64decode = lambda s: _b64decode(s.encode('ascii')).decode('ascii')
+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')
+else:
+ from base64 import b64encode, b64decode
try:
input = raw_input