From: Armin Ronacher Date: Mon, 20 May 2013 15:54:48 +0000 (+0100) Subject: Since we no longer support 2.5 we can use the builtin next() function X-Git-Tag: 2.8~117 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b89d1a8fe3fcbd73a8f4cebd4358eadebc2d8a9d;p=thirdparty%2Fjinja.git Since we no longer support 2.5 we can use the builtin next() function --- diff --git a/docs/jinjaext.py b/docs/jinjaext.py index 3c217f84..cdacba9d 100644 --- a/docs/jinjaext.py +++ b/docs/jinjaext.py @@ -23,7 +23,6 @@ from pygments.style import Style from pygments.token import Keyword, Name, Comment, String, Error, \ Number, Operator, Generic from jinja2 import Environment, FileSystemLoader -from jinja2._compat import next def parse_rst(state, content_offset, doc): diff --git a/jinja2/_compat.py b/jinja2/_compat.py index 8fa8a49a..aaf79b01 100644 --- a/jinja2/_compat.py +++ b/jinja2/_compat.py @@ -82,12 +82,6 @@ else: return filename.encode('utf-8') return filename -try: - next = next -except NameError: - def next(it): - return it.next() - def with_metaclass(meta, *bases): # This requires a bit of explanation: the basic idea is to make a diff --git a/jinja2/compiler.py b/jinja2/compiler.py index d9d7ef97..ad341788 100644 --- a/jinja2/compiler.py +++ b/jinja2/compiler.py @@ -16,7 +16,7 @@ from jinja2.nodes import EvalContext from jinja2.visitor import NodeVisitor from jinja2.exceptions import TemplateAssertionError from jinja2.utils import Markup, concat, escape -from jinja2._compat import range_type, next, text_type, string_types, \ +from jinja2._compat import range_type, text_type, string_types, \ iteritems, NativeStringIO, imap diff --git a/jinja2/ext.py b/jinja2/ext.py index c2df12d5..562ab506 100644 --- a/jinja2/ext.py +++ b/jinja2/ext.py @@ -20,7 +20,7 @@ from jinja2.environment import Environment from jinja2.runtime import concat from jinja2.exceptions import TemplateAssertionError, TemplateSyntaxError from jinja2.utils import contextfunction, import_string, Markup -from jinja2._compat import next, with_metaclass, string_types, iteritems +from jinja2._compat import with_metaclass, string_types, iteritems # the only real useful gettext functions for a Jinja template. Note diff --git a/jinja2/filters.py b/jinja2/filters.py index 49e82aad..58c0bb66 100644 --- a/jinja2/filters.py +++ b/jinja2/filters.py @@ -18,7 +18,7 @@ from jinja2.utils import Markup, escape, pformat, urlize, soft_unicode, \ unicode_urlencode from jinja2.runtime import Undefined from jinja2.exceptions import FilterArgumentError -from jinja2._compat import next, imap, string_types, text_type, iteritems +from jinja2._compat import imap, string_types, text_type, iteritems _word_re = re.compile(r'\w+(?u)') diff --git a/jinja2/lexer.py b/jinja2/lexer.py index a5012850..36042e01 100644 --- a/jinja2/lexer.py +++ b/jinja2/lexer.py @@ -20,7 +20,7 @@ from operator import itemgetter from collections import deque from jinja2.exceptions import TemplateSyntaxError from jinja2.utils import LRUCache -from jinja2._compat import next, iteritems, implements_iterator, text_type, \ +from jinja2._compat import iteritems, implements_iterator, text_type, \ intern diff --git a/jinja2/nodes.py b/jinja2/nodes.py index 81fafb8b..037fbe27 100644 --- a/jinja2/nodes.py +++ b/jinja2/nodes.py @@ -16,7 +16,7 @@ import operator from collections import deque from jinja2.utils import Markup -from jinja2._compat import next, izip, with_metaclass, text_type, \ +from jinja2._compat import izip, with_metaclass, text_type, \ method_type, function_type diff --git a/jinja2/parser.py b/jinja2/parser.py index f60cd018..18ed844a 100644 --- a/jinja2/parser.py +++ b/jinja2/parser.py @@ -11,7 +11,7 @@ from jinja2 import nodes from jinja2.exceptions import TemplateSyntaxError, TemplateAssertionError from jinja2.lexer import describe_token, describe_token_expr -from jinja2._compat import next, imap +from jinja2._compat import imap #: statements that callinto diff --git a/jinja2/runtime.py b/jinja2/runtime.py index d27ca537..64d42a35 100644 --- a/jinja2/runtime.py +++ b/jinja2/runtime.py @@ -14,7 +14,7 @@ from jinja2.utils import Markup, soft_unicode, escape, missing, concat, \ internalcode, object_type_repr from jinja2.exceptions import UndefinedError, TemplateRuntimeError, \ TemplateNotFound -from jinja2._compat import next, imap, text_type, iteritems, \ +from jinja2._compat import imap, text_type, iteritems, \ implements_iterator, implements_to_string, string_types, PY2 diff --git a/jinja2/testsuite/api.py b/jinja2/testsuite/api.py index 1b68bf8b..4a0ec5a9 100644 --- a/jinja2/testsuite/api.py +++ b/jinja2/testsuite/api.py @@ -14,7 +14,6 @@ import tempfile import shutil from jinja2.testsuite import JinjaTestCase -from jinja2._compat import next from jinja2 import Environment, Undefined, DebugUndefined, \ StrictUndefined, UndefinedError, meta, \ diff --git a/jinja2/testsuite/ext.py b/jinja2/testsuite/ext.py index 0f93be94..4f0b2231 100644 --- a/jinja2/testsuite/ext.py +++ b/jinja2/testsuite/ext.py @@ -17,7 +17,7 @@ from jinja2 import Environment, DictLoader, contextfunction, nodes from jinja2.exceptions import TemplateAssertionError from jinja2.ext import Extension from jinja2.lexer import Token, count_newlines -from jinja2._compat import next, BytesIO, itervalues, text_type +from jinja2._compat import BytesIO, itervalues, text_type importable_object = 23 diff --git a/jinja2/testsuite/lexnparse.py b/jinja2/testsuite/lexnparse.py index bd1c94cd..8ca0b7c8 100644 --- a/jinja2/testsuite/lexnparse.py +++ b/jinja2/testsuite/lexnparse.py @@ -14,7 +14,7 @@ from jinja2.testsuite import JinjaTestCase from jinja2 import Environment, Template, TemplateSyntaxError, \ UndefinedError, nodes -from jinja2._compat import next, iteritems, text_type, PY2 +from jinja2._compat import iteritems, text_type, PY2 from jinja2.lexer import Token, TokenStream, TOKEN_EOF, \ TOKEN_BLOCK_BEGIN, TOKEN_BLOCK_END