From: Armin Ronacher Date: Mon, 29 Nov 2010 11:39:11 +0000 (+0100) Subject: Fixed a typo and removed a useless backslash X-Git-Tag: 2.6~40 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9455c186f53eb7b7eec98d2a53ecd3db812778e;p=thirdparty%2Fjinja.git Fixed a typo and removed a useless backslash --- diff --git a/jinja2/environment.py b/jinja2/environment.py index 95ca10a8..2dd38ef9 100644 --- a/jinja2/environment.py +++ b/jinja2/environment.py @@ -539,7 +539,7 @@ class Environment(object): def compile_templates(self, target, extensions=None, filter_func=None, zip='deflated', log_function=None, ignore_errors=True, py_compile=False): - """Compiles all the templates the loader can find, compiles them + """Finds all the templates the loader can find, compiles them and stores them in `target`. If `zip` is `None`, instead of in a zipfile, the templates will be will be stored in a directory. By default a deflate zip algorithm is used, to switch to diff --git a/jinja2/sandbox.py b/jinja2/sandbox.py index 55817be9..0c9f5732 100644 --- a/jinja2/sandbox.py +++ b/jinja2/sandbox.py @@ -201,7 +201,7 @@ class SandboxedEnvironment(Environment): True. Override this method to alter the behavior, but this won't affect the `unsafe` decorator from this module. """ - return not (getattr(obj, 'unsafe_callable', False) or \ + return not (getattr(obj, 'unsafe_callable', False) or getattr(obj, 'alters_data', False)) def getitem(self, obj, argument):