Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:mitsuhiko/jinja2

  • Loading branch information...
commit 8a05e937cca3f5da09e482adb9821e3fb266b6cc 2 parents ff115c4 + b523c93
@mitsuhiko mitsuhiko authored
Showing with 5 additions and 6 deletions.
  1. +1 −1  docs/api.rst
  2. +3 −3 docs/templates.rst
  3. +1 −2  jinja2/loaders.py
View
2  docs/api.rst
@@ -596,7 +596,7 @@ paragraphs and marks the return value as safe HTML string if autoescaping is
enabled::
import re
- from jinja2 import environmentfilter, Markup, escape
+ from jinja2 import evalcontextfilter, Markup, escape
_paragraph_re = re.compile(r'(?:\r\n|\r|\n){2,}')
View
6 docs/templates.rst
@@ -44,7 +44,7 @@ the details later in that document::
This covers the default settings. The application developer might have
changed the syntax from ``{% foo %}`` to ``<% foo %>`` or something similar.
-There are two kinds of delimiers. ``{% ... %}`` and ``{{ ... }}``. The first
+There are two kinds of delimiters. ``{% ... %}`` and ``{{ ... }}``. The first
one is used to execute statements such as for-loops or assign values, the
latter prints the result of the expression to the template.
@@ -165,7 +165,7 @@ that block::
{% for item in seq -%}
{{ item }}
{%- endfor %}
-
+
This will yield all elements without whitespace between them. If `seq` was
a list of numbers from ``1`` to ``9`` the output would be ``123456789``.
@@ -1174,7 +1174,7 @@ The following functions are available in the global scope by default:
.. attribute:: current
Returns the current item.
-
+
**new in Jinja 2.1**
.. class:: joiner(sep=', ')
View
3  jinja2/loaders.py
@@ -251,8 +251,7 @@ def _walk(path):
for filename in self.provider.resource_listdir(path):
fullname = path + '/' + filename
if self.provider.resource_isdir(fullname):
- for item in _walk(fullname):
- results.append(item)
+ _walk(fullname)
else:
results.append(fullname[offset:].lstrip('/'))
_walk(path)
Please sign in to comment.
Something went wrong with that request. Please try again.