diff options
Diffstat (limited to 'jinja2/sandbox.py')
| -rw-r--r-- | jinja2/sandbox.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/jinja2/sandbox.py b/jinja2/sandbox.py index a1cbb29..ed145d5 100644 --- a/jinja2/sandbox.py +++ b/jinja2/sandbox.py @@ -13,6 +13,7 @@ :license: BSD. """ import operator +import six from jinja2.environment import Environment from jinja2.exceptions import SecurityError from jinja2.utils import FunctionType, MethodType, TracebackType, CodeType, \ @@ -90,7 +91,7 @@ def safe_range(*args): """A range that can't generate ranges with a length of more than MAX_RANGE items. """ - rng = xrange(*args) + rng = range(*args) if len(rng) > MAX_RANGE: raise OverflowError('range too big, maximum size for range is %d' % MAX_RANGE) @@ -114,7 +115,7 @@ def is_internal_attribute(obj, attr): """Test if the attribute given is an internal python attribute. For example this function returns `True` for the `func_code` attribute of python objects. This is useful if the environment method - :meth:`~SandboxedEnvironment.is_safe_attribute` is overriden. + :meth:`~SandboxedEnvironment.is_safe_attribute` is overridden. >>> from jinja2.sandbox import is_internal_attribute >>> is_internal_attribute(lambda: None, "func_code") @@ -299,7 +300,7 @@ class SandboxedEnvironment(Environment): try: return obj[argument] except (TypeError, LookupError): - if isinstance(argument, basestring): + if isinstance(argument, six.string_types): try: attr = str(argument) except Exception: |