Fix linting and type checking issues following black, ruff and pyright update

Author: benoit74

src/zimscraperlib/filesystem.py

@@ -1,6 +1,6 @@
-""" Files manipulation tools
+"""Files manipulation tools
 
-    Shortcuts to retrieve mime type using magic"""
+Shortcuts to retrieve mime type using magic"""
 
 import pathlib
 from contextlib import contextmanager

src/zimscraperlib/fix_ogvjs_dist.py

@@ -1,4 +1,4 @@
-""" quick script to fix videojs-ogvjs so that it triggers on webm mimetype """
+"""quick script to fix videojs-ogvjs so that it triggers on webm mimetype"""
 
 import logging
 import pathlib

src/zimscraperlib/html.py

@@ -1,4 +1,4 @@
-""" Tools to work with HTML contents """
+"""Tools to work with HTML contents"""
 
 import pathlib
 from typing import BinaryIO, TextIO
@@ -43,11 +43,13 @@ def find_language_in(content: str | BinaryIO | TextIO, mime_type: str) -> str:
                     continue
                 if (
                     nodename == "meta"
-                    and not node.attrs.get("http-equiv", "").lower()
+                    and not node.attrs.get(
+                        "http-equiv", ""
+                    ).lower()  # pyright:ignore[reportUnknownMemberType, reportAttributeAccessIssue]
                     == "content-language"
                 ):
                     continue
-                return node.attrs[key]
+                return node.attrs[key]  # pyright:ignore[reportReturnType]
     return ""
 
 

src/zimscraperlib/image/optimization.py

@@ -1,22 +1,22 @@
-""" An image optimization module to optimize the following image formats:
+"""An image optimization module to optimize the following image formats:
 
-    - JPEG (using optimize-images)
-    - PNG (using optimize-images)
-    - GIF (using gifsicle with lossy optimization)
-    - WebP (using Pillow)
+- JPEG (using optimize-images)
+- PNG (using optimize-images)
+- GIF (using gifsicle with lossy optimization)
+- WebP (using Pillow)
 
-    Some important notes:
-    - This makes use of the --lossy option from gifsicle which is present
-     only in versions above 1.92.
-      If the package manager has a lower version, you can build gifsicle
-      from source and install or
-      do not use the lossiness option.
+Some important notes:
+- This makes use of the --lossy option from gifsicle which is present
+ only in versions above 1.92.
+  If the package manager has a lower version, you can build gifsicle
+  from source and install or
+  do not use the lossiness option.
 
-    - Presets for the optimizer are available in zimscraperlib.image.presets.
+- Presets for the optimizer are available in zimscraperlib.image.presets.
 
-    - If no options for an image optimization is passed, the optimizer
-    can still run on default settings which give
-      a bit less size than the original images but maintain a high quality. """
+- If no options for an image optimization is passed, the optimizer
+can still run on default settings which give
+  a bit less size than the original images but maintain a high quality."""
 
 import io
 import os

src/zimscraperlib/misc.py

@@ -1,4 +1,4 @@
-""" Miscelaneous utils"""
+"""Miscelaneous utils"""
 
 from typing import TypeVar
 

src/zimscraperlib/rewriting/css.py

@@ -1,4 +1,4 @@
-""" CSS Rewriting
+"""CSS Rewriting
 
 This modules contains tools to rewrite CSS retrieved from an online source so that it
 can safely operate within a ZIM, linking only to ZIM entries everytime a URL is used.

src/zimscraperlib/rewriting/html.py

@@ -1,4 +1,4 @@
-""" HTML Rewriting
+"""HTML Rewriting
 
 This modules contains tools to rewrite HTML retrieved from an online source so that it
 can safely operate within a ZIM.
@@ -101,8 +101,12 @@ def extract_base_href(content: str) -> str | None:
     if not soup.head:
         return None
     for base in soup.head.find_all("base"):
-        if base.has_attr("href"):
-            return base["href"]
+        if base.has_attr(  # pyright:ignore[reportUnknownMemberType, reportAttributeAccessIssue]
+            "href"
+        ):
+            return base[  # pyright:ignore[reportIndexIssue, reportUnknownVariableType, reportArgumentType, reportReturnType]
+                "href"
+            ]
     return None
 
 

src/zimscraperlib/rewriting/js.py

@@ -1,4 +1,4 @@
-""" JS Rewriting
+"""JS Rewriting
 
 This modules contains tools to rewrite JS retrieved from an online source so that it
 can safely operate within a ZIM. It is based on the assumption that wombat.js will be

src/zimscraperlib/rewriting/url_rewriting.py

@@ -1,4 +1,4 @@
-""" URL rewriting tools
+"""URL rewriting tools
 
 This module is about url and entry path rewriting.
 

src/zimscraperlib/types.py

@@ -1,16 +1,16 @@
-""" File extensions to MIME-Type  mapping
+"""File extensions to MIME-Type  mapping
 
-    All libzim *articles* contains the mime-type of their content, for the libzim
-    reader to properly return it.
+All libzim *articles* contains the mime-type of their content, for the libzim
+reader to properly return it.
 
-    Providing accurate mime-type for ZIM Article is important to prevent broken features
-    upon reading.
-    Ex.: youtube scraper uses Web Assembly files (.wasm) for the WebM codecs.
-    Without the proper mime-type, wasm files are returned as octet-stream and thus
-    not loaded efficiently.
+Providing accurate mime-type for ZIM Article is important to prevent broken features
+upon reading.
+Ex.: youtube scraper uses Web Assembly files (.wasm) for the WebM codecs.
+Without the proper mime-type, wasm files are returned as octet-stream and thus
+not loaded efficiently.
 
-    Should your scraper need additional mapping, use mimetypes.add_type() and it will
-    be automatically used. """
+Should your scraper need additional mapping, use mimetypes.add_type() and it will
+be automatically used."""
 
 import mimetypes
 import pathlib