Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve python3 support #204

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve python3 support #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8e3f87
Improve python3 support
brunodea Dec 9, 2019
da31380
Add missing slash after removing prefix r
brunodea Dec 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pystache/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ def _get_string_types():
# and "basestring" to Python 3's "str".
if version_info < (3, ):
return basestring
else:
unicode = str
# The latter evaluates to "bytes" in Python 3 -- even after conversion by 2to3.
return (unicode, type(u"a".encode('utf-8')))

Expand Down
9 changes: 7 additions & 2 deletions pystache/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,17 @@
"""

import re
import sys

if sys.version_info.major >= 3:
unicode = str

from pystache import defaults
from pystache.parsed import ParsedTemplate


END_OF_LINE_CHARACTERS = [u'\r', u'\n']
NON_BLANK_RE = re.compile(ur'^(.)', re.M)
NON_BLANK_RE = re.compile(u'^(.)', re.M)


# TODO: add some unit tests for this.
Expand Down Expand Up @@ -146,8 +150,9 @@ def __repr__(self):

def render(self, engine, context):
template = engine.resolve_partial(self.key)

# Indent before rendering.
template = re.sub(NON_BLANK_RE, self.indent + ur'\1', template)
template = re.sub(NON_BLANK_RE, self.indent + u'\\1', template)

return engine.render(template, context)

Expand Down