pull via github

.travis.yml

@@ -1,38 +1,25 @@
-dist: xenial
+dist: bionic
 language: python
 python: 3.7
 
-matrix:
+jobs:
   include:
     - name: "pytype"
       python: 3.6
-      env:
-        - TEST_CMD="./tests/pytype_test.py"
-        - INSTALL="test"
-    - name: "mypy"
-      env:
-        - TEST_CMD="./tests/mypy_test.py"
-        - INSTALL="mypy"
-    - name: "mypy new analyzer"
-      env:
-        - TEST_CMD="./tests/mypy_test.py -a"
-        - INSTALL="mypy"
+      install: pip install -r requirements-tests-py3.txt
+      script: ./tests/pytype_test.py
+    - name: "mypy (typed-ast)"
+      python: 3.7
+      install: pip install -U git+git://github.com/python/mypy git+git://github.com/python/typed_ast
+      script: ./tests/mypy_test.py
+    - name: "mypy (ast)"
+      python: 3.8-dev
+      install: pip install -U git+git://github.com/python/mypy
+      script: ./tests/mypy_test.py
     - name: "mypy self test"
-      env: TEST_CMD="./tests/mypy_selftest.py"
-    - name: "mypy self test (new analyzer)"
-      env:
-        - NEWSEMANAL=1
-        - TEST_CMD="./tests/mypy_selftest.py"
+      script: ./tests/mypy_selftest.py
     - name: "check file consistency"
-      env: TEST_CMD="./tests/check_consistent.py"
+      script: ./tests/check_consistent.py
     - name: "flake8"
-      env:
-        - TEST_CMD="flake8"
-        - INSTALL="test"
-
-install:
-  - if [[ $INSTALL == 'test' ]]; then pip install -r requirements-tests-py3.txt; fi
-  - if [[ $INSTALL == 'mypy' ]]; then pip install -U git+git://github.com/python/mypy git+git://github.com/python/typed_ast; fi
-
-script:
-  - $TEST_CMD
+      install: pip install -r requirements-tests-py3.txt
+      script: flake8

CONTRIBUTING.md

@@ -238,7 +238,7 @@ rule is that they should be as concise as possible.  Specifically:
 * use variable annotations instead of type comments, even for stubs
   that target older versions of Python;
 * for arguments with a type and a default, use spaces around the `=`.
-The code formatter [black](https://github.com/python/black) will format
+The code formatter [black](https://github.com/psf/black) will format
 stubs according to this standard.
 
 Stub files should only contain information necessary for the type
@@ -292,6 +292,15 @@ Type variables and aliases you introduce purely for legibility reasons
 should be prefixed with an underscore to make it obvious to the reader
 they are not part of the stubbed API.
 
+When adding type annotations for context manager classes, annotate
+the return type of `__exit__` as bool only if the context manager
+sometimes suppresses annotations -- if it sometimes returns `True`
+at runtime. If the context manager never suppresses exceptions,
+have the return type be either `None` or `Optional[bool]`. If you
+are not sure whether exceptions are suppressed or not or if the
+context manager is meant to be subclassed, pick `Optional[bool]`.
+See https://github.com/python/mypy/issues/7214 for more details.
+
 NOTE: there are stubs in this repository that don't conform to the
 style described above.  Fixing them is a great starting point for new
 contributors.
@@ -307,8 +316,8 @@ and optionally the lowest minor version, with the exception of the `2and3`
 directory which applies to both Python 2 and 3.
 
 For example, stubs in the `3` directory will be applied to all versions of
-Python 3, though stubs in the `3.6` directory will only be applied to versions
-3.6 and above. However, stubs in the `2` directory will not be applied to
+Python 3, though stubs in the `3.7` directory will only be applied to versions
+3.7 and above. However, stubs in the `2` directory will not be applied to
 Python 3.
 
 It is preferred to use a single stub in the more generic directory that
@@ -318,7 +327,7 @@ if the given library works on both Python 2 and Python 3, prefer to put your
 stubs in the `2and3` directory, unless the types are so different that the stubs
 become unreadable that way.
 
-You can use checks like `if sys.version_info >= (3, 4):` to denote new
+You can use checks like `if sys.version_info >= (3, 8):` to denote new
 functionality introduced in a given Python version or solve type
 differences.  When doing so, only use one-tuples or two-tuples.  This is
 because:
@@ -331,17 +340,17 @@ because:
   regardless of the micro version used.
 
 Because of this, if a given functionality was introduced in, say, Python
-3.4.4, your check:
+3.7.4, your check:
 
-* should be expressed as `if sys.version_info >= (3, 4):`
-* should NOT be expressed as `if sys.version_info >= (3, 4, 4):`
-* should NOT be expressed as `if sys.version_info >= (3, 5):`
+* should be expressed as `if sys.version_info >= (3, 7):`
+* should NOT be expressed as `if sys.version_info >= (3, 7, 4):`
+* should NOT be expressed as `if sys.version_info >= (3, 8):`
 
 This makes the type checker assume the functionality was also available
-in 3.4.0 - 3.4.3, which while *technically* incorrect is relatively
+in 3.7.0 - 3.7.3, which while *technically* incorrect is relatively
 harmless.  This is a strictly better compromise than using the latter
 two forms, which would generate false positive errors for correct use
-under Python 3.4.4.
+under Python 3.7.4.
 
 Note: in its current implementation, typeshed cannot contain stubs for
 multiple versions of the same third-party library.  Prefer to generate

README.md

@@ -15,7 +15,7 @@ For information on how to use `typeshed`, read below.  Information for
 contributors can be found in [CONTRIBUTING.md](CONTRIBUTING.md).  **Please read
 it before submitting pull requests.**
 
-Typeshed supports Python versions 2.7 and 3.4 and up.
+Typeshed supports Python versions 2.7 and 3.5 and up.
 
 ## Using
 

pyproject.toml

@@ -0,0 +1,11 @@
+[tool.black]
+line_length = 130
+target_version = ["py37"]
+
+[tool.isort]
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+combine_as_imports = true
+line_length = 130

requirements-tests-py3.txt

@@ -1,6 +1,8 @@
 git+https://github.com/python/mypy.git@master
 typed-ast>=1.0.4
-flake8==3.6.0
-flake8-bugbear==18.8.0
-flake8-pyi==18.3.1
-pytype>=2019.5.15
+black==19.3b0
+flake8==3.7.8
+flake8-bugbear==19.3.0
+flake8-pyi==19.3.0
+isort==4.3.21
+pytype>=2019.7.30

stdlib/2/CGIHTTPServer.pyi

@@ -0,0 +1,8 @@
+# Stubs for CGIHTTPServer (Python 2.7)
+
+from typing import List
+import SimpleHTTPServer
+
+class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
+    cgi_directories: List[str]
+    def do_POST(self) -> None: ...

stdlib/2/ConfigParser.pyi

@@ -55,8 +55,8 @@ class _Readable(Protocol):
 
 class RawConfigParser:
     _dict: Any
-    _sections: dict
-    _defaults: dict
+    _sections: Dict[Any, Any]
+    _defaults: Dict[Any, Any]
     _optcre: Any
     SECTCRE: Any
     OPTCRE: Any
@@ -86,12 +86,14 @@ class RawConfigParser:
 
 class ConfigParser(RawConfigParser):
     _KEYCRE: Any
-    def get(self, section: str, option: str, raw: bool = ..., vars: Optional[dict] = ...) -> Any: ...
-    def items(self, section: str, raw: bool = ..., vars: Optional[dict] = ...) -> List[Tuple[str, Any]]: ...
+    def get(self, section: str, option: str, raw: bool = ..., vars: Optional[Dict[Any, Any]] = ...) -> Any: ...
+    def items(self, section: str, raw: bool = ..., vars: Optional[Dict[Any, Any]] = ...) -> List[Tuple[str, Any]]: ...
     def _interpolate(self, section: str, option: str, rawval: Any, vars: Any) -> str: ...
     def _interpolation_replace(self, match: Any) -> str: ...
 
 class SafeConfigParser(ConfigParser):
     _interpvar_re: Any
     def _interpolate(self, section: str, option: str, rawval: Any, vars: Any) -> str: ...
-    def _interpolate_some(self, option: str, accum: list, rest: str, section: str, map: dict, depth: int) -> None: ...
+    def _interpolate_some(
+        self, option: str, accum: List[Any], rest: str, section: str, map: Dict[Any, Any], depth: int,
+    ) -> None: ...

stdlib/2/Cookie.pyi

@@ -1,8 +1,8 @@
-from typing import Any, Optional
+from typing import Any, Dict, Optional
 
 class CookieError(Exception): ...
 
-class Morsel(dict):
+class Morsel(Dict[Any, Any]):
     key: Any
     def __init__(self): ...
     def __setitem__(self, K, V): ...
@@ -14,7 +14,7 @@ class Morsel(dict):
     def js_output(self, attrs: Optional[Any] = ...): ...
     def OutputString(self, attrs: Optional[Any] = ...): ...
 
-class BaseCookie(dict):
+class BaseCookie(Dict[Any, Any]):
     def value_decode(self, val): ...
     def value_encode(self, val): ...
     def __init__(self, input: Optional[Any] = ...): ...

stdlib/2/Queue.pyi

@@ -1,7 +1,7 @@
 # Stubs for Queue (Python 2)
 
 from collections import deque
-from typing import Any, TypeVar, Generic, Optional
+from typing import Any, Deque, TypeVar, Generic, Optional
 
 _T = TypeVar('_T')
 
@@ -15,7 +15,7 @@ class Queue(Generic[_T]):
     not_full: Any
     all_tasks_done: Any
     unfinished_tasks: Any
-    queue: deque  # undocumented
+    queue: Deque[Any]  # undocumented
     def __init__(self, maxsize: int = ...) -> None: ...
     def task_done(self) -> None: ...
     def join(self) -> None: ...
@@ -27,5 +27,5 @@ class Queue(Generic[_T]):
     def get(self, block: bool = ..., timeout: Optional[float] = ...) -> _T: ...
     def get_nowait(self) -> _T: ...
 
-class PriorityQueue(Queue): ...
-class LifoQueue(Queue): ...
+class PriorityQueue(Queue[_T]): ...
+class LifoQueue(Queue[_T]): ...

stdlib/2/SimpleHTTPServer.pyi

@@ -9,7 +9,7 @@ class SimpleHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
     def do_GET(self) -> None: ...
     def do_HEAD(self) -> None: ...
     def send_head(self) -> Optional[IO[str]]: ...
-    def list_directory(self, path: Union[str, unicode]) -> Optional[StringIO]: ...
+    def list_directory(self, path: Union[str, unicode]) -> Optional[StringIO[Any]]: ...
     def translate_path(self, path: AnyStr) -> AnyStr: ...
     def copyfile(self, source: IO[AnyStr], outputfile: IO[AnyStr]): ...
     def guess_type(self, path: Union[str, unicode]) -> str: ...

stdlib/2/SocketServer.pyi

@@ -1,7 +1,7 @@
 # NB: SocketServer.pyi and socketserver.pyi must remain consistent!
 # Stubs for socketserver
 
-from typing import Any, BinaryIO, Optional, Tuple, Type
+from typing import Any, BinaryIO, Optional, Tuple, Type, Text, Union
 from socket import SocketType
 import sys
 import types
@@ -15,7 +15,7 @@ class BaseServer:
     request_queue_size: int
     socket_type: int
     timeout: Optional[float]
-    def __init__(self, server_address: Tuple[str, int],
+    def __init__(self, server_address: Any,
                  RequestHandlerClass: type) -> None: ...
     def fileno(self) -> int: ...
     def handle_request(self) -> None: ...
@@ -38,7 +38,7 @@ class BaseServer:
         def __enter__(self) -> BaseServer: ...
         def __exit__(self, exc_type: Optional[Type[BaseException]],
                      exc_val: Optional[BaseException],
-                     exc_tb: Optional[types.TracebackType]) -> bool: ...
+                     exc_tb: Optional[types.TracebackType]) -> None: ...
     if sys.version_info >= (3, 3):
         def service_actions(self) -> None: ...
 
@@ -54,12 +54,12 @@ class UDPServer(BaseServer):
 
 if sys.platform != 'win32':
     class UnixStreamServer(BaseServer):
-        def __init__(self, server_address: Tuple[str, int],
+        def __init__(self, server_address: Union[Text, bytes],
                      RequestHandlerClass: type,
                      bind_and_activate: bool = ...) -> None: ...
 
     class UnixDatagramServer(BaseServer):
-        def __init__(self, server_address: Tuple[str, int],
+        def __init__(self, server_address: Union[Text, bytes],
                      RequestHandlerClass: type,
                      bind_and_activate: bool = ...) -> None: ...
 

stdlib/2/UserDict.pyi

@@ -6,7 +6,7 @@ _VT = TypeVar('_VT')
 _T = TypeVar('_T')
 
 class UserDict(Dict[_KT, _VT], Generic[_KT, _VT]):
-    data: Mapping[_KT, _VT]
+    data: Dict[_KT, _VT]
 
     def __init__(self, initialdata: Mapping[_KT, _VT] = ...) -> None: ...
 

stdlib/2/UserList.pyi

@@ -1,9 +1,10 @@
-from typing import Iterable, MutableSequence, TypeVar, Union, overload
+from typing import Iterable, MutableSequence, TypeVar, Union, overload, List
 
 _T = TypeVar("_T")
-_ULT = TypeVar("_ULT", bound=UserList)
+_S = TypeVar("_S")
 
 class UserList(MutableSequence[_T]):
+    data: List[_T]
     def insert(self, index: int, object: _T) -> None: ...
     @overload
     def __setitem__(self, i: int, o: _T) -> None: ...
@@ -14,5 +15,5 @@ class UserList(MutableSequence[_T]):
     @overload
     def __getitem__(self, i: int) -> _T: ...
     @overload
-    def __getitem__(self: _ULT, s: slice) -> _ULT: ...
+    def __getitem__(self: _S, s: slice) -> _S: ...
     def sort(self) -> None: ...