mypy: Update to 0.630 and pin that version

diff --git a/.travis.yml b/.travis.yml
index e200778a357169c48bed63908995a36e7efb4b53..3a5d4accd579e37ba33dd4551a089924e0c8143c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ install:
     # version supported. But Python 3.7 requires slower-to-start VMs,
     # so we run it on 3.6 to minimize total CI run time.
     - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then travis_retry pip install -r docs/requirements.txt; fi
-    - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then travis_retry pip install flake8 mypy; fi
+    - if [[ $TRAVIS_PYTHON_VERSION == '3.6' ]]; then travis_retry pip install flake8 mypy==0.630; fi
     # On travis the extension should always be built
     - if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* ]]; then export TORNADO_EXTENSION=1; fi
     - travis_retry python setup.py install

diff --git a/tornado/wsgi.py b/tornado/wsgi.py
index ad49c5cf94d9486ff8b4a3bda9ebf7e0b36ce2bd..0538648775a16c3a04aee30e5d6df0fccb2c09fe 100644 (file)
--- a/tornado/wsgi.py
+++ b/tornado/wsgi.py
@@ -93,13 +93,13 @@ class WSGIContainer(object):
         response = []  # type: List[bytes]
 
         def start_response(
-                status: str, response_headers: List[Tuple[str, str]],
+                status: str, headers: List[Tuple[str, str]],
                 exc_info: Optional[Tuple[Optional[Type[BaseException]],
                                          Optional[BaseException],
                                          Optional[TracebackType]]]=None
         ) -> Callable[[bytes], Any]:
             data["status"] = status
-            data["headers"] = response_headers
+            data["headers"] = headers
             return response.append
         app_response = self.wsgi_application(
             WSGIContainer.environ(request), start_response)

diff --git a/tox.ini b/tox.ini
index b3defc0656ba47f0520444de53b00dae7c8cc4a3..f43ac4fa1501679a32eb09289e37612b0b686b05 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -129,4 +129,4 @@ changedir = {toxinidir}
 [testenv:py3-mypy]
 commands = mypy {posargs:tornado}
 changedir = {toxinidir}
-deps = mypy
+deps = mypy==0.630