From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 3 Nov 2019 22:18:54 +0000 (-0500)
Subject: build: Run docs and lint on py38
X-Git-Tag: v6.1.0b1~42^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29b19991a18fbab4164e431e7b834e1cdfcb00e6;p=thirdparty%2Ftornado.git

build: Run docs and lint on py38

This requires moving some noqa comments due to 3.8's changes to the
ast module.
---

diff --git a/.travis.yml b/.travis.yml
index d7ce8e6f7..9bb46ffa1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,9 +34,9 @@ jobs:
     - python: nightly
       env: TOX_ENV=py3-full
       # Docs and lint python versions must be synced with those in tox.ini
-    - python: '3.7'
+    - python: '3.8'
       env: TOX_ENV=docs
-    - python: '3.6'
+    - python: '3.8'
       env: TOX_ENV=lint
 
 install:
diff --git a/tornado/ioloop.py b/tornado/ioloop.py
index a0598727a..2cf884450 100644
--- a/tornado/ioloop.py
+++ b/tornado/ioloop.py
@@ -233,13 +233,13 @@ class IOLoop(Configurable):
     def current() -> "IOLoop":
         pass
 
-    @typing.overload  # noqa: F811
+    @typing.overload
     @staticmethod
-    def current(instance: bool = True) -> Optional["IOLoop"]:
+    def current(instance: bool = True) -> Optional["IOLoop"]:  # noqa: F811
         pass
 
-    @staticmethod  # noqa: F811
-    def current(instance: bool = True) -> Optional["IOLoop"]:
+    @staticmethod
+    def current(instance: bool = True) -> Optional["IOLoop"]:  # noqa: F811
         """Returns the current thread's `IOLoop`.
 
         If an `IOLoop` is currently running or has been marked as
diff --git a/tornado/web.py b/tornado/web.py
index 3fc99fb8d..450f4c650 100644
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -424,14 +424,14 @@ class RequestHandler(object):
     def get_argument(self, name: str, default: str, strip: bool = True) -> str:
         pass
 
-    @overload  # noqa: F811
-    def get_argument(
+    @overload
+    def get_argument(  # noqa: F811
         self, name: str, default: _ArgDefaultMarker = _ARG_DEFAULT, strip: bool = True
     ) -> str:
         pass
 
-    @overload  # noqa: F811
-    def get_argument(
+    @overload
+    def get_argument(  # noqa: F811
         self, name: str, default: None, strip: bool = True
     ) -> Optional[str]:
         pass
diff --git a/tox.ini b/tox.ini
index c9e946014..a21b87192 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,8 +40,8 @@ basepython =
            # the outputs of the tools (especially where exactly the
            # linter warning-supression comments go), so we specify a
            # python version for these builds.
-           docs: python3.7
-           lint: python3.6
+           docs: python3.8
+           lint: python3.8
 
 deps =
      full: pycurl