From: David Lord <davidism@gmail.com>
Date: Fri, 14 May 2021 00:30:40 +0000 (-0700)
Subject: Merge pull request #1434 from pallets/update-typing
X-Git-Tag: 3.1.0~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2e83d07a30e1d6f1242993e694f8fdfad1d23f2;p=thirdparty%2Fjinja.git

Merge pull request #1434 from pallets/update-typing

Update typing
---

a2e83d07a30e1d6f1242993e694f8fdfad1d23f2
diff --cc src/jinja2/__init__.py
index 2d45bcc6,935dd7ef..2c3e66bc
--- a/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"