Adopt more lint rules (#1189)

* adopt more lint rules

* typing

* fix test

Author: blink1073

.pre-commit-config.yaml

@@ -35,7 +35,7 @@ repos:
       - id: black
 
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.206
+    rev: v0.0.236
     hooks:
       - id: ruff
         args: ["--fix"]

jupyter_server/auth/__main__.py

@@ -20,7 +20,7 @@ def set_password(args):
         password_repeat = getpass("" if args.quiet else "Repeat password:  ")
         if password1 != password_repeat:
             warnings.warn("Passwords do not match, try again")
-        elif len(password1) < 4:
+        elif len(password1) < 4:  # noqa
             warnings.warn("Please provide at least 4 characters")
         else:
             password = password1

jupyter_server/auth/identity.py

@@ -96,9 +96,8 @@ def _backward_compat_user(got_user: Any) -> User:
         return User(username=got_user)
     elif isinstance(got_user, dict):
         kwargs = {}
-        if "username" not in got_user:
-            if "name" in got_user:
-                kwargs["username"] = got_user["name"]
+        if "username" not in got_user and "name" in got_user:
+            kwargs["username"] = got_user["name"]
         for field in User.__dataclass_fields__:
             if field in got_user:
                 kwargs[field] = got_user[field]
@@ -367,7 +366,7 @@ def _force_clear_cookie(
         which values were used for a given cookie).
         """
         name = escape.native_str(name)
-        expires = datetime.datetime.utcnow() - datetime.timedelta(days=365)
+        expires = datetime.datetime.now(tz=datetime.timezone.utc) - datetime.timedelta(days=365)
 
         morsel: Morsel = Morsel()
         morsel.set(name, "", '""')

jupyter_server/base/handlers.py

@@ -183,7 +183,7 @@ def token_authenticated(self):
     def logged_in(self):
         """Is a user currently logged in?"""
         user = self.current_user
-        return user and not user == "anonymous"
+        return user and user != "anonymous"
 
     @property
     def login_handler(self):

jupyter_server/config_manager.py

@@ -116,8 +116,7 @@ def set(self, section_name, data):
         # Generate the JSON up front, since it could raise an exception,
         # in order to avoid writing half-finished corrupted data to disk.
         json_content = json.dumps(data, indent=2)
-        f = open(filename, "w", encoding="utf-8")
-        with f:
+        with open(filename, "w", encoding="utf-8") as f:
             f.write(json_content)
 
     def update(self, section_name, new_data):

jupyter_server/extension/manager.py

@@ -204,10 +204,7 @@ def _load_metadata(self):
 
     def validate(self):
         """Validate all extension points in this package."""
-        for extension in self.extension_points.values():
-            if not extension.validate():
-                return False
-        return True
+        return all(extension.validate() for extension in self.extension_points.values())
 
     def link_point(self, point_name, serverapp):
         """Link an extension point."""
@@ -379,7 +376,7 @@ def link_all_extensions(self):
         """
         # Sort the extension names to enforce deterministic linking
         # order.
-        for name in self.sorted_extensions.keys():
+        for name in self.sorted_extensions:
             self.link_extension(name)
 
     def load_all_extensions(self):
@@ -388,7 +385,7 @@ def load_all_extensions(self):
         """
         # Sort the extension names to enforce deterministic loading
         # order.
-        for name in self.sorted_extensions.keys():
+        for name in self.sorted_extensions:
             self.load_extension(name)
 
     async def stop_all_extensions(self):

jupyter_server/gateway/gateway_client.py

@@ -7,7 +7,7 @@
 import os
 import typing as ty
 from abc import ABC, ABCMeta, abstractmethod
-from datetime import datetime
+from datetime import datetime, timezone
 from email.utils import parsedate_to_datetime
 from http.cookies import SimpleCookie
 from socket import gaierror
@@ -96,9 +96,8 @@ def _url_default(self):
     def _url_validate(self, proposal):
         value = proposal["value"]
         # Ensure value, if present, starts with 'http'
-        if value is not None and len(value) > 0:
-            if not str(value).lower().startswith("http"):
-                raise TraitError("GatewayClient url must start with 'http': '%r'" % value)
+        if value is not None and len(value) > 0 and not str(value).lower().startswith("http"):
+            raise TraitError("GatewayClient url must start with 'http': '%r'" % value)
         return value
 
     ws_url = Unicode(
@@ -115,18 +114,16 @@ def _url_validate(self, proposal):
     @default("ws_url")
     def _ws_url_default(self):
         default_value = os.environ.get(self.ws_url_env)
-        if default_value is None:
-            if self.gateway_enabled:
-                default_value = self.url.lower().replace("http", "ws")
+        if default_value is None and self.gateway_enabled:
+            default_value = self.url.lower().replace("http", "ws")
         return default_value
 
     @validate("ws_url")
     def _ws_url_validate(self, proposal):
         value = proposal["value"]
         # Ensure value, if present, starts with 'ws'
-        if value is not None and len(value) > 0:
-            if not str(value).lower().startswith("ws"):
-                raise TraitError("GatewayClient ws_url must start with 'ws': '%r'" % value)
+        if value is not None and len(value) > 0 and not str(value).lower().startswith("ws"):
+            raise TraitError("GatewayClient ws_url must start with 'ws': '%r'" % value)
         return value
 
     kernels_endpoint_default_value = "/api/kernels"
@@ -599,7 +596,7 @@ def update_cookies(self, cookie: SimpleCookie) -> None:
         if not self.accept_cookies:
             return
 
-        store_time = datetime.now()
+        store_time = datetime.now(tz=timezone.utc)
         for key, item in cookie.items():
             # Convert "expires" arg into "max-age" to facilitate expiration management.
             # As "max-age" has precedence, ignore "expires" when "max-age" exists.
@@ -611,7 +608,7 @@ def update_cookies(self, cookie: SimpleCookie) -> None:
 
     def _clear_expired_cookies(self) -> None:
         """Clear expired cookies."""
-        check_time = datetime.now()
+        check_time = datetime.now(tz=timezone.utc)
         expired_keys = []
 
         for key, (morsel, store_time) in self._cookies.items():

jupyter_server/gateway/managers.py

@@ -72,9 +72,8 @@ async def start_kernel(self, *, kernel_id=None, path=None, **kwargs):
         """
         self.log.info(f"Request start kernel: kernel_id={kernel_id}, path='{path}'")
 
-        if kernel_id is None:
-            if path is not None:
-                kwargs["cwd"] = self.cwd_for_path(path)
+        if kernel_id is None and path is not None:
+            kwargs["cwd"] = self.cwd_for_path(path)
 
         km = self.kernel_manager_factory(parent=self, log=self.log)
         await km.start_kernel(kernel_id=kernel_id, **kwargs)
@@ -283,7 +282,7 @@ async def get_kernel_spec(self, kernel_name, **kwargs):
         try:
             response = await gateway_request(kernel_spec_url, method="GET")
         except web.HTTPError as error:
-            if error.status_code == 404:
+            if error.status_code == 404:  # noqa[PLR2004]
                 # Convert not found to KeyError since that's what the Notebook handler expects
                 # message is not used, but might as well make it useful for troubleshooting
                 msg = f"kernelspec {kernel_name} not found on Gateway server at: {GatewayClient.instance().url}"
@@ -312,7 +311,7 @@ async def get_kernel_spec_resource(self, kernel_name, path):
         try:
             response = await gateway_request(kernel_spec_resource_url, method="GET")
         except web.HTTPError as error:
-            if error.status_code == 404:
+            if error.status_code == 404:  # noqa[PLR2004]
                 kernel_spec_resource = None
             else:
                 raise
@@ -407,7 +406,7 @@ async def refresh_model(self, model=None):
                 response = await gateway_request(self.kernel_url, method="GET")
 
             except web.HTTPError as error:
-                if error.status_code == 404:
+                if error.status_code == 404:  # noqa[PLR2004]
                     self.log.warning("Kernel not found at: %s" % self.kernel_url)
                     model = None
                 else:
@@ -495,7 +494,7 @@ async def shutdown_kernel(self, now=False, restart=False):
                 response = await gateway_request(self.kernel_url, method="DELETE")
                 self.log.debug("Shutdown kernel response: %d %s", response.code, response.reason)
             except web.HTTPError as error:
-                if error.status_code == 404:
+                if error.status_code == 404:  # noqa[PLR2004]
                     self.log.debug("Shutdown kernel response: kernel not found (ignored)")
                 else:
                     raise

jupyter_server/i18n/__init__.py

@@ -42,10 +42,7 @@ def parse_accept_lang_header(accept_lang):
         lang, qvalue = m.group("lang", "qvalue")
         # Browser header format is zh-CN, gettext uses zh_CN
         lang = lang.replace("-", "_")
-        if qvalue is None:
-            qvalue = 1.0
-        else:
-            qvalue = float(qvalue)
+        qvalue = 1.0 if qvalue is None else float(qvalue)
         if qvalue == 0:
             continue  # 0 means not accepted
         by_q[qvalue].append(lang)
@@ -59,7 +56,7 @@ def parse_accept_lang_header(accept_lang):
 def load(language, domain="nbjs"):
     """Load translations from an nbjs.json file"""
     try:
-        f = open(pjoin(I18N_DIR, language, "LC_MESSAGES", "nbjs.json"), encoding="utf-8")
+        f = open(pjoin(I18N_DIR, language, "LC_MESSAGES", "nbjs.json"), encoding="utf-8")  # noqa
     except OSError as e:
         if e.errno != errno.ENOENT:
             raise

jupyter_server/log.py

@@ -28,12 +28,12 @@ def log_request(handler):
     except AttributeError:
         logger = access_log
 
-    if status < 300 or status == 304:
+    if status < 300 or status == 304:  # noqa[PLR2004]
         # Successes (or 304 FOUND) are debug-level
         log_method = logger.debug
-    elif status < 400:
+    elif status < 400:  # noqa[PLR2004]
         log_method = logger.info
-    elif status < 500:
+    elif status < 500:  # noqa[PLR2004]
         log_method = logger.warning
     else:
         log_method = logger.error
@@ -53,21 +53,15 @@ def log_request(handler):
         user = handler.current_user
     except Exception:
         user = None
-    if user:
-        if isinstance(user, User):
-            username = user.username
-        else:
-            username = "unknown"
-    else:
-        username = ""
+    username = (user.username if isinstance(user, User) else "unknown") if user else ""
     ns["username"] = username
 
     msg = "{status} {method} {uri} ({username}@{ip}) {request_time:.2f}ms"
-    if status >= 400:
+    if status >= 400:  # noqa[PLR2004]
         # log bad referers
         ns["referer"] = request.headers.get("Referer", "None")
         msg = msg + " referer={referer}"
-    if status >= 500 and status != 502:
+    if status >= 500 and status != 502:  # noqa[PLR2004]
         # Log a subset of the headers if it caused an error.
         headers = {}
         for header in ["Host", "Accept", "Referer", "User-Agent"]: