Fix some CodeQL notices (#371)

* Fix some CodeQL notices

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: fcollonval

jupyterlab_server/config.py

@@ -11,10 +11,9 @@
 
 from jupyter_core.paths import SYSTEM_CONFIG_PATH, jupyter_config_dir, jupyter_path
 from jupyter_server.services.config.manager import ConfigManager, recursive_update
+from jupyter_server.utils import url_path_join as ujoin
 from traitlets import Bool, HasTraits, List, Unicode, default
 
-from .server import url_path_join as ujoin
-
 # -----------------------------------------------------------------------------
 # Module globals
 # -----------------------------------------------------------------------------

jupyterlab_server/handlers.py

@@ -8,14 +8,14 @@
 from functools import lru_cache
 from urllib.parse import urlparse
 
+from jupyter_server.base.handlers import FileFindHandler, JupyterHandler
 from jupyter_server.extension.handler import ExtensionHandlerJinjaMixin, ExtensionHandlerMixin
+from jupyter_server.utils import url_path_join as ujoin
 from tornado import template, web
 
 from .config import LabConfig, get_page_config, recursive_update
 from .licenses_handler import LicensesHandler, LicensesManager
 from .listings_handler import ListingsHandler, fetch_listings
-from .server import FileFindHandler, JupyterHandler
-from .server import url_path_join as ujoin
 from .settings_handler import SettingsHandler
 from .themes_handler import ThemesHandler
 from .translations_handler import TranslationsHandler

jupyterlab_server/licenses_handler.py

@@ -11,12 +11,12 @@
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 
+from jupyter_server.base.handlers import APIHandler
 from tornado import gen, web
 from traitlets import List, Unicode
 from traitlets.config import LoggingConfigurable
 
 from .config import get_federated_extensions
-from .server import APIHandler
 
 # this is duplicated in @juptyerlab/builder
 DEFAULT_THIRD_PARTY_LICENSE_FILE = "third-party-licenses.json"

jupyterlab_server/listings_handler.py

@@ -7,8 +7,7 @@
 
 import requests
 import tornado
-
-from .server import APIHandler
+from jupyter_server.base.handlers import APIHandler
 
 LISTINGS_URL_SUFFIX = "@jupyterlab/extensionmanager-extension/listings.json"
 

jupyterlab_server/server.py

@@ -9,10 +9,11 @@
 import json5  # type:ignore
 from jsonschema import Draft4Validator as Validator
 from jsonschema import ValidationError
+from jupyter_server import _tz as tz
+from jupyter_server.base.handlers import APIHandler
 from jupyter_server.services.config.manager import ConfigManager, recursive_update
 from tornado import web
 
-from .server import APIHandler, tz
 from .translation_utils import DEFAULT_LOCALE, L10N_SCHEMA_NAME, SYS_LOCALE, is_valid_locale
 
 # The JupyterLab settings file extension.

jupyterlab_server/settings_utils.py

@@ -6,11 +6,10 @@
 import os
 import re
 from glob import glob
-from os import path as osp
 from urllib.parse import urlparse
 
-from .server import FileFindHandler
-from .server import url_path_join as ujoin
+from jupyter_server.base.handlers import FileFindHandler
+from jupyter_server.utils import url_path_join as ujoin
 
 
 class ThemesHandler(FileFindHandler):
@@ -50,7 +49,7 @@ def get_content(self, abspath, start=None, end=None):
         This method should either return a byte string or an iterator
         of byte strings.
         """
-        base, ext = osp.splitext(abspath)
+        base, ext = os.path.splitext(abspath)
         if ext != ".css":
             return FileFindHandler.get_content(abspath, start, end)
 
@@ -59,7 +58,7 @@ def get_content(self, abspath, start=None, end=None):
     def get_content_size(self):
         """Retrieve the total size of the resource at the given path."""
         assert self.absolute_path is not None  # noqa
-        base, ext = osp.splitext(self.absolute_path)
+        base, ext = os.path.splitext(self.absolute_path)
         if ext != ".css":
             return FileFindHandler.get_content_size(self)
         else:
@@ -71,7 +70,7 @@ def _get_css(self):
         with open(self.absolute_path, "rb") as fid:
             data = fid.read().decode("utf-8")
 
-        basedir = osp.dirname(self.path).replace(os.sep, "/")
+        basedir = os.path.dirname(self.path).replace(os.sep, "/")
         basepath = ujoin(self.themes_url, basedir)
 
         # Replace local paths with mangled paths.

jupyterlab_server/themes_handler.py

@@ -9,13 +9,13 @@
 import urllib
 from pathlib import Path
 
+from jupyter_server import _tz as tz
+from jupyter_server.base.handlers import APIHandler
 from jupyter_server.extension.handler import ExtensionHandlerJinjaMixin, ExtensionHandlerMixin
+from jupyter_server.utils import url_path_join as ujoin
 from tornado import web
 from traitlets.config import LoggingConfigurable
 
-from .server import APIHandler, tz
-from .server import url_path_join as ujoin
-
 # The JupyterLab workspace file extension.
 WORKSPACE_EXTENSION = ".jupyterlab-workspace"