Merge pull request #1434 from pallets/update-typing

Update typing

diff --cc CHANGES.rst
Simple merge

diff --cc src/jinja2/__init__.py
index 2d45bcc604d346f930622abb42d2d0bf7fb0c8ac,935dd7effaaea42a77076df873f0eda977d8a80e..2c3e66bcd90a60e7d1bd77ba4919df3fae5e150f
--- 1/src/jinja2/__init__.py
--- 2/src/jinja2/__init__.py
+++ b/src/jinja2/__init__.py
@@@ -35,11 -35,11 +35,11 @@@ from .utils import contextfunctio
  from .utils import environmentfunction
  from .utils import escape
  from .utils import evalcontextfunction
- from .utils import is_undefined
+ from .utils import is_undefined as is_undefined
  from .utils import Markup
- from .utils import pass_context
- from .utils import pass_environment
- from .utils import pass_eval_context
- from .utils import select_autoescape
+ from .utils import pass_context as pass_context
+ from .utils import pass_environment as pass_environment
+ from .utils import pass_eval_context as pass_eval_context
+ from .utils import select_autoescape as select_autoescape
  
 -__version__ = "3.0.1.dev0"
 +__version__ = "3.1.0.dev0"