pre-commit

Author: Carreau

jupyter_server/auth/authorizer.py

@@ -10,7 +10,8 @@
 # Distributed under the terms of the Modified BSD License.
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Awaitable
+from collections.abc import Awaitable
+from typing import TYPE_CHECKING
 
 from traitlets import Instance
 from traitlets.config import LoggingConfigurable

jupyter_server/base/handlers.py

@@ -13,9 +13,10 @@
 import re
 import types
 import warnings
+from collections.abc import Awaitable, Coroutine, Sequence
 from http.client import responses
 from logging import Logger
-from typing import TYPE_CHECKING, Any, Awaitable, Coroutine, Sequence, cast
+from typing import TYPE_CHECKING, Any, cast
 from urllib.parse import urlparse
 
 import prometheus_client

jupyter_server/files/handlers.py

@@ -6,7 +6,7 @@
 
 import mimetypes
 from base64 import decodebytes
-from typing import Awaitable
+from collections.abc import Awaitable
 
 from jupyter_core.utils import ensure_async
 from tornado import web

tests/auth/test_authorizer.py

@@ -3,7 +3,7 @@
 import asyncio
 import json
 import os
-from typing import Awaitable
+from collections.abc import Awaitable
 
 import pytest
 from jupyter_client.kernelspec import NATIVE_KERNEL_NAME

tests/services/api/test_api.py

@@ -1,5 +1,5 @@
 import json
-from typing import Awaitable, Dict, List
+from collections.abc import Awaitable
 from unittest import mock
 
 import pytest
@@ -31,7 +31,7 @@ async def test_get_status(jp_fetch):
 
 
 class MockUser(User):
-    permissions: Dict[str, List[str]]
+    permissions: dict[str, list[str]]
 
 
 class MockIdentityProvider(IdentityProvider):

tests/services/contents/test_manager.py

@@ -3,7 +3,7 @@
 import sys
 import time
 from itertools import combinations
-from typing import Dict, Optional, Tuple
+from typing import Optional
 from unittest.mock import patch
 
 import pytest
@@ -112,7 +112,7 @@ def add_invalid_cell(notebook):
 
 async def prepare_notebook(
     jp_contents_manager: FileContentsManager, make_invalid: Optional[bool] = False
-) -> Tuple[Dict, str]:
+) -> tuple[dict, str]:
     cm = jp_contents_manager
     model = await ensure_async(cm.new_untitled(type="notebook"))
     name = model["name"]
@@ -983,9 +983,10 @@ async def test_nb_validation(jp_contents_manager):
     # successful methods and ensure that calls to the aliased "validate_nb" are
     # zero.  Note that since patching side-effects the validation error case, we'll
     # skip call-count assertions for that portion of the test.
-    with patch("nbformat.validate") as mock_validate, patch(
-        "jupyter_server.services.contents.manager.validate_nb"
-    ) as mock_validate_nb:
+    with (
+        patch("nbformat.validate") as mock_validate,
+        patch("jupyter_server.services.contents.manager.validate_nb") as mock_validate_nb,
+    ):
         # Valid notebook, save, then get
         model = await ensure_async(cm.save(model, path))
         assert "message" not in model

tests/test_serverapp.py

@@ -154,8 +154,9 @@ async def test_generate_config(tmp_path, jp_configurable_serverapp):
 
 def test_server_password(tmp_path, jp_configurable_serverapp):
     password = "secret"
-    with patch.dict("os.environ", {"JUPYTER_CONFIG_DIR": str(tmp_path)}), patch.object(
-        getpass, "getpass", return_value=password
+    with (
+        patch.dict("os.environ", {"JUPYTER_CONFIG_DIR": str(tmp_path)}),
+        patch.object(getpass, "getpass", return_value=password),
     ):
         app = JupyterPasswordApp(log_level=logging.ERROR)
         app.initialize([])