diff options
author | Marcel Hellkamp <marc@gsites.de> | 2011-11-15 19:04:07 +0100 |
---|---|---|
committer | Marcel Hellkamp <marc@gsites.de> | 2011-11-15 19:19:42 +0100 |
commit | 74e71f3407b37c324e2ae9c9e158e253ad4a5981 (patch) | |
tree | f51b64979f85814e4a3cf27c7bd0df2efe859577 | |
parent | f21f8393dc8738f2bc5b426df7aed10bf35f8173 (diff) | |
download | bottle-74e71f3407b37c324e2ae9c9e158e253ad4a5981.tar.gz |
fix: Python 3.x only bug in SimpleTemplate. Templates with an encoding other than the system default raised UnicodeError.0.9.7
-rwxr-xr-x | bottle.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -15,7 +15,7 @@ License: MIT (see LICENSE.txt for details) from __future__ import with_statement __author__ = 'Marcel Hellkamp' -__version__ = '0.9.6' +__version__ = '0.9.7' __license__ = 'MIT' import base64 @@ -2294,7 +2294,7 @@ class SimpleTemplate(BaseTemplate): ptrbuffer = [] # Buffer for printable strings and token tuple instances codebuffer = [] # Buffer for generated python code multiline = dedent = oneline = False - template = self.source if self.source else open(self.filename).read() + template = self.source or open(self.filename, 'rb').read() def yield_tokens(line): for i, part in enumerate(re.split(r'\{\{(.*?)\}\}', line)): |