]>
git.ipfire.org Git - thirdparty/jinja.git/log
jab [Thu, 6 Jun 2019 03:04:36 +0000 (03:04 +0000)]
Fix "duplicate object description of jinja2" warning
Follow suggestion to use :noindex: for the instance in api."
jab [Thu, 6 Jun 2019 02:34:01 +0000 (02:34 +0000)]
Improve nested extends (super.super) example.
Scott Crosby [Fri, 31 May 2019 19:31:10 +0000 (14:31 -0500)]
Write a new documentation section on nesting extends.
David Lord [Fri, 31 May 2019 17:15:03 +0000 (13:15 -0400)]
Merge pull request #1008 from gokcegrbl/GH-999
Added new method itervalues() to LRUCache and deprecated itervalue()
gokcegrbl [Fri, 31 May 2019 12:28:44 +0000 (12:28 +0000)]
Added new method itervalues() to LRUCache and deprecated itervalue()
(Fixes pallets/jinja#999)
David Lord [Tue, 21 May 2019 14:50:07 +0000 (07:50 -0700)]
Merge pull request #1004 from myii/patch-1
docs(filters): fix typo `columwrapper` => `columnwrapper`
Imran Iqbal [Mon, 20 May 2019 12:19:08 +0000 (13:19 +0100)]
docs(filters): fix typo `columwrapper` => `columnwrapper`
David Lord [Fri, 17 May 2019 13:33:37 +0000 (06:33 -0700)]
Merge pull request #1003 from flexferrum/master
Remove duplicated testcase
Flex Ferrum [Thu, 16 May 2019 10:54:05 +0000 (13:54 +0300)]
Remove duplicated testcase
Étienne Pelletier [Wed, 8 May 2019 14:47:33 +0000 (10:47 -0400)]
Add ChainableUndefined allowing getattr & getitem (#997)
* Add ChainableUndefined allowing getattr & getitem
Allows using default values with chains of items or attributes that may
contain undefined values without raising a jinja2.exceptions.UndefinedError.
>>> import jinja2
>>> env = jinja2.Environment(undefined=jinja2.ChainableUndefined)
>>> env.from_string("{{ foo.bar['baz'] | default('val') }}").render()
'val'
* Remove class decorator from ChainableUndefined
David Lord [Mon, 6 May 2019 19:41:36 +0000 (15:41 -0400)]
Merge pull request #989 from LindsayYoung/patch-1
Create CODE_OF_CONDUCT.md
Lindsay Young [Mon, 6 May 2019 17:10:17 +0000 (13:10 -0400)]
Create CODE_OF_CONDUCT.md
Ticket is referenced in [#Issue 1](https://github.com/pallets/meta/issues/1) in the Meta repo.
I spoke with @davidism and the decision was to use Contributor Covenant. It has easy GitHub integration and quality content.
Raul Tambre [Thu, 2 May 2019 17:23:56 +0000 (20:23 +0300)]
Fix use of 'is' operator for comparison
The 'is' operator is not meant to be used for comparisons. It currently working is an implementation detail of CPython.
CPython 3.8 has added a SyntaxWarning for this.
David Lord [Mon, 6 May 2019 14:24:46 +0000 (07:24 -0700)]
Merge remote-tracking branch 'origin/2.10.x'
David Lord [Mon, 6 May 2019 14:24:09 +0000 (10:24 -0400)]
Merge pull request #982 from kevin-brown/sphinx-upgrade
Fix tox docs-html builds
Kevin Brown [Mon, 6 May 2019 14:07:48 +0000 (10:07 -0400)]
Fix tox docs-html builds
These have been broken for about a month now because of the upgrade
to Sphinx 2. This upgrade happened automatically because we do not
have the version pinned.
Luckily this issue appears to only be from having Python 2 syntax in
the docs script, so making that compatible with Python 3 fixes the
error and allows the docs to pass.
David Lord [Sat, 6 Apr 2019 20:12:56 +0000 (13:12 -0700)]
Merge branch '2.10.x'
David Lord [Sat, 6 Apr 2019 18:02:53 +0000 (11:02 -0700)]
release 2.10.1
Armin Ronacher [Sat, 6 Apr 2019 17:50:47 +0000 (10:50 -0700)]
sandbox str.format_map
Armin Ronacher [Mon, 18 Feb 2019 07:15:10 +0000 (08:15 +0100)]
Update CHANGES.rst
seaders [Mon, 18 Feb 2019 07:14:47 +0000 (07:14 +0000)]
Await in async version of the map filter (#913)
David Lord [Fri, 8 Feb 2019 13:09:29 +0000 (05:09 -0800)]
Merge pull request #943 from RubenGarcia/master
Fix typo
Ruben Garcia [Fri, 8 Feb 2019 10:18:06 +0000 (11:18 +0100)]
Fix typo
David Lord [Sat, 8 Dec 2018 18:32:39 +0000 (10:32 -0800)]
Merge pull request #932 from jdufresne/py37
Add testing and document support for Python 3.7 & pypy3
Jon Dufresne [Sat, 8 Dec 2018 18:04:08 +0000 (10:04 -0800)]
Add testing and document support for Python 3.7 & pypy3
David Lord [Sun, 25 Nov 2018 18:54:43 +0000 (10:54 -0800)]
Merge pull request #929 from ExplodingCabbage/fix-nl2br
Fix broken nl2br filter example
Mark Amery [Sun, 25 Nov 2018 17:49:22 +0000 (17:49 +0000)]
Fix broken nl2br filter example
This example attempts to handle both Windows-style and Unix-style line endings, but does it wrong; as noted at https://stackoverflow.com/q/
12521127 /
1709587 , the regex here will match a single \r\n as if it were a double line-break, which results in all single Windows-style line-breaks getting converted into <p> breaks instead of <br> breaks as intended.
This patch fixes that by applying Alan Moore's proposed fix from https://stackoverflow.com/a/
12521544 /
1709587 of using a negative lookahead so that a \r cannot be counted as a line break if it is followed by a \n (while still allowing the \r\n combination to count as a line break).
David Lord [Tue, 20 Nov 2018 04:06:17 +0000 (20:06 -0800)]
Merge pull request #920 from jdufresne/easy-install
Remove reference to deprecated easy_install; use pip instead
David Lord [Tue, 20 Nov 2018 04:04:17 +0000 (20:04 -0800)]
Merge pull request #926 from PinkFloyded/last_filter_doc_update
Clarify in docs that last filter doesn't work with generators
PinkFloyded [Fri, 16 Nov 2018 23:33:46 +0000 (05:03 +0530)]
Clarify that last filter doesn't work with generators
Jon Dufresne [Fri, 2 Nov 2018 01:21:10 +0000 (18:21 -0700)]
Remove reference to deprecated easy_install; use pip instead
easy_install is deprecated and its use is discouraged by PyPA:
https://setuptools.readthedocs.io/en/latest/easy_install.html
> Warning: Easy Install is deprecated. Do not use it. Instead use pip.
Follow upstream advice and only recommended supported tools. Replace
with pip.
David Lord [Tue, 30 Oct 2018 13:52:36 +0000 (06:52 -0700)]
Merge pull request #918 from TGogniashvili/tg.fix-lineno
parser: Fix typo `self.lineno` -> `token.lineno`
Tornike Gogniashvili [Mon, 29 Oct 2018 19:32:49 +0000 (19:32 +0000)]
parser: Fix typo `self.lineno` -> `token.lineno`
David Lord [Thu, 18 Oct 2018 12:24:28 +0000 (05:24 -0700)]
Merge pull request #914 from greyli/fix-tag-statement-in-docs
[Docs] Fix ambiguity in include section
Grey Li [Thu, 18 Oct 2018 04:59:19 +0000 (12:59 +0800)]
Fix ambiguity in include section
David Lord [Thu, 30 Aug 2018 14:09:27 +0000 (07:09 -0700)]
Merge pull request #797 from jdufresne/pyreq
Pass python_requires argument to setuptools
David Lord [Thu, 30 Aug 2018 14:09:00 +0000 (07:09 -0700)]
Merge pull request #891 from jdufresne/ws
Trim trailing white space throughout the project
David Lord [Thu, 30 Aug 2018 14:08:16 +0000 (07:08 -0700)]
Merge pull request #892 from jdufresne/trove-pypy
Add trove classifier for PyPy support
Jon Dufresne [Thu, 30 Aug 2018 04:02:27 +0000 (21:02 -0700)]
Add trove classifier for PyPy support
Tested during CI since
761da6ff612966214fe9e34ac6bc86499e34da26 .
Jon Dufresne [Thu, 30 Aug 2018 03:58:03 +0000 (20:58 -0700)]
Trim trailing white space throughout the project
Many editors clean up trailing white space on save. By removing it all
in one go, it helps keep future diffs cleaner by avoiding spurious white
space changes on unrelated lines.
Jon Dufresne [Thu, 11 Jan 2018 13:55:37 +0000 (05:55 -0800)]
Pass python_requires argument to setuptools
Helps pip decide what version of the library to install.
https://packaging.python.org/tutorials/distributing-packages/#python-requires
> If your project only runs on certain Python versions, setting the
> python_requires argument to the appropriate PEP 440 version specifier
> string will prevent pip from installing the project on other Python
> versions.
https://setuptools.readthedocs.io/en/latest/setuptools.html#new-and-changed-setup-keywords
> python_requires
>
> A string corresponding to a version specifier (as defined in PEP 440)
> for the Python version, used to specify the Requires-Python defined in
> PEP 345.
David Lord [Tue, 7 Aug 2018 17:43:48 +0000 (10:43 -0700)]
Merge pull request #853 from doobeh/584-filters-index
Quick lookup table for builtin filters and tests-- references #584
David Lord [Tue, 7 Aug 2018 17:41:26 +0000 (10:41 -0700)]
Merge pull request #869 from jwflory/docs/vim-syntax
Update integration docs for Vim syntax highlighting
David Lord [Tue, 7 Aug 2018 17:29:46 +0000 (10:29 -0700)]
Merge pull request #867 from The-Compiler/collections
Import abstract base classes from collections.abc
Florian Bruhin [Wed, 27 Jun 2018 13:30:54 +0000 (15:30 +0200)]
Import abstract base classes from collections.abc
In Python 3.7, importing ABCs directly from the `collections` module shows a
warning (and in Python 3.8 it will stop working) - see
https://github.com/python/cpython/commit/
c66f9f8d3909f588c251957d499599a1680e2320
This fixes various DeprecationWarnings such as those:
```
.../jinja2/utils.py:485: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working
from collections import MutableMapping
.../jinja2/runtime.py:318: DeprecationWarning: Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated, and in 3.8 it will stop working
from collections import Mapping
```
David Lord [Tue, 7 Aug 2018 17:16:22 +0000 (10:16 -0700)]
Merge pull request #883 from pallets/pytest
temporarily pin pytest to avoid test bug
David Lord [Tue, 7 Aug 2018 17:09:54 +0000 (10:09 -0700)]
temporarily pin pytest to avoid test bug
David Lord [Tue, 7 Aug 2018 16:53:28 +0000 (09:53 -0700)]
Merge pull request #868 from The-Compiler/py33
Drop Python 2.6 and 3.3 support
Florian Bruhin [Wed, 27 Jun 2018 20:02:45 +0000 (22:02 +0200)]
Add myself to AUTHORS
Florian Bruhin [Wed, 27 Jun 2018 19:48:02 +0000 (21:48 +0200)]
Also drop Python 2.6
Justin W. Flory [Wed, 27 Jun 2018 18:39:26 +0000 (13:39 -0500)]
Update integration docs for Vim syntax highlighting
Florian Bruhin [Wed, 27 Jun 2018 14:13:52 +0000 (16:13 +0200)]
Drop Python 3.3 support
It's currently broken on Travis (as it was dropped in 'wheel'), so continuing to
support it is probably not worth the pain.
Hsiaoming Yang [Tue, 15 May 2018 08:52:11 +0000 (16:52 +0800)]
Merge pull request #849 from funkyfuture/patch-1
Fixes 'awaitable' typo in api.rst
Anthony Plunkett [Mon, 14 May 2018 16:24:02 +0000 (12:24 -0400)]
Quick lookup table for builtin filters and tests-- references #584
David Lord [Mon, 14 May 2018 15:48:09 +0000 (11:48 -0400)]
Merge pull request #852 from ngr/html_highlight_fix
remove html+jinja highlight
David Lord [Mon, 14 May 2018 15:21:27 +0000 (11:21 -0400)]
Merge pull request #802 from abadger/allow-more-splatting
More closely match python splatting for calls
ngr [Mon, 14 May 2018 15:20:32 +0000 (11:20 -0400)]
remove html+jinja highlight
David Lord [Mon, 14 May 2018 15:11:40 +0000 (11:11 -0400)]
Merge pull request #851 from ngr/tests_for_raw
{% raw %} tests and note for documentation
ngr [Mon, 14 May 2018 14:53:36 +0000 (10:53 -0400)]
{% raw %} tests and note for documentation
Frank Sachsenheim [Fri, 11 May 2018 19:25:22 +0000 (21:25 +0200)]
Fixes 'awaitable' typo in api.rst
David Lord [Thu, 19 Apr 2018 02:40:50 +0000 (19:40 -0700)]
Merge pull request #841 from jdufresne/pypi
Update all pypi.python.org URLs to pypi.org
Jon Dufresne [Thu, 19 Apr 2018 02:35:29 +0000 (19:35 -0700)]
Update all pypi.python.org URLs to pypi.org
For details on the new PyPI, see the blog post:
https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html
David Lord [Tue, 17 Apr 2018 23:51:24 +0000 (16:51 -0700)]
Merge pull request #840 from nwalsh1995/master
Fix small typo in docs/api.rst
nwalsh1995 [Tue, 17 Apr 2018 21:55:13 +0000 (14:55 -0700)]
Fix small typo
Armin Ronacher [Wed, 28 Mar 2018 21:31:03 +0000 (23:31 +0200)]
Remove old GPL licensed emacs support
This is unmaintained anyways and we do not want to ship non BSD code.
Fixes #833
David Lord [Thu, 22 Mar 2018 18:59:02 +0000 (11:59 -0700)]
Merge pull request #826 from terminalmage/issue823
Fix escaped characters in indent filter
Erik Johnson [Tue, 20 Mar 2018 02:56:54 +0000 (21:56 -0500)]
Remove unescape method for fixing concatenation issue
This ensures that we only concatenate Markup instances to other Markup
instances.
Erik Johnson [Mon, 19 Mar 2018 21:03:29 +0000 (16:03 -0500)]
Add .pytest_cache/ to gitignore
Erik Johnson [Mon, 19 Mar 2018 21:03:00 +0000 (16:03 -0500)]
Apply unesacpe fix when blank is True
Erik Johnson [Mon, 19 Mar 2018 19:30:46 +0000 (14:30 -0500)]
Fix spelling in docstring
Erik Johnson [Mon, 19 Mar 2018 19:18:27 +0000 (14:18 -0500)]
Add test cases for quotes and expand coverage to include Markup input
Erik Johnson [Mon, 19 Mar 2018 19:17:35 +0000 (14:17 -0500)]
Fix cases where filter input is not a Markup type
The previous commit assumes that the filter will always be a Markup
type, which is not correct.
Erik Johnson [Mon, 19 Mar 2018 18:27:38 +0000 (13:27 -0500)]
Fix escaped characters in indent filter
This unescapes after concatenating, to fix a bug introduced in Jinja
2.10 where lines concatenated contain escaped versions of non-ascii
characters.
Sean Sabbage [Mon, 19 Mar 2018 14:05:42 +0000 (14:05 +0000)]
Correct documentation for min method (#825)
David Lord [Mon, 5 Mar 2018 14:23:40 +0000 (06:23 -0800)]
Merge pull request #820 from jdufresne/typo
Fix typo: apparenlty -> apparently.
Jon Dufresne [Sun, 4 Mar 2018 20:15:52 +0000 (12:15 -0800)]
Fix typo: apparenlty -> apparently.
luzpaz [Sun, 18 Feb 2018 14:57:01 +0000 (09:57 -0500)]
Fix typos (#815)
Found via `codespell -q 3` using v1.12.0.dev0
David Lord [Tue, 6 Feb 2018 15:52:32 +0000 (07:52 -0800)]
Merge pull request #806 from methane/lazy-async-patch
Lazy asyncsupport.patch_all()
David Lord [Tue, 6 Feb 2018 15:48:10 +0000 (07:48 -0800)]
add changelog
fix unrelated docs issue
INADA Naoki [Tue, 6 Feb 2018 12:52:57 +0000 (21:52 +0900)]
Lazy asyncsupport.patch_all()
fixes #765
Godefroid Chapelle [Tue, 30 Jan 2018 20:02:33 +0000 (21:02 +0100)]
Remove old statement about Python 3 (#803)
There is now Python 3 support...
Toshio Kuratomi [Mon, 29 Jan 2018 23:44:46 +0000 (15:44 -0800)]
More closely match python splatting for calls
In Python, it's legal to use splats in function calls like this:
call_function('123', *b, c=5, **d)
Prior to this change, jinja2 did not allow that. It mandated that all
splatting had to take place at the end of the call:
call_function('123', c=5, *b, **d)
This commit allows both orders.
Additionally, this commit adds tests for more things that are illegal:
namely giving a function a positional argument after using a splat to
unpack positional arguments or giving a function a named argument after
using a double splat to unpack keyword arguments.
David Lord [Tue, 23 Jan 2018 16:31:30 +0000 (08:31 -0800)]
Merge pull request #799 from mkrizek/native-concat-list
Allow to pass a list to native_concat
David Lord [Thu, 18 Jan 2018 16:56:55 +0000 (08:56 -0800)]
fix code block markup
closes #800
Martin Krizek [Wed, 17 Jan 2018 22:09:23 +0000 (23:09 +0100)]
Don't check for generator if not needed
Martin Krizek [Wed, 17 Jan 2018 20:38:58 +0000 (21:38 +0100)]
Allow to pass a list to native_concat
David Lord [Fri, 1 Dec 2017 18:27:13 +0000 (10:27 -0800)]
Merge pull request #787 from SabujXi/patch-1
Fix typo instanciable > instantiable
Md. Sabuj Sarker [Fri, 1 Dec 2017 18:10:39 +0000 (00:10 +0600)]
Fix typo instanciable > instantiable
David Lord [Thu, 9 Nov 2017 01:21:47 +0000 (18:21 -0700)]
Merge pull request #783 from luzpaz/trivial-typos
Trivial typos
Unknown [Thu, 9 Nov 2017 01:02:28 +0000 (20:02 -0500)]
Trivial typos
Most non-user facing.
David Lord [Wed, 8 Nov 2017 20:01:29 +0000 (12:01 -0800)]
Bump version number to 2.11.dev
David Lord [Wed, 8 Nov 2017 19:58:35 +0000 (11:58 -0800)]
Bump version number to 2.10
David Lord [Wed, 1 Nov 2017 14:57:12 +0000 (07:57 -0700)]
clean up MANIFEST.in
clean up make-release.py for py3
add rst extension to CHANGES for GitHub
clean up changelog formatting
ThiefMaster [Fri, 11 Sep 2015 22:27:07 +0000 (00:27 +0200)]
Support filters in set block
- e.g {% set foo | trim %}...{% endset %}
- closes #486
David Lord [Tue, 31 Oct 2017 19:16:10 +0000 (12:16 -0700)]
Merge pull request #708 from jctanner/NATIVE_TYPES
Add support for the Environment to optionally return native types.
David Lord [Tue, 31 Oct 2017 15:51:53 +0000 (08:51 -0700)]
Merge branch 'master' into NATIVE_TYPES
Ricardo Lafuente [Mon, 16 Oct 2017 11:11:44 +0000 (12:11 +0100)]
Fix typo in docstring (#779)
David Lord [Sun, 8 Oct 2017 20:15:09 +0000 (13:15 -0700)]
codecov needs argparse on 2.6
Eli Boyarski [Mon, 18 Sep 2017 14:24:38 +0000 (17:24 +0300)]
Minor docstring grammar fix (#772)
Adrian Moennich [Tue, 22 Aug 2017 21:24:52 +0000 (23:24 +0200)]
s/Add/Added/ in CHANGES
Pretty much all other entries also use past tense