summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2016-12-29 16:01:54 +0100
committerArmin Ronacher <armin.ronacher@active-4.com>2016-12-29 16:01:54 +0100
commit73351f3216fd9e085190871bf933360f5408b1da (patch)
treebe207a90deea18c77860775cb28e03feae135ef6
parent3097b97ef34a4d00f5bc94738bf654b4dfbe8e35 (diff)
parent74bd64e56387f5b2931040dc7235a3509cde1611 (diff)
downloadjinja2-73351f3216fd9e085190871bf933360f5408b1da.tar.gz
Merge branch '2.8-maintenance'
-rw-r--r--CHANGES8
-rw-r--r--jinja2/sandbox.py2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 3b48299..36b0817 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,14 @@ Version 2.9
not being what was expected.
- Added support for Python 3.6 async iterators through a new async mode.
+Version 2.8.2
+-------------
+
+(bugfix release, unreleased)
+
+- Fixed a runtime error in the sandbox when attributes of async generators
+ were accessed.
+
Version 2.8.1
-------------
diff --git a/jinja2/sandbox.py b/jinja2/sandbox.py
index c035dde..549c427 100644
--- a/jinja2/sandbox.py
+++ b/jinja2/sandbox.py
@@ -206,7 +206,7 @@ def is_internal_attribute(obj, attr):
if attr in UNSAFE_COROUTINE_ATTRIBUTES:
return True
elif hasattr(types, 'AsyncGeneratorType') and isinstance(obj, types.AsyncGeneratorType):
- if attri in UNSAFE_ASYNC_GENERATOR_ATTRIBUTES:
+ if attr in UNSAFE_ASYNC_GENERATOR_ATTRIBUTES:
return True
return attr.startswith('__')