summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR. Tyler Ballance <tyler@slide.com>2009-09-01 15:44:01 -0700
committerR. Tyler Ballance <tyler@slide.com>2009-09-01 15:44:01 -0700
commit40fd6ac120ee453a4e0f793e8f24f46fdc5a7988 (patch)
tree73efeff5a5672070167a41363ef16aafbefe0fd5
parent3de1ca853362f7f56e78a7da9add6b6409b2797a (diff)
parent8ecdd3337418e6dfe3f163f224d64d87d12b38cb (diff)
downloadpython-cheetah-40fd6ac120ee453a4e0f793e8f24f46fdc5a7988.tar.gz
Merge branch 'next' of git@github.com:rtyler/cheetah into next
-rw-r--r--cheetah/Template.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cheetah/Template.py b/cheetah/Template.py
index eeeeb95..aa924f8 100644
--- a/cheetah/Template.py
+++ b/cheetah/Template.py
@@ -779,7 +779,7 @@ class Template(Servlet):
setattr(mod, baseclassName, baseclassValue)
##
try:
- co = compile(generatedModuleCode.encode(outputEncoding), __file__, 'exec')
+ co = compile(generatedModuleCode, __file__, 'exec')
exec co in mod.__dict__
except SyntaxError, e:
try: