diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-29 10:25:34 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-29 10:25:34 -0400 |
| commit | c8a2d4fdd39171ccacceac93086d5618536dff10 (patch) | |
| tree | 0ef5c99f2698e12efb6059ea381ea439d7286884 /src/lib/Bcfg2/Compat.py | |
| parent | ee1f789a1c9977bed2b9eff85a748db3273a9e9b (diff) | |
| download | bcfg2-c8a2d4fdd39171ccacceac93086d5618536dff10.tar.gz bcfg2-c8a2d4fdd39171ccacceac93086d5618536dff10.tar.bz2 bcfg2-c8a2d4fdd39171ccacceac93086d5618536dff10.zip | |
fixed base64 encoding of non-ascii strings
Diffstat (limited to 'src/lib/Bcfg2/Compat.py')
| -rw-r--r-- | src/lib/Bcfg2/Compat.py | 9 |
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 |