pep 484: explicit reexport as intended (#4586)

See discussion on typing-sig.
This doesn't take care of some third_party libraries, will follow up on
those.

Co-authored-by: hauntsaninja <>

third_party/3/six/moves/__init__.pyi

@@ -2,14 +2,14 @@
 #
 # Note: Commented out items means they weren't implemented at the time.
 # Uncomment them when the modules have been added to the typeshed.
-from builtins import filter as filter, input as input, map as map, range as range, range as xrange, zip as zip
+import importlib
+import shlex
+from builtins import filter as filter, input as input, map as map, range as range, zip as zip
 from collections import UserDict as UserDict, UserList as UserList, UserString as UserString
 from functools import reduce as reduce
-from importlib import reload as reload_module
-from io import StringIO as StringIO, StringIO as cStringIO
+from io import StringIO as StringIO
 from itertools import filterfalse as filterfalse, zip_longest as zip_longest
 from os import getcwd as getcwd, getcwdb as getcwdb
-from shlex import quote as shlex_quote
 from sys import intern as intern
 
 # import tkinter.font as tkinter_font
@@ -58,3 +58,8 @@ from . import (
 
 # import xmlrpc.client as xmlrpc_client
 # import xmlrpc.server as xmlrpc_server
+
+xrange = range
+reload_module = importlib.reload
+cStringIO = StringIO
+shlex_quote = shlex.quote