Merge pull request #215 from pallets/update-typing

Update typing

CHANGES.rst

@@ -3,6 +3,10 @@ Version 2.0.1
 
 Unreleased
 
+-   Mark top-level names as exported so type checking understands
+    imports in user projects. :pr:`215`
+-   Fix some types that weren't available in Python 3.6.0. :pr:`215`
+
 
 Version 2.0.0
 -------------

setup.cfg

@@ -82,7 +82,7 @@ disallow_untyped_defs = True
 disallow_incomplete_defs = True
 no_implicit_optional = True
 local_partial_types = True
-# no_implicit_reexport = True
+no_implicit_reexport = True
 strict_equality = True
 warn_redundant_casts = True
 warn_unused_configs = True

src/markupsafe/__init__.py

@@ -4,8 +4,9 @@
 import typing as t
 
 if t.TYPE_CHECKING:
+    import typing_extensions as te
 
-    class HasHTML(t.Protocol):
+    class HasHTML(te.Protocol):
         def __html__(self) -> str:
             pass
 
@@ -276,12 +277,12 @@ def __float__(self) -> float:
 
 # circular import
 try:
-    from ._speedups import escape
-    from ._speedups import escape_silent
-    from ._speedups import soft_str
+    from ._speedups import escape as escape
+    from ._speedups import escape_silent as escape_silent
+    from ._speedups import soft_str as soft_str
     from ._speedups import soft_unicode
 except ImportError:
-    from ._native import escape
-    from ._native import escape_silent  # noqa: F401
-    from ._native import soft_str  # noqa: F401
+    from ._native import escape as escape
+    from ._native import escape_silent as escape_silent  # noqa: F401
+    from ._native import soft_str as soft_str  # noqa: F401
     from ._native import soft_unicode  # noqa: F401