Change prefix for _importlib_modulespec names

stdlib/2/__builtin__.pyi

@@ -675,11 +675,6 @@ class xrange(Sized, Iterable[int], Reversible[int]):
     def __getitem__(self, i: int) -> int: ...
     def __reversed__(self) -> Iterator[int]: ...
 
-class module:
-    __name__ = ...  # type: str
-    __file__ = ...  # type: str
-    __dict__ = ...  # type: Dict[unicode, Any]
-
 class property(object):
     def __init__(self, fget: Callable[[Any], Any] = None,
                  fset: Callable[[Any, Any], None] = None,

stdlib/2/abc.pyi

@@ -1,11 +1,12 @@
 from typing import Any, Dict, Set, Tuple, Type
+from types import ModuleType
 import _weakrefset
 
 # mypy has special processing for ABCMeta and abstractmethod.
 
 WeakSet = ...  # type: _weakrefset.WeakSet
 _InstanceType = ...  # type: type
-types = ...  # type: module
+types = ...  # type: ModuleType
 
 def abstractmethod(funcobj: Any) -> Any: ...
 

stdlib/2/tokenize.pyi

@@ -1,6 +1,7 @@
 # Automatically generated by pytype, manually fixed up. May still contain errors.
 
 from typing import Any, Callable, Dict, Generator, Iterator, List, Tuple, Union, Iterable
+from types import ModuleType
 
 __all__ = ...  # type: List[str]
 __author__ = ...  # type: str
@@ -102,15 +103,14 @@ chain = ...  # type: type
 double3prog = ...  # type: type
 endprogs = ...  # type: Dict[str, Any]
 pseudoprog = ...  # type: type
-re = ...  # type: module
 single3prog = ...  # type: type
 single_quoted = ...  # type: Dict[str, str]
-string = ...  # type: module
-sys = ...  # type: module
+string = ...  # type: ModuleType
+sys = ...  # type: ModuleType
 t = ...  # type: str
 tabsize = ...  # type: int
 tok_name = ...  # type: Dict[int, str]
-token = ...  # type: module
+token = ...  # type: ModuleType
 tokenprog = ...  # type: type
 triple_quoted = ...  # type: Dict[str, str]
 x = ...  # type: str

stdlib/2/unittest.pyi

@@ -9,6 +9,7 @@ from typing import (
     overload, Set, FrozenSet, TypeVar, Union, Pattern, Type
 )
 from abc import abstractmethod, ABCMeta
+from types import ModuleType
 
 _T = TypeVar('_T')
 _FT = TypeVar('_FT')
@@ -173,4 +174,4 @@ def main(module: str = ..., defaultTest: str = ...,
          testLoader: Any = ...) -> None: ...  # TODO types
 
 # private but occasionally used
-util = ...  # type: module
+util = ...  # type: ModuleType

stdlib/3/builtins.pyi

@@ -731,12 +731,6 @@ class range(Sequence[int]):
     def __repr__(self) -> str: ...
     def __reversed__(self) -> Iterator[int]: ...
 
-class module:
-    # TODO not defined in builtins!
-    __name__ = ...  # type: str
-    __file__ = ...  # type: str
-    __dict__ = ...  # type: Dict[str, Any]
-
 class property:
     def __init__(self, fget: Callable[[Any], Any] = None,
                  fset: Callable[[Any, Any], None] = None,

third_party/2/werkzeug/__init__.pyi

@@ -23,11 +23,6 @@ from werkzeug import utils
 from werkzeug import wrappers
 from werkzeug import wsgi
 
-class module(ModuleType):
-    def __getattr__(self, name): ...
-    def __dir__(self): ...
-
-
 __version__ = ...  # type: Any
 
 run_simple = serving.run_simple

third_party/3/werkzeug/__init__.pyi

@@ -22,11 +22,6 @@ from werkzeug import utils
 from werkzeug import wrappers
 from werkzeug import wsgi
 
-class module(ModuleType):
-    def __getattr__(self, name): ...
-    def __dir__(self): ...
-
-
 __version__ = ...  # type: Any
 
 run_simple = serving.run_simple