diff options
author | Sven Vermeulen <sven.vermeulen@siphos.be> | 2012-06-24 11:38:21 +0200 |
---|---|---|
committer | Sven Vermeulen <sven.vermeulen@siphos.be> | 2012-06-24 11:38:21 +0200 |
commit | a1d3ade6fa42151f6a840c4754d87511eb75fa02 (patch) | |
tree | 92fab832793348f42ddd6eb75b79185a55e87d61 /support | |
parent | Use double-comment, otherwise segenxml fails (diff) | |
download | hardened-refpolicy-a1d3ade6fa42151f6a840c4754d87511eb75fa02.tar.gz hardened-refpolicy-a1d3ade6fa42151f6a840c4754d87511eb75fa02.tar.bz2 hardened-refpolicy-a1d3ade6fa42151f6a840c4754d87511eb75fa02.zip |
Improve unicode support, needed for python3
Diffstat (limited to 'support')
-rw-r--r-- | support/pyplate.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/support/pyplate.py b/support/pyplate.py index c13cd88e8..2e5a93832 100644 --- a/support/pyplate.py +++ b/support/pyplate.py @@ -82,7 +82,10 @@ class Template: file.close() def parse_string(self, template): - file = io.StringIO(template) + if sys.version_info >= (3,0): + file = io.StringIO(template) + else: + file = io.StringIO(template.decode('utf-8')) self.parse(file) file.close() @@ -288,7 +291,11 @@ class CommentTemplateNode(LeafTemplateNode): class ExpressionTemplateNode(LeafTemplateNode): def execute(self, stream, data): - stream.write(str(eval(self.s, globals(), data))) + if sys.version_info >= (3,0): + stream.write(str(eval(self.s, globals(), data))) + else: + stream.write(str(eval(self.s, globals(), data)).decode('utf-8')) + class ExecTemplateNode(LeafTemplateNode): def __init__(self, parent, s): |