more work on removing asyncio patch

Author: bollwyvl

jupyter_server/serverapp.py

@@ -1604,32 +1604,12 @@ def init_httpserver(self):
 
     @staticmethod
     def _init_asyncio_patch():
-        return
-        # """set default asyncio policy to be compatible with tornado
-        # Tornado 6 (at least) is not compatible with the default
-        # asyncio implementation on Windows
-        # Pick the older SelectorEventLoopPolicy on Windows
-        # if the known-incompatible default policy is in use.
-        # do this as early as possible to make it a low priority and overrideable
-        # ref: https://github.com/tornadoweb/tornado/issues/2608
-        # 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):
-        #     import asyncio
-        #     try:
-        #         from asyncio import (
-        #             WindowsProactorEventLoopPolicy,
-        #             WindowsSelectorEventLoopPolicy,
-        #         )
-        #     except ImportError:
-        #         pass
-        #         # not affected
-        #     else:
-        #         if type(asyncio.get_event_loop_policy()) is WindowsProactorEventLoopPolicy:
-        #             # WindowsProactorEventLoopPolicy is not compatible with tornado 6
-        #             # fallback to the pre-3.8 default of Selector
-        #             asyncio.set_event_loop_policy(WindowsSelectorEventLoopPolicy())
+        """no longer needed with tornado 6.1"""
+        warnings.warn(
+            """ServerApp._init_asyncio_patch called, and is longer needed for """
+            """tornado 6.1+, and will be removed in a future release.""",
+            DeprecationWarning
+        )
 
     @catch_config_error
     def initialize(self, argv=None, find_extensions=True, new_httpserver=True):
@@ -1649,7 +1629,6 @@ def initialize(self, argv=None, find_extensions=True, new_httpserver=True):
             If True, a tornado HTTPServer instance will be created and configured for the Server Web
             Application. This will set the http_server attribute of this class.
         """
-        self._init_asyncio_patch()
         # Parse command line, load ServerApp config files,
         # and update ServerApp config.
         super(ServerApp, self).initialize(argv)

tests/test_files.py

@@ -10,22 +10,25 @@
                          new_output)
 
 
-async def test_hidden_files(fetch, serverapp, root_dir):
-    not_hidden = [
-        u'å b',
-        u'å b/ç. d',
-    ]
-    hidden = [
-        u'.å b',
-        u'å b/.ç d',
-    ]
-    dirs = not_hidden + hidden
-
-    for d in dirs:
-        path  = root_dir / d.replace('/', os.sep)
-        path.mkdir(parents=True, exist_ok=True)
-        path.joinpath('foo').write_text('foo')
-        path.joinpath('.foo').write_text('.foo')
+@pytest.fixture(params=[
+    [False, ['å b']],
+    [False, ['å b', 'ç. d']],
+    [True, ['.å b']],
+    [True, ['å b', '.ç d']]
+])
+def maybe_hidden(request):
+    return request.param
+
+
+async def fetch_expect_200(fetch, *path_parts):
+    r = await fetch('files', *path_parts, method='GET')
+    assert (r.body.decode() == path_parts[-1]), (path_parts, r.body)
+
+
+async def fetch_expect_404(fetch, *path_parts):
+    with pytest.raises(tornado.httpclient.HTTPClientError) as e:
+        r = await fetch('files', *path_parts, method='GET')
+    assert expected_http_error(e, 404), [path_parts, e]
 
 
     for d in not_hidden: