pep 484: more reexports (python#4607)

There are still a couple more, but hopefully this fixes CI. It's a
little bit of a chore to track down some of these; it looks like master
differs from latest release for a number of them.

Co-authored-by: hauntsaninja <>

third_party/2and3/boto/compat.pyi

@@ -4,7 +4,9 @@ from typing import Any
 if sys.version_info >= (3,):
     from base64 import encodebytes as encodebytes
 else:
-    from base64 import encodestring as encodebytes
+    from base64 import encodestring
+
+    encodebytes = encodestring
 
 expanduser: Any
 

third_party/2and3/click/types.pyi

@@ -2,7 +2,9 @@ import datetime
 import uuid
 from typing import IO, Any, Callable, Generic, Iterable, List, Optional, Tuple as _PyTuple, Type, TypeVar, Union
 
-from click.core import Context, Parameter, _ConvertibleType, _ParamType as ParamType
+from click.core import Context, Parameter, _ConvertibleType, _ParamType
+
+ParamType = _ParamType
 
 class BoolParamType(ParamType):
     def __call__(self, value: Optional[str], param: Optional[Parameter] = ..., ctx: Optional[Context] = ...) -> bool: ...

third_party/2and3/jinja2/_compat.pyi

@@ -2,9 +2,13 @@ import sys
 from typing import Any, Optional
 
 if sys.version_info[0] >= 3:
-    from urllib.parse import quote_from_bytes as url_quote
+    from urllib.parse import quote_from_bytes
+
+    url_quote = quote_from_bytes
 else:
-    from urllib import quote as url_quote
+    import urllib
+
+    url_quote = urllib.quote
 
 PY2: Any
 PYPY: Any

third_party/2and3/werkzeug/_compat.pyi

@@ -1,10 +1,16 @@
 import sys
 from typing import Any, Optional, Text
 
-if sys.version_info < (3,):
-    import StringIO as BytesIO
+if sys.version_info >= (3,):
+    from io import BytesIO as BytesIO, StringIO as StringIO
+
+    NativeStringIO = StringIO
 else:
-    from io import StringIO as BytesIO
+    import cStringIO
+    from StringIO import StringIO as StringIO
+
+    BytesIO = cStringIO.StringIO
+    NativeStringIO = BytesIO
 
 PY2: Any
 WIN: Any
@@ -27,7 +33,6 @@ def native_string_result(func): ...
 def implements_bool(cls): ...
 
 range_type: Any
-NativeStringIO: Any
 
 def make_literal_wrapper(reference): ...
 def normalize_string_tuple(tup): ...

third_party/3/aiofiles/__init__.pyi

@@ -1,2 +1 @@
-from . import _os as os
 from .threadpool import open as open

third_party/3/jwt/contrib/algorithms/__init__.pyi

@@ -1 +0,0 @@
-from hashlib import _Hash as _HashAlg

third_party/3/jwt/contrib/algorithms/py_ecdsa.pyi

@@ -1,11 +1,10 @@
+import hashlib
 from typing import Any
 
 from jwt.algorithms import Algorithm
 
-from . import _HashAlg
-
 class ECAlgorithm(Algorithm[Any]):
-    SHA256: _HashAlg
-    SHA384: _HashAlg
-    SHA512: _HashAlg
-    def __init__(self, hash_alg: _HashAlg) -> None: ...
+    SHA256: hashlib._Hash
+    SHA384: hashlib._Hash
+    SHA512: hashlib._Hash
+    def __init__(self, hash_alg: hashlib._Hash) -> None: ...

third_party/3/jwt/contrib/algorithms/pycrypto.pyi

@@ -1,11 +1,10 @@
+import hashlib
 from typing import Any
 
 from jwt.algorithms import Algorithm
 
-from . import _HashAlg
-
 class RSAAlgorithm(Algorithm[Any]):
-    SHA256: _HashAlg
-    SHA384: _HashAlg
-    SHA512: _HashAlg
-    def __init__(self, hash_alg: _HashAlg) -> None: ...
+    SHA256: hashlib._Hash
+    SHA384: hashlib._Hash
+    SHA512: hashlib._Hash
+    def __init__(self, hash_alg: hashlib._Hash) -> None: ...

third_party/3/waitress/compat.pyi

@@ -2,11 +2,6 @@ import sys
 from io import TextIOWrapper
 from typing import Any, Optional, Text, Tuple
 
-if sys.version_info[0] == 3:
-    from urllib import parse as urlparse
-else:
-    import urlparse
-
 PY2: bool
 PY3: bool
 WIN: bool