Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '2.10.x' | David Lord | 2019-07-26 | 1 | -4/+8 |
|\ | |||||
| * | sandbox uses xrange on Python 2 | Prakhar Bhandari | 2019-07-22 | 1 | -4/+8 |
| | | |||||
| * | Import abstract base classes from collections.abc | Florian Bruhin | 2019-06-18 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch '2.10.x' | David Lord | 2019-04-06 | 1 | -3/+14 |
|\ \ | |/ | |||||
| * | sandbox str.format_map | Armin Ronacher | 2019-04-06 | 1 | -3/+14 |
| | | |||||
* | | Import abstract base classes from collections.abc | Florian Bruhin | 2018-08-07 | 1 | -7/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ``` | ||||
* | | Fix typo: apparenlty -> apparently. | Jon Dufresne | 2018-03-04 | 1 | -1/+1 |
| | | |||||
* | | Fix typos (#815) | luzpaz | 2018-02-18 | 1 | -2/+2 |
|/ | | | Found via `codespell -q 3` using v1.12.0.dev0 | ||||
* | In documentation, prefer https over http when available | Jon Dufresne | 2017-04-09 | 1 | -1/+1 |
| | |||||
* | Remove unused/duplicate imports | Adrian Moennich | 2017-01-09 | 1 | -1/+1 |
| | |||||
* | Bump up the copyright to 2017 | Armin Ronacher | 2017-01-07 | 1 | -1/+1 |
| | |||||
* | Expect format | Armin Ronacher | 2017-01-06 | 1 | -43/+38 |
| | |||||
* | Fixed a name error for an uncommon attribute access in the sandbox2.8-maintenance | Armin Ronacher | 2016-12-29 | 1 | -1/+1 |
| | |||||
* | SECURITY: support sandboxing in format expressions | Armin Ronacher | 2016-12-29 | 1 | -3/+116 |
| | |||||
* | Fix doctests | Markus Unterwaditzer | 2015-03-22 | 1 | -10/+9 |
| | | | | Fix #427 | ||||
* | Removed duplication from types that was only necessary for IronPython | Armin Ronacher | 2013-05-20 | 1 | -6/+6 |
| | |||||
* | Make the runtime leak less of the version hacks | Armin Ronacher | 2013-05-20 | 1 | -2/+9 |
| | |||||
* | Moved all six usages (ignoring testsuite) into jinja2._compat | Armin Ronacher | 2013-05-19 | 1 | -8/+7 |
| | |||||
* | Merge branch 'master' into sprint-branch | Armin Ronacher | 2013-05-18 | 1 | -1/+1 |
|\ | |||||
| * | Fixed typos: overriden to overridden | Jonas Nockert | 2013-02-23 | 1 | -1/+1 |
| | | |||||
* | | python 3 port: manual fixes, remove 2to3 from setup.py, remove fixers | Thomas Waldmann | 2013-05-18 | 1 | -1/+2 |
| | | |||||
* | | python 3 port: automated changes by a slightly modified python-modernize | Thomas Waldmann | 2013-05-17 | 1 | -1/+1 |
|/ | | | | (replacing unicode with six.text_type, but not replacing u"" by six.u("")) | ||||
* | Damn you Sphinx | Armin Ronacher | 2011-01-24 | 1 | -2/+3 |
| | |||||
* | Implemented operator intercepting | Armin Ronacher | 2010-11-29 | 1 | -1/+90 |
| | |||||
* | Fixed a typo and removed a useless backslash | Armin Ronacher | 2010-11-29 | 1 | -1/+1 |
| | |||||
* | Changed naked except statements to catch only subclasses of Exception. | Ian Lewis | 2010-11-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Naked except statements catch subclasses of BaseException which can occur anywhere (i.e. KeyboardInterrupt). Unexpected issues can occur when the exception happens during the loading of a module. The python interpreter doesn't know about a module's failed load and does not remove it from sys.modules. This is particularly a problem on AppEngine where python will think the module is loaded but in fact the module load has failed. See: http://code.google.com/p/googleappengine/issues/detail?id=1409 Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com> | ||||
* | Approaching python3 compatibility | Armin Ronacher | 2010-02-10 | 1 | -5/+13 |
| | | | | | --HG-- branch : trunk | ||||
* | It's a new year | Armin Ronacher | 2010-01-22 | 1 | -1/+1 |
| | | | | | --HG-- branch : trunk | ||||
* | jinja2.sandbox should not warn on 2.6 any more. | Armin Ronacher | 2009-02-19 | 1 | -2/+15 |
| | | | | | --HG-- branch : trunk | ||||
* | Copyright switch to "The Jinja Team". | Armin Ronacher | 2009-01-04 | 1 | -1/+1 |
| | | | | | --HG-- branch : trunk | ||||
* | Fixed a small bug with the undefined object: the error message on divisions ↵ | Armin Ronacher | 2008-11-02 | 1 | -2/+2 |
| | | | | | | | with undefined objects was misleading. --HG-- branch : trunk | ||||
* | Removed a few stdlib dependencies. This is the first step for IronPython ↵ | Armin Ronacher | 2008-08-13 | 1 | -2/+2 |
| | | | | | | | support, the second one being a new lexer. --HG-- branch : trunk | ||||
* | Improved attribute and item lookup by allowing template designers to express ↵ | Armin Ronacher | 2008-06-12 | 1 | -6/+27 |
| | | | | | | | the priority. foo.bar checks foo.bar first and then foo['bar'] and the other way round. --HG-- branch : trunk | ||||
* | improved sandbox and updated setup.py | Armin Ronacher | 2008-05-26 | 1 | -40/+61 |
| | | | | | --HG-- branch : trunk | ||||
* | added attr filter | Armin Ronacher | 2008-05-26 | 1 | -1/+1 |
| | | | | | --HG-- branch : trunk | ||||
* | items have a higher priority than attributes now. That's compatible with ↵ | Armin Ronacher | 2008-05-26 | 1 | -21/+18 |
| | | | | | | | Jinja1 and Django --HG-- branch : trunk | ||||
* | all calls are proxied by context.call now so that we can inject environment ↵ | Armin Ronacher | 2008-05-25 | 1 | -2/+2 |
| | | | | | | | and context as first arguments. This slows calls down a bit but is a lot more user friendly. Added first draft of FAQ --HG-- branch : trunk | ||||
* | added `ImmutableSandboxedEnvironment`. | Armin Ronacher | 2008-05-17 | 1 | -0/+59 |
| | | | | | --HG-- branch : trunk | ||||
* | subscribe doesn't eat up unicode errors any longer | Armin Ronacher | 2008-05-17 | 1 | -5/+10 |
| | | | | | --HG-- branch : trunk | ||||
* | improved subscribe | Armin Ronacher | 2008-05-13 | 1 | -8/+9 |
| | | | | | --HG-- branch : trunk | ||||
* | documentation update | Armin Ronacher | 2008-05-07 | 1 | -19/+50 |
| | | | | | --HG-- branch : trunk | ||||
* | extra security | Armin Ronacher | 2008-05-04 | 1 | -2/+9 |
| | | | | | --HG-- branch : trunk | ||||
* | improved sandbox, added proper striptags and updated documentation to latest ↵ | Armin Ronacher | 2008-05-04 | 1 | -3/+12 |
| | | | | | | | sphinx changes --HG-- branch : trunk | ||||
* | moved concat to utils, fixed a few docstrings, fixed memory leak in ↵ | Armin Ronacher | 2008-05-03 | 1 | -3/+5 |
| | | | | | | | _speedups.escape --HG-- branch : trunk | ||||
* | improved undefined behavior | Armin Ronacher | 2008-04-17 | 1 | -9/+19 |
| | | | | | --HG-- branch : trunk | ||||
* | added sandbox and exchageable undefined objects | Armin Ronacher | 2008-04-14 | 1 | -0/+87 |
--HG-- branch : trunk |