From: cclauss Date: Sun, 27 Oct 2019 12:05:59 +0000 (+0100) Subject: Use print() function in both Python2 and Python 3 X-Git-Tag: 2.11.0~30^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1093%2Fhead;p=thirdparty%2Fjinja.git Use print() function in both Python2 and Python 3 --- diff --git a/examples/basic/cycle.py b/examples/basic/cycle.py index 73dd6325..ecfd7b90 100644 --- a/examples/basic/cycle.py +++ b/examples/basic/cycle.py @@ -1,13 +1,14 @@ +from __future__ import print_function from jinja2 import Environment env = Environment(line_statement_prefix="#", variable_start_string="${", variable_end_string="}") -print env.from_string("""\ +print(env.from_string("""\ \ -""").render() +""").render()) diff --git a/examples/basic/debugger.py b/examples/basic/debugger.py index 4291ff7a..4c101ffd 100644 --- a/examples/basic/debugger.py +++ b/examples/basic/debugger.py @@ -1,7 +1,8 @@ +from __future__ import print_function from jinja2 import Environment from jinja2.loaders import FileSystemLoader env = Environment(loader=FileSystemLoader('templates')) tmpl = env.get_template('broken.html') -print tmpl.render(seq=[3, 2, 4, 5, 3, 2, 0, 2, 1]) +print(tmpl.render(seq=[3, 2, 4, 5, 3, 2, 0, 2, 1])) diff --git a/examples/basic/inheritance.py b/examples/basic/inheritance.py index aa687c89..d5f0ae4f 100644 --- a/examples/basic/inheritance.py +++ b/examples/basic/inheritance.py @@ -1,3 +1,4 @@ +from __future__ import print_function from jinja2 import Environment from jinja2.loaders import DictLoader @@ -9,4 +10,4 @@ env = Environment(loader=DictLoader({ })) -print env.get_template('c').render() +print(env.get_template('c').render()) diff --git a/examples/basic/test.py b/examples/basic/test.py index 8f7dde79..44597269 100644 --- a/examples/basic/test.py +++ b/examples/basic/test.py @@ -1,3 +1,4 @@ +from __future__ import print_function from jinja2 import Environment from jinja2.loaders import DictLoader diff --git a/examples/basic/test_filter_and_linestatements.py b/examples/basic/test_filter_and_linestatements.py index 79e0a4b3..81da7508 100644 --- a/examples/basic/test_filter_and_linestatements.py +++ b/examples/basic/test_filter_and_linestatements.py @@ -1,3 +1,4 @@ +from __future__ import print_function from jinja2 import Environment diff --git a/examples/basic/test_loop_filter.py b/examples/basic/test_loop_filter.py index 0469d04e..38a221d3 100644 --- a/examples/basic/test_loop_filter.py +++ b/examples/basic/test_loop_filter.py @@ -1,3 +1,4 @@ +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 1fb8ee63..8d1970f4 100644 --- a/examples/basic/translate.py +++ b/examples/basic/translate.py @@ -1,3 +1,4 @@ +from __future__ import print_function from jinja2 import Environment env = Environment(extensions=['jinja2.ext.i18n']) @@ -8,7 +9,7 @@ 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] -print env.from_string("""\ +print(env.from_string("""\ {% trans %}Hello {{ user }}!{% endtrans %} {% trans count=users|count %}{{ count }} user{% pluralize %}{{ count }} users{% endtrans %} -""").render(user="someone", users=[1, 2, 3]) +""").render(user="someone", users=[1, 2, 3])) diff --git a/examples/profile.py b/examples/profile.py index 0c907ae3..e6deb47f 100644 --- a/examples/profile.py +++ b/examples/profile.py @@ -1,3 +1,4 @@ +from __future__ import print_function try: from cProfile import Profile except ImportError: @@ -42,7 +43,7 @@ jinja_template = JinjaEnvironment( variable_start_string="${", variable_end_string="}" ).from_string(source) -print jinja_template.environment.compile(source, raw=True) +print(jinja_template.environment.compile(source, raw=True)) p = Profile() diff --git a/examples/rwbench/rwbench.py b/examples/rwbench/rwbench.py index bf1d997a..c8dc5f88 100644 --- a/examples/rwbench/rwbench.py +++ b/examples/rwbench/rwbench.py @@ -10,6 +10,7 @@ :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ +from __future__ import print_function import sys from os.path import join, dirname, abspath try: @@ -104,7 +105,7 @@ if __name__ == '__main__': sys.stdout.write('\r %-20s%.4f seconds\n' % (test, t.timeit(number=200) / 200)) if '-p' in sys.argv: - print 'Jinja profile' + print('Jinja profile') p = Profile() p.runcall(test_jinja) stats = Stats(p) diff --git a/ext/django2jinja/django2jinja.py b/ext/django2jinja/django2jinja.py index d2f3717f..c4629222 100644 --- a/ext/django2jinja/django2jinja.py +++ b/ext/django2jinja/django2jinja.py @@ -68,6 +68,7 @@ :copyright: (c) 2009 by the Jinja Team. :license: BSD. """ +from __future__ import print_function import re import os import sys @@ -128,7 +129,7 @@ def convert_templates(output_dir, extensions=('.html', '.txt'), writer=None, if callback is None: def callback(template): - print template + print(template) for directory in settings.TEMPLATE_DIRS: for dirname, _, files in os.walk(directory): @@ -308,7 +309,7 @@ class Writer(object): if node is not None and hasattr(node, 'source'): filename, lineno = self.get_location(*node.source) message = '[%s:%d] %s' % (filename, lineno, message) - print >> self.error_stream, message + print(message, file=self.error_stream) def translate_variable_name(self, var): """Performs variable name translation.""" diff --git a/ext/djangojinja2.py b/ext/djangojinja2.py index 70d60cbd..d32eadff 100644 --- a/ext/djangojinja2.py +++ b/ext/djangojinja2.py @@ -53,7 +53,7 @@ def get_template(template_name, globals=None): """Load a template.""" try: return get_env().get_template(template_name, globals=globals) - except TemplateNotFound, e: + except TemplateNotFound as e: raise TemplateDoesNotExist(str(e)) diff --git a/scripts/jinja2-debug.py b/scripts/jinja2-debug.py index 71daeb98..13350db6 100755 --- a/scripts/jinja2-debug.py +++ b/scripts/jinja2-debug.py @@ -9,6 +9,7 @@ :copyright: Copyright 2010 by Armin Ronacher. :license: BSD. """ +from __future__ import print_function import sys import jinja2 from werkzeug import script