summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2012-07-02 16:25:23 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 08:29:06 -0400
commit83fb79ae41a237ebf460d31cfe7e5d99d8d1ea2b (patch)
tree785138ebf2851e87edf17b53a5479eb5520ab9c1
parente436085271fc494bdfeaa66c42ab2b50ec783bec (diff)
downloadbcfg2-83fb79ae41a237ebf460d31cfe7e5d99d8d1ea2b.tar.gz
bcfg2-83fb79ae41a237ebf460d31cfe7e5d99d8d1ea2b.tar.bz2
bcfg2-83fb79ae41a237ebf460d31cfe7e5d99d8d1ea2b.zip
Cfg: Fix traceback for unicode templates
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
-rw-r--r--src/lib/Bcfg2/Bcfg2Py3k.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Bcfg2Py3k.py b/src/lib/Bcfg2/Bcfg2Py3k.py
index 2c179a5ef..13311f28f 100644
--- a/src/lib/Bcfg2/Bcfg2Py3k.py
+++ b/src/lib/Bcfg2/Bcfg2Py3k.py
@@ -64,6 +64,12 @@ try:
except ImportError:
import http.client as httplib
+# py3k compatibility
+if sys.hexversion >= 0x03000000:
+ unicode = str
+else:
+ unicode = unicode
+
# print to file compatibility
def u_str(string, encoding=None):
if sys.hexversion >= 0x03000000: