Add flags to pass on --warn-unused-ignores and --no-implicit-optional to mypy (#1421)

* Add flags to pass on --warn-unused-ignores and --no-implicit-optional to mypy
* Make implicit Optional explicit in arg types (2and3 part)
* Convert {stdlib,third_party}/2 to explicit Optional

Author: gvanrossum

stdlib/2/__builtin__.pyi

@@ -485,7 +485,7 @@ class slice(object):
     @overload
     def __init__(self, stop: Optional[int]) -> None: ...
     @overload
-    def __init__(self, start: Optional[int], stop: Optional[int], step: int = None) -> None: ...
+    def __init__(self, start: Optional[int], stop: Optional[int], step: Optional[int] = None) -> None: ...
     def indices(self, len: int) -> Tuple[int, int, int]: ...
 
 class tuple(Sequence[_T_co], Generic[_T_co]):
@@ -676,13 +676,13 @@ class xrange(Sized, Iterable[int], Reversible[int]):
     def __reversed__(self) -> Iterator[int]: ...
 
 class property(object):
-    def __init__(self, fget: Callable[[Any], Any] = None,
-                 fset: Callable[[Any, Any], None] = None,
-                 fdel: Callable[[Any], None] = None, doc: str = None) -> None: ...
+    def __init__(self, fget: Optional[Callable[[Any], Any]] = None,
+                 fset: Optional[Callable[[Any, Any], None]] = None,
+                 fdel: Optional[Callable[[Any], None]] = None, doc: Optional[str] = None) -> None: ...
     def getter(self, fget: Callable[[Any], Any]) -> property: ...
     def setter(self, fset: Callable[[Any, Any], None]) -> property: ...
     def deleter(self, fdel: Callable[[Any], None]) -> property: ...
-    def __get__(self, obj: Any, type: type=None) -> Any: ...
+    def __get__(self, obj: Any, type: Optional[type] = None) -> Any: ...
     def __set__(self, obj: Any, value: Any) -> None: ...
     def __delete__(self, obj: Any) -> None: ...
     def fget(self) -> Any: ...
@@ -716,7 +716,7 @@ def filter(function: Callable[[_T], Any],
 def filter(function: None,
            iterable: Iterable[Optional[_T]]) -> List[_T]: ...
 def format(o: object, format_spec: str = '') -> str: ...  # TODO unicode
-def getattr(o: Any, name: unicode, default: Any = None) -> Any: ...
+def getattr(o: Any, name: unicode, default: Optional[Any] = None) -> Any: ...
 def hasattr(o: Any, name: unicode) -> bool: ...
 def hash(o: object) -> int: ...
 def hex(i: int) -> str: ...  # TODO __index__
@@ -941,12 +941,12 @@ class ResourceWarning(Warning): ...
 
 def eval(s: str, globals: Dict[str, Any] = ..., locals: Dict[str, Any] = ...) -> Any: ...
 def exec(object: str,
-         globals: Dict[str, Any] = None,
-         locals: Dict[str, Any] = None) -> Any: ...  # TODO code object as source
+         globals: Optional[Dict[str, Any]] = None,
+         locals: Optional[Dict[str, Any]] = None) -> Any: ...  # TODO code object as source
 
 def cmp(x: Any, y: Any) -> int: ...
 
-def execfile(filename: str, globals: Dict[str, Any] = None, locals: Dict[str, Any] = None) -> None: ...
+def execfile(filename: str, globals: Optional[Dict[str, Any]] = None, locals: Optional[Dict[str, Any]] = None) -> None: ...
 
 class file(BinaryIO):
     @overload
@@ -958,7 +958,7 @@ class file(BinaryIO):
     def __iter__(self) -> Iterator[str]: ...
     def read(self, n: int = ...) -> str: ...
     def __enter__(self) -> BinaryIO: ...
-    def __exit__(self, t: type = None, exc: BaseException = None, tb: Any = None) -> bool: ...
+    def __exit__(self, t: Optional[type] = None, exc: Optional[BaseException] = None, tb: Optional[Any] = None) -> bool: ...
     def flush(self) -> None: ...
     def fileno(self) -> int: ...
     def isatty(self) -> bool: ...
@@ -976,6 +976,6 @@ class file(BinaryIO):
     def truncate(self, pos: Optional[int] = ...) -> int: ...
 
 # Very old builtins
-def apply(func: Callable[..., _T], args: Sequence[Any] = None, kwds: Mapping[str, Any] = None) -> _T: ...
+def apply(func: Callable[..., _T], args: Optional[Sequence[Any]] = None, kwds: Optional[Mapping[str, Any]] = None) -> _T: ...
 _N = TypeVar('_N', bool, int, float, complex)
 def coerce(x: _N, y: _N) -> Tuple[_N, _N]: ...

stdlib/2/urllib2.pyi

@@ -41,7 +41,7 @@ class Request(object):
     def add_header(self, key: str, val: str) -> None: ...
     def add_unredirected_header(self, key: str, val: str) -> None: ...
     def has_header(self, header_name: str) -> bool: ...
-    def get_header(self, header_name: str, default: str = None) -> str: ...
+    def get_header(self, header_name: str, default: Optional[str] = None) -> str: ...
     def header_items(self): ...
 
 class OpenerDirector(object):

stdlib/2and3/asynchat.pyi

@@ -2,7 +2,7 @@ from abc import abstractmethod
 import asyncore
 import socket
 import sys
-from typing import Union, Tuple, Sequence
+from typing import Optional, Sequence, Tuple, Union
 
 
 class simple_producer:
@@ -12,7 +12,7 @@ class simple_producer:
 class async_chat(asyncore.dispatcher):
     ac_in_buffer_size = ...  # type: int
     ac_out_buffer_size = ...  # type: int
-    def __init__(self, sock: socket.socket = None, map: asyncore._maptype = None) -> None: ...
+    def __init__(self, sock: Optional[socket.socket] = None, map: Optional[asyncore._maptype] = None) -> None: ...
 
     @abstractmethod
     def collect_incoming_data(self, data: bytes) -> None: ...

stdlib/2and3/asyncore.pyi

@@ -25,7 +25,7 @@ def poll2(timeout: float = ..., map: _maptype = ...) -> None: ...
 
 poll3 = poll2
 
-def loop(timeout: float = ..., use_poll: bool = ..., map: _maptype = ..., count: int = None) -> None: ...
+def loop(timeout: float = ..., use_poll: bool = ..., map: _maptype = ..., count: Optional[int] = None) -> None: ...
 
 
 # Not really subclass of socket.socket; it's only delegation.
@@ -39,7 +39,7 @@ class dispatcher:
     closing = ...  # type: bool
     ignore_log_types = ...  # type: frozenset[str]
 
-    def __init__(self, sock: socket.socket = None, map: _maptype = ...) -> None: ...
+    def __init__(self, sock: Optional[socket.socket] = None, map: _maptype = ...) -> None: ...
     def add_channel(self, map: _maptype = ...) -> None: ...
     def del_channel(self, map: _maptype = ...) -> None: ...
     def create_socket(self, family: int, type: int) -> None: ...

stdlib/2and3/bz2.pyi

@@ -1,21 +1,21 @@
 # Stubs for bz2
 
-from typing import Any, BinaryIO, TextIO, IO, Union
+from typing import Any, BinaryIO, TextIO, IO, Optional, Union
 
 def compress(data: bytes, compresslevel: int = ...) -> bytes: ...
 def decompress(data: bytes) -> bytes: ...
 
 def open(filename: Union[str, bytes, IO[Any]],
          mode: str = 'rb',
-         encoding: str = None,
-         errors: str = None,
-         newline: str = None) -> IO[Any]: ...
+         encoding: Optional[str] = None,
+         errors: Optional[str] = None,
+         newline: Optional[str] = None) -> IO[Any]: ...
 
 class BZ2File(BinaryIO):
     def __init__(self,
                  filename: Union[str, bytes, IO[Any]],
                  mode: str = "r",
-                 buffering: Any = None,
+                 buffering: Optional[Any] = None,
                  compresslevel: int = 9) -> None: ...
 
 class BZ2Compressor(object):

stdlib/2and3/pdb.pyi

@@ -1,15 +1,15 @@
 # NOTE: This stub is incomplete - only contains some global functions
 
-from typing import Any, Dict
+from typing import Any, Dict, Optional
 
 def run(statement: str,
-        globals: Dict[str, Any] = None,
-        locals: Dict[str, Any] = None) -> None:
+        globals: Optional[Dict[str, Any]] = None,
+        locals: Optional[Dict[str, Any]] = None) -> None:
     ...
 
 def runeval(expression: str,
-            globals: Dict[str, Any] = None,
-            locals: Dict[str, Any] = None) -> Any:
+            globals: Optional[Dict[str, Any]] = None,
+            locals: Optional[Dict[str, Any]] = None) -> Any:
     ...
 
 def runctx(statement: str,
@@ -23,7 +23,7 @@ def runcall(*args: Any, **kwds: Any) -> Any:
 def set_trace() -> None:
     ...
 
-def post_mortem(t: Any = None) -> None:
+def post_mortem(t: Optional[Any] = None) -> None:
     ...
 
 def pm() -> None:

tests/mypy_test.py

@@ -24,6 +24,13 @@
 parser.add_argument('-x', '--exclude', type=str, nargs='*', help="Exclude pattern")
 parser.add_argument('-p', '--python-version', type=str, nargs='*',
                     help="These versions only (major[.minor])")
+parser.add_argument('--no-implicit-optional', action='store_true',
+                    help="Run mypy with --no-implicit-optional (causes lots of errors)")
+parser.add_argument('--warn-unused-ignores', action='store_true',
+                    help="Run mypy with --warn-unused-ignores "
+                    "(hint: only git rid of warnings that are "
+                    "unused for all platforms and Python versions)")
+
 parser.add_argument('filter', type=str, nargs='*', help="Include pattern (default all)")
 
 
@@ -124,7 +131,10 @@ def main():
             runs += 1
             flags = ['--python-version', '%d.%d' % (major, minor)]
             flags.append('--strict-optional')
-            # flags.append('--warn-unused-ignores')  # Fast parser and regular parser disagree.
+            if args.no_implicit_optional:
+                flags.append('--no-implicit-optional')
+            if args.warn_unused_ignores:
+                flags.append('--warn-unused-ignores')
             sys.argv = ['mypy'] + flags + files
             if args.verbose:
                 print("running", ' '.join(sys.argv))

third_party/2/dateutil/parser.pyi

@@ -27,13 +27,13 @@ class parserinfo(object):
     def validate(self, res: datetime) -> bool: ...
 
 class parser(object):
-    def __init__(self, info: parserinfo = None) -> None: ...
+    def __init__(self, info: Optional[parserinfo] = None) -> None: ...
     def parse(self, timestr: Union[str, unicode, IO[unicode]],
-              default: datetime = None,
-              ignoretz: bool = ..., tzinfos: Dict[Union[str, unicode], tzinfo] = None,
+              default: Optional[datetime] = None,
+              ignoretz: bool = ..., tzinfos: Optional[Dict[Union[str, unicode], tzinfo]] = None,
               **kwargs: Any) -> datetime: ...
 
 DEFAULTPARSER = ...  # type: parser
 def parse(timestr: Union[str, unicode, IO[unicode]],
-          parserinfo: parserinfo = None,
+          parserinfo: Optional[parserinfo] = None,
           **kwargs: Any) -> datetime: ...

third_party/2/google/protobuf/message_factory.pyi

@@ -6,7 +6,7 @@ from .descriptor_pool import DescriptorPool
 
 class MessageFactory:
     pool = ...  # type: Any
-    def __init__(self, pool: DescriptorPool=None) -> None: ...
+    def __init__(self, pool: Optional[DescriptorPool] = None) -> None: ...
     def GetPrototype(self, descriptor: Descriptor) -> Type[Message]: ...
     def GetMessages(self, files: Iterable[str]) -> Dict[str, Type[Message]]: ...
 

third_party/2/werkzeug/wrappers.pyi

@@ -76,7 +76,15 @@ class BaseResponse:
     status = ...  # type: str
     direct_passthrough = ...  # type: bool
     response = ...  # type: Iterable[str]
-    def __init__(self, response: Union[Iterable[str], str]=None, status=Union[basestring, int], headers: Union[Headers, Mapping[basestring, basestring], Sequence[Tuple[basestring, basestring]]]=None, mimetype: basestring=None, content_type: basestring=None, direct_passthrough: bool=False) -> None: ...
+    def __init__(self,
+                 response: Optional[Union[Iterable[str], str]] = None,
+                 status: Optional[Union[basestring, int]] = None,
+                 headers: Optional[Union[Headers,
+                                         Mapping[basestring, basestring],
+                                         Sequence[Tuple[basestring, basestring]]]] = None,
+                 mimetype: Optional[basestring] = None,
+                 content_type: Optional[basestring] = None,
+                 direct_passthrough: Optional[bool] = False) -> None: ...
     def call_on_close(self, func): ...
     @classmethod
     def force_type(cls, response, environ=None): ...