summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDavid Lord <davidism@gmail.com>2020-01-28 20:16:59 -0800
committerDavid Lord <davidism@gmail.com>2020-02-05 08:44:15 -0800
commit2a8515d2e53a2be475d9df3fe44e308501201a95 (patch)
tree88c9e788ce0e0be96b27e0e40f82e7c406567ee3 /examples
parent42edc132902562e1e16f190bea60362865da894f (diff)
downloadjinja2-2a8515d2e53a2be475d9df3fe44e308501201a95.tar.gz
apply pyupgrade and f-strings
Diffstat (limited to 'examples')
-rw-r--r--examples/basic/cycle.py2
-rw-r--r--examples/basic/debugger.py2
-rw-r--r--examples/basic/inheritance.py2
-rw-r--r--examples/basic/test.py8
-rw-r--r--examples/basic/test_filter_and_linestatements.py2
-rw-r--r--examples/basic/test_loop_filter.py2
-rw-r--r--examples/basic/translate.py4
7 files changed, 4 insertions, 18 deletions
diff --git a/examples/basic/cycle.py b/examples/basic/cycle.py
index 25dcb0b..1f97e37 100644
--- a/examples/basic/cycle.py
+++ b/examples/basic/cycle.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
from jinja2 import Environment
env = Environment(
diff --git a/examples/basic/debugger.py b/examples/basic/debugger.py
index d3c1a60..f6a9627 100644
--- a/examples/basic/debugger.py
+++ b/examples/basic/debugger.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
from jinja2 import Environment
from jinja2.loaders import FileSystemLoader
diff --git a/examples/basic/inheritance.py b/examples/basic/inheritance.py
index 4a881bf..6d928df 100644
--- a/examples/basic/inheritance.py
+++ b/examples/basic/inheritance.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
from jinja2 import Environment
from jinja2.loaders import DictLoader
diff --git a/examples/basic/test.py b/examples/basic/test.py
index 80b9d1f..d34b0ff 100644
--- a/examples/basic/test.py
+++ b/examples/basic/test.py
@@ -1,12 +1,10 @@
-from __future__ import print_function
-
from jinja2 import Environment
from jinja2.loaders import DictLoader
env = Environment(
loader=DictLoader(
{
- "child.html": u"""\
+ "child.html": """\
{% extends master_layout or 'master.html' %}
{% include helpers = 'helpers.html' %}
{% macro get_the_answer() %}42{% endmacro %}
@@ -16,12 +14,12 @@ env = Environment(
{{ helpers.conspirate() }}
{% endblock %}
""",
- "master.html": u"""\
+ "master.html": """\
<!doctype html>
<title>{{ title }}</title>
{% block body %}{% endblock %}
""",
- "helpers.html": u"""\
+ "helpers.html": """\
{% macro conspirate() %}23{% endmacro %}
""",
}
diff --git a/examples/basic/test_filter_and_linestatements.py b/examples/basic/test_filter_and_linestatements.py
index 673b67e..9bbcbca 100644
--- a/examples/basic/test_filter_and_linestatements.py
+++ b/examples/basic/test_filter_and_linestatements.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
from jinja2 import Environment
env = Environment(
diff --git a/examples/basic/test_loop_filter.py b/examples/basic/test_loop_filter.py
index 39be08d..6bd89fd 100644
--- a/examples/basic/test_loop_filter.py
+++ b/examples/basic/test_loop_filter.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
from jinja2 import Environment
tmpl = Environment().from_string(
diff --git a/examples/basic/translate.py b/examples/basic/translate.py
index 71547f4..e659681 100644
--- a/examples/basic/translate.py
+++ b/examples/basic/translate.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
from jinja2 import Environment
env = Environment(extensions=["jinja2.ext.i18n"])
@@ -7,7 +5,7 @@ env.globals["gettext"] = {"Hello %(user)s!": "Hallo %(user)s!"}.__getitem__
env.globals["ngettext"] = lambda s, p, n: {
"%(count)s user": "%(count)d Benutzer",
"%(count)s users": "%(count)d Benutzer",
-}[n == 1 and s or p]
+}[s if n == 1 else p]
print(
env.from_string(
"""\