Merge pull request #5907 from bollwyvl/fix-asyncio-win-patch-version

do not apply asyncio patch for tornado >=6.1
jupyter · Dec 14, 2020 · 3b97401 · 3b97401
2 parents 0c83c9d + 73c9ac1
commit 3b97401
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py
@@ -2041,7 +2041,7 @@ def init_shutdown_no_activity(self):
     def _init_asyncio_patch(self):
         """set default asyncio policy to be compatible with tornado
 
-        Tornado 6 (at least) is not compatible with the default
+        Tornado <6.1 is not compatible with the default
         asyncio implementation on Windows
 
         Pick the older SelectorEventLoopPolicy on Windows
@@ -2054,7 +2054,7 @@ def _init_asyncio_patch(self):
         FIXME: if/when tornado supports the defaults in asyncio,
                remove and bump tornado requirement for py38
         """
-        if sys.platform.startswith("win") and sys.version_info >= (3, 8):
+        if sys.platform.startswith("win") and sys.version_info >= (3, 8) and tornado.version_info < (6, 1):
             import asyncio
             try:
                 from asyncio import (