From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 20 Sep 2020 18:38:24 +0000 (-0400)
Subject: Merge pull request #2815 from bdarnell/thread-selector
X-Git-Tag: v6.1.0b1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94f155d7620207f16c5ced282349fb22a512e945;p=thirdparty%2Ftornado.git

Merge pull request #2815 from bdarnell/thread-selector

asyncio: Improve support Python 3.8 on Windows
---

94f155d7620207f16c5ced282349fb22a512e945
diff --cc tornado/platform/asyncio.py
index 5a4f53e27,390d5259b..fc88f918e
--- a/tornado/platform/asyncio.py
+++ b/tornado/platform/asyncio.py
@@@ -67,10 -111,10 +111,10 @@@ class BaseAsyncIOLoop(IOLoop)
  
          self._thread_identity = 0
  
 -        super(BaseAsyncIOLoop, self).initialize(**kwargs)
 +        super().initialize(**kwargs)
  
          def assign_thread_identity() -> None:
-             self._thread_identity = get_ident()
+             self._thread_identity = threading.get_ident()
  
          self.add_callback(assign_thread_identity)
  
diff --cc tornado/test/iostream_test.py
index bf713aa86,67d6438cd..a43aa64ca
--- a/tornado/test/iostream_test.py
+++ b/tornado/test/iostream_test.py
@@@ -943,8 -960,9 +960,9 @@@ class TestIOStreamStartTLS(AsyncTestCas
              self.server_stream.close()
          if self.client_stream is not None:
              self.client_stream.close()
+         self.io_loop.remove_handler(self.listener.fileno())
          self.listener.close()
 -        super(TestIOStreamStartTLS, self).tearDown()
 +        super().tearDown()
  
      def accept(self, connection, address):
          if self.server_stream is not None: