Skip to content

templater: drop Jinja Python 2 compatibility shim #353

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

Merged
blackboxsw merged 2 commits into from
May 15, 2020
Merged

templater: drop Jinja Python 2 compatibility shim #353

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
e539a23
templater: drop Jinja Python 2 compatibility shim
OddBloke May 6, 2020
08c825c
Merge branch 'master' into py2
blackboxsw May 15, 2020
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
4 changes: 0 additions & 4 deletions cloudinit/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,8 +451,4 @@ def stringify(self, header=None):
contents = '\n'.join([header, contents, ''])
return contents


def identity(object):
return object

# vi: ts=4 expandtab
4 changes: 0 additions & 4 deletions cloudinit/templater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@
CHEETAH_AVAILABLE = False

try:
from jinja2.runtime import implements_to_string
from jinja2 import Template as JTemplate
from jinja2 import DebugUndefined as JUndefined
JINJA_AVAILABLE = True
except (ImportError, AttributeError):
from cloudinit.helpers import identity
implements_to_string = identity
JINJA_AVAILABLE = False
JUndefined = object

Expand All @@ -42,7 +39,6 @@
MISSING_JINJA_PREFIX = u'CI_MISSING_JINJA_VAR/'


@implements_to_string # Needed for python2.7. Otherwise cached super.__str__
class UndefinedJinjaVariable(JUndefined):
"""Class used to represent any undefined jinja template variable."""

Expand Down