Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Nov 30, 2022
1 parent 93bf8ae commit b4a1780
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
6 changes: 3 additions & 3 deletions jupyter_server/base/zmqhandlers.py
Expand Up @@ -2,15 +2,15 @@
# Raise a warning that this module is deprecated.
import warnings

from tornado.websocket import WebSocketHandler

from jupyter_server.base.websocket import WebSocketMixin
from jupyter_server_kernels.kernels.connection.base import (
deserialize_binary_message,
deserialize_msg_from_ws_v1,
serialize_binary_message,
serialize_msg_to_ws_v1,
)
from tornado.websocket import WebSocketHandler

from jupyter_server.base.websocket import WebSocketMixin

warnings.warn(
"jupyter_server.base.zmqhandlers module is deprecated in Jupyter Server 2.0",
Expand Down
2 changes: 1 addition & 1 deletion jupyter_server/kernelspecs/handlers.py
@@ -1,9 +1,9 @@
from jupyter_server_kernels.kernelspecs.handlers import kernel_name_regex
from tornado import web

from jupyter_server.auth import authorized

from ..base.handlers import JupyterHandler
from jupyter_server_kernels.kernelspecs.handlers import kernel_name_regex

AUTH_RESOURCE = "kernelspecs"

Expand Down
23 changes: 12 additions & 11 deletions jupyter_server/serverapp.py
Expand Up @@ -86,12 +86,13 @@
from jupyter_server.extension.config import ExtensionConfigManager
from jupyter_server.extension.manager import ExtensionManager
from jupyter_server.extension.serverextension import ServerExtensionApp
#from jupyter_server.gateway.managers import (

# from jupyter_server.gateway.managers import (
# GatewayClient,
# GatewayKernelSpecManager,
# GatewayMappingKernelManager,
# GatewaySessionManager,
#)
# )
from jupyter_server.log import log_request
from jupyter_server.services.config import ConfigManager
from jupyter_server.services.contents.filemanager import (
Expand Down Expand Up @@ -414,7 +415,7 @@ def init_handlers(self, default_services, settings):
handlers.extend(settings["identity_provider"].get_handlers())

# If gateway mode is enabled, replace appropriate handlers to perform redirection
#if GatewayClient.instance().gateway_enabled:
# if GatewayClient.instance().gateway_enabled:
# # for each handler required for gateway, locate its pattern
# # in the current list and replace that entry...
# gateway_handlers = load_handlers("jupyter_server.gateway.handlers")
Expand Down Expand Up @@ -760,10 +761,10 @@ class ServerApp(JupyterApp):
AsyncContentsManager,
AsyncFileContentsManager,
NotebookNotary,
#GatewayMappingKernelManager,
#GatewayKernelSpecManager,
#GatewaySessionManager,
#GatewayClient,
# GatewayMappingKernelManager,
# GatewayKernelSpecManager,
# GatewaySessionManager,
# GatewayClient,
Authorizer,
EventLogger,
]
Expand Down Expand Up @@ -1440,7 +1441,7 @@ def template_file_path(self):

@default("session_manager_class")
def _default_session_manager_class(self):
#if self.gateway_config.gateway_enabled:
# if self.gateway_config.gateway_enabled:
# return "jupyter_server.gateway.managers.GatewaySessionManager"
return SessionManager

Expand All @@ -1465,7 +1466,7 @@ def _default_session_manager_class(self):

@default("kernel_spec_manager_class")
def _default_kernel_spec_manager_class(self):
#if self.gateway_config.gateway_enabled:
# if self.gateway_config.gateway_enabled:
# return "jupyter_server.gateway.managers.GatewayKernelSpecManager"
return KernelSpecManager

Expand Down Expand Up @@ -1765,7 +1766,7 @@ def init_configurables(self):

# If gateway server is configured, replace appropriate managers to perform redirection. To make
# this determination, instantiate the GatewayClient config singleton.
#self.gateway_config = GatewayClient.instance(parent=self)
# self.gateway_config = GatewayClient.instance(parent=self)

if not issubclass(self.contents_manager_class, AsyncContentsManager):
warnings.warn(
Expand Down Expand Up @@ -2472,7 +2473,7 @@ def running_server_info(self, kernel_count=True):
version=ServerApp.version, url=self.display_url
)
)
#if self.gateway_config.gateway_enabled:
# if self.gateway_config.gateway_enabled:
# info += (
# _i18n("\nKernels will be managed by the Gateway server running at:\n%s")
# % self.gateway_config.url
Expand Down

0 comments on commit b4a1780

Please sign in to comment.