summaryrefslogtreecommitdiff
path: root/cloudinit/templater.py
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2020-05-14 23:22:27 -0400
committerGitHub <noreply@github.com>2020-05-14 21:22:27 -0600
commitf23a4c4262ac11cd75c99fcbfbfe453f4e115f18 (patch)
tree98c7db2e9e7e6fb064ad933d618ea1c0163a629d /cloudinit/templater.py
parent09492b1d0f4b1826a7a98709c61d48bf14a1ec64 (diff)
downloadvyos-cloud-init-f23a4c4262ac11cd75c99fcbfbfe453f4e115f18.tar.gz
vyos-cloud-init-f23a4c4262ac11cd75c99fcbfbfe453f4e115f18.zip
templater: drop Jinja Python 2 compatibility shim (#353)
Diffstat (limited to 'cloudinit/templater.py')
-rw-r--r--cloudinit/templater.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/cloudinit/templater.py b/cloudinit/templater.py
index e47cdeda..a00ade20 100644
--- a/cloudinit/templater.py
+++ b/cloudinit/templater.py
@@ -21,13 +21,10 @@ except (ImportError, AttributeError):
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
@@ -42,7 +39,6 @@ BASIC_MATCHER = re.compile(r'\$\{([A-Za-z0-9_.]+)\}|\$([A-Za-z0-9_.]+)')
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."""