summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Bcfg2Py3k.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 08:56:09 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 08:56:09 -0400
commit094ddfe34e6c440c010935db4efa0c90b510d9fa (patch)
treefb2b74420049e1edcbfb1c467b8d93c9f6a93d0f /src/lib/Bcfg2/Bcfg2Py3k.py
parented753bbc124c1530d1705003f4b2c0bfff5e12d4 (diff)
downloadbcfg2-094ddfe34e6c440c010935db4efa0c90b510d9fa.tar.gz
bcfg2-094ddfe34e6c440c010935db4efa0c90b510d9fa.tar.bz2
bcfg2-094ddfe34e6c440c010935db4efa0c90b510d9fa.zip
fixed encoding of Cfg files with unicode contents
Diffstat (limited to 'src/lib/Bcfg2/Bcfg2Py3k.py')
-rw-r--r--src/lib/Bcfg2/Bcfg2Py3k.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Bcfg2Py3k.py b/src/lib/Bcfg2/Bcfg2Py3k.py
index 13311f28f..a4441946b 100644
--- a/src/lib/Bcfg2/Bcfg2Py3k.py
+++ b/src/lib/Bcfg2/Bcfg2Py3k.py
@@ -84,9 +84,9 @@ def u_str(string, encoding=None):
return unicode(string)
try:
- unicode = str
-except:
unicode = unicode
+except:
+ unicode = str
# base64 compat
from base64 import b64encode as _b64encode, b64decode as _b64decode