diff options
author | David Lord <davidism@gmail.com> | 2020-01-28 20:16:59 -0800 |
---|---|---|
committer | David Lord <davidism@gmail.com> | 2020-01-28 23:09:56 -0800 |
commit | 35a97b228e28a51602ebf1515afb32eb7da40982 (patch) | |
tree | abde9b1d55c0ef3b122e9748da477f2c6586ba6b /src/jinja2/sandbox.py | |
parent | d6dba5033d8a0ae746e7802bc691dbc0bb53813e (diff) | |
download | jinja2-35a97b228e28a51602ebf1515afb32eb7da40982.tar.gz |
apply pyupgrade and f-strings
Diffstat (limited to 'src/jinja2/sandbox.py')
-rw-r--r-- | src/jinja2/sandbox.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/jinja2/sandbox.py b/src/jinja2/sandbox.py index 1263c77..deecf61 100644 --- a/src/jinja2/sandbox.py +++ b/src/jinja2/sandbox.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """A sandbox layer that ensures unsafe operations cannot be performed. Useful when the template itself comes from an untrusted source. """ @@ -126,7 +125,7 @@ def safe_range(*args): if len(rng) > MAX_RANGE: raise OverflowError( "Range too big. The sandbox blocks ranges larger than" - " MAX_RANGE (%d)." % MAX_RANGE + f" MAX_RANGE ({MAX_RANGE})." ) return rng @@ -135,7 +134,7 @@ def safe_range(*args): def unsafe(f): """Marks a function or method as unsafe. - :: + .. code-block: python @unsafe def delete(self): @@ -370,8 +369,8 @@ class SandboxedEnvironment(Environment): def unsafe_undefined(self, obj, attribute): """Return an undefined object for unsafe attributes.""" return self.undefined( - "access to attribute %r of %r " - "object is unsafe." % (attribute, obj.__class__.__name__), + f"access to attribute {attribute!r} of" + f" {obj.__class__.__name__!r} object is unsafe.", name=attribute, obj=obj, exc=SecurityError, @@ -389,8 +388,8 @@ class SandboxedEnvironment(Environment): if format_func is not None and format_func.__name__ == "format_map": if len(args) != 1 or kwargs: raise TypeError( - "format_map() takes exactly one argument %d given" - % (len(args) + (kwargs is not None)) + "format_map() takes exactly one argument" + f" {len(args) + (kwargs is not None)} given" ) kwargs = args[0] @@ -409,7 +408,7 @@ class SandboxedEnvironment(Environment): # the double prefixes are to avoid double keyword argument # errors when proxying the call. if not __self.is_safe_callable(__obj): - raise SecurityError("%r is not safely callable" % (__obj,)) + raise SecurityError(f"{__obj!r} is not safely callable") return __context.call(__obj, *args, **kwargs) @@ -425,7 +424,7 @@ class ImmutableSandboxedEnvironment(SandboxedEnvironment): return not modifies_known_mutable(obj, attr) -class SandboxedFormatterMixin(object): +class SandboxedFormatterMixin: def __init__(self, env): self._env = env |