From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 21 Jun 2022 12:47:30 +0000 (-0400)
Subject: Merge branch 'master' into avoid-threading-identity
X-Git-Tag: v6.2.0~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3163%2Fhead;p=thirdparty%2Ftornado.git

Merge branch 'master' into avoid-threading-identity
---

d1ce56d53c4e7d20ac08703732b00504a348a92d
diff --cc tornado/platform/asyncio.py
index a5545a047,909cd7877..ca671ac64
--- a/tornado/platform/asyncio.py
+++ b/tornado/platform/asyncio.py
@@@ -137,10 -137,15 +137,8 @@@ class BaseAsyncIOLoop(IOLoop)
                  f"IOLoop {existing_loop} already associated with asyncio loop {asyncio_loop}"
              )
  
-         IOLoop._ioloop_for_asyncio[asyncio_loop] = self
 -        self._thread_identity = 0
--
          super().initialize(**kwargs)
  
 -        def assign_thread_identity() -> None:
 -            self._thread_identity = threading.get_ident()
 -
 -        self.add_callback(assign_thread_identity)
 -
      def close(self, all_fds: bool = False) -> None:
          self.closing = True
          for fd in list(self.handlers):