From e428f2d479318015fb0be01e005bb303949b8176 Mon Sep 17 00:00:00 2001
From: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
Date: Sun, 4 Oct 2020 14:51:04 -0700
Subject: [PATCH] pep 484: last reexports (#4609)

Co-authored-by: hauntsaninja <>
---
 stdlib/2and3/contextlib.pyi           |  4 ++--
 third_party/2and3/jinja2/defaults.pyi | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/stdlib/2and3/contextlib.pyi b/stdlib/2and3/contextlib.pyi
index 083563b6b..c6392bc1f 100644
--- a/stdlib/2and3/contextlib.pyi
+++ b/stdlib/2and3/contextlib.pyi
@@ -6,9 +6,9 @@ if sys.version_info >= (3, 5):
     from typing import AsyncContextManager, AsyncIterator
 
 if sys.version_info >= (3, 6):
-    from typing import ContextManager as AbstractContextManager
+    AbstractContextManager = ContextManager
 if sys.version_info >= (3, 7):
-    from typing import AsyncContextManager as AbstractAsyncContextManager
+    AbstractAsyncContextManager = AsyncContextManager
 
 _T = TypeVar("_T")
 _T_io = TypeVar("_T_io", bound=Optional[IO[str]])
diff --git a/third_party/2and3/jinja2/defaults.pyi b/third_party/2and3/jinja2/defaults.pyi
index fb16e8c95..e311f8288 100644
--- a/third_party/2and3/jinja2/defaults.pyi
+++ b/third_party/2and3/jinja2/defaults.pyi
@@ -1,7 +1,10 @@
-from typing import Any
+from typing import Any, Dict, Optional
 
-from jinja2.filters import FILTERS as DEFAULT_FILTERS
-from jinja2.tests import TESTS as DEFAULT_TESTS
+from jinja2.filters import FILTERS
+from jinja2.tests import TESTS
+
+DEFAULT_FILTERS = FILTERS
+DEFAULT_TESTS = TESTS
 
 BLOCK_START_STRING: str
 BLOCK_END_STRING: str
@@ -9,14 +12,11 @@ VARIABLE_START_STRING: str
 VARIABLE_END_STRING: str
 COMMENT_START_STRING: str
 COMMENT_END_STRING: str
-LINE_STATEMENT_PREFIX: Any
-LINE_COMMENT_PREFIX: Any
+LINE_STATEMENT_PREFIX: Optional[str]
+LINE_COMMENT_PREFIX: Optional[str]
 TRIM_BLOCKS: bool
 LSTRIP_BLOCKS: bool
 NEWLINE_SEQUENCE: str
 KEEP_TRAILING_NEWLINE: bool
-DEFAULT_NAMESPACE: Any
-
-# Names in __all__ with no definition:
-#   DEFAULT_FILTERS
-#   DEFAULT_TESTS
+DEFAULT_NAMESPACE: Dict[str, Any]
+DEFAULT_POLICIES = Dict[str, Any]