summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #943 from RubenGarcia/masterDavid Lord2019-02-081-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix typo
| * | | | Fix typoRuben Garcia2019-02-081-1/+1
|/ / / /
* | | | Merge pull request #932 from jdufresne/py37David Lord2018-12-083-2/+6
|\ \ \ \ | | | | | | | | | | Add testing and document support for Python 3.7 & pypy3
| * | | | Add testing and document support for Python 3.7 & pypy3Jon Dufresne2018-12-083-2/+6
| | | | |
* | | | | Merge pull request #929 from ExplodingCabbage/fix-nl2brDavid Lord2018-11-251-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix broken nl2br filter example
| * | | | Fix broken nl2br filter exampleMark Amery2018-11-251-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | 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).
* | | | Merge pull request #920 from jdufresne/easy-installDavid Lord2018-11-191-27/+4
|\ \ \ \ | | | | | | | | | | Remove reference to deprecated easy_install; use pip instead
| * | | | Remove reference to deprecated easy_install; use pip insteadJon Dufresne2018-11-021-27/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #926 from PinkFloyded/last_filter_doc_updateDavid Lord2018-11-191-1/+9
|\ \ \ \ \ | |/ / / / |/| | | | Clarify in docs that last filter doesn't work with generators
| * | | | Clarify that last filter doesn't work with generatorsPinkFloyded2018-11-171-1/+9
|/ / / /
* | | | Merge pull request #918 from TGogniashvili/tg.fix-linenoDavid Lord2018-10-301-1/+1
|\ \ \ \ | | | | | | | | | | parser: Fix typo `self.lineno` -> `token.lineno`
| * | | | parser: Fix typo `self.lineno` -> `token.lineno`Tornike Gogniashvili2018-10-291-1/+1
|/ / / /
* | | | Merge pull request #914 from greyli/fix-tag-statement-in-docsDavid Lord2018-10-181-1/+1
|\ \ \ \ | | | | | | | | | | [Docs] Fix ambiguity in include section
| * | | | Fix ambiguity in include sectionGrey Li2018-10-181-1/+1
|/ / / /
* | | | Merge pull request #797 from jdufresne/pyreqDavid Lord2018-08-301-0/+1
|\ \ \ \ | | | | | | | | | | Pass python_requires argument to setuptools
| * | | | Pass python_requires argument to setuptoolsJon Dufresne2018-08-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #891 from jdufresne/wsDavid Lord2018-08-306-55/+55
|\ \ \ \ \ | | | | | | | | | | | | Trim trailing white space throughout the project
| * | | | | Trim trailing white space throughout the projectJon Dufresne2018-08-296-55/+55
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #892 from jdufresne/trove-pypyDavid Lord2018-08-301-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | Add trove classifier for PyPy support
| * | | | Add trove classifier for PyPy supportJon Dufresne2018-08-291-0/+2
|/ / / / | | | | | | | | | | | | Tested during CI since 761da6ff612966214fe9e34ac6bc86499e34da26.
* | | | Merge pull request #853 from doobeh/584-filters-indexDavid Lord2018-08-071-0/+27
|\ \ \ \ | | | | | | | | | | Quick lookup table for builtin filters and tests-- references #584
| * | | | Quick lookup table for builtin filters and tests-- references #584Anthony Plunkett2018-05-141-0/+27
| | | | |
* | | | | Merge pull request #869 from jwflory/docs/vim-syntaxDavid Lord2018-08-071-8/+13
|\ \ \ \ \ | | | | | | | | | | | | Update integration docs for Vim syntax highlighting
| * | | | | Update integration docs for Vim syntax highlightingJustin W. Flory2018-06-271-8/+13
| | | | | |
* | | | | | Merge pull request #867 from The-Compiler/collectionsDavid Lord2018-08-076-26/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Import abstract base classes from collections.abc
| * | | | | | Import abstract base classes from collections.abcFlorian Bruhin2018-08-076-26/+19
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
* | | | | | Merge pull request #883 from pallets/pytestDavid Lord2018-08-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | temporarily pin pytest to avoid test bug
| * | | | | | temporarily pin pytest to avoid test bugDavid Lord2018-08-071-1/+1
|/ / / / / /
* | | | | | Merge pull request #868 from The-Compiler/py33David Lord2018-08-077-11/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Drop Python 2.6 and 3.3 support
| * | | | | Add myself to AUTHORSFlorian Bruhin2018-06-271-0/+1
| | | | | |
| * | | | | Also drop Python 2.6Florian Bruhin2018-06-276-13/+9
| | | | | |
| * | | | | Drop Python 3.3 supportFlorian Bruhin2018-06-276-7/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | It's currently broken on Travis (as it was dropped in 'wheel'), so continuing to support it is probably not worth the pain.
* | | | | Merge pull request #849 from funkyfuture/patch-1Hsiaoming Yang2018-05-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixes 'awaitable' typo in api.rst
| * | | | | Fixes 'awaitable' typo in api.rstFrank Sachsenheim2018-05-111-1/+1
| |/ / / /
* | | | | Merge pull request #852 from ngr/html_highlight_fixDavid Lord2018-05-141-1/+3
|\ \ \ \ \ | | | | | | | | | | | | remove html+jinja highlight
| * | | | | remove html+jinja highlightngr2018-05-141-1/+3
| |/ / / /
* | | | | Merge pull request #802 from abadger/allow-more-splattingDavid Lord2018-05-142-4/+11
|\ \ \ \ \ | | | | | | | | | | | | More closely match python splatting for calls
| * | | | | More closely match python splatting for callsToshio Kuratomi2018-01-292-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge pull request #851 from ngr/tests_for_rawDavid Lord2018-05-142-0/+17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | {% raw %} tests and note for documentation
| * | | | | {% raw %} tests and note for documentationngr2018-05-142-0/+17
|/ / / / /
* | | | | Merge pull request #841 from jdufresne/pypiDavid Lord2018-04-182-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Update all pypi.python.org URLs to pypi.org
| * | | | | Update all pypi.python.org URLs to pypi.orgJon Dufresne2018-04-182-5/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | For details on the new PyPI, see the blog post: https://pythoninsider.blogspot.ca/2018/04/new-pypi-launched-legacy-pypi-shutting.html
* | | | | Merge pull request #840 from nwalsh1995/masterDavid Lord2018-04-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix small typo in docs/api.rst
| * | | | | Fix small typonwalsh19952018-04-171-1/+1
|/ / / / /
* | | | | Remove old GPL licensed emacs supportArmin Ronacher2018-03-281-128/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This is unmaintained anyways and we do not want to ship non BSD code. Fixes #833
* | | | | Merge pull request #826 from terminalmage/issue823David Lord2018-03-223-9/+27
|\ \ \ \ \ | | | | | | | | | | | | Fix escaped characters in indent filter
| * | | | | Remove unescape method for fixing concatenation issueErik Johnson2018-03-191-14/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that we only concatenate Markup instances to other Markup instances.
| * | | | | Add .pytest_cache/ to gitignoreErik Johnson2018-03-191-0/+1
| | | | | |
| * | | | | Apply unesacpe fix when blank is TrueErik Johnson2018-03-191-7/+13
| | | | | |
| * | | | | Fix spelling in docstringErik Johnson2018-03-191-1/+1
| | | | | |
View Lorry Controller Status