Automatic ruff fixes with unsafe rules

Author: benoit74

pyproject.toml

@@ -182,6 +182,8 @@ ignore = [
   "S603",
   # Ignore complexity
   "C901", "PLR0911", "PLR0912", "PLR0913", "PLR0915",
+  # To be fixed once more recent Python versions are available
+  "UP006", "UP007"
 ]
 unfixable = [
   # Don't touch unused imports

src/zimscraperlib/__init__.py

@@ -4,8 +4,8 @@
 import logging as stdlogging
 import os
 
-from .constants import NAME
-from .logging import getLogger
+from zimscraperlib.constants import NAME
+from zimscraperlib.logging import getLogger
 
 debug = os.getenv("ZIMSCRAPERLIB_DEBUG")
 logger = getLogger(NAME, level=stdlogging.DEBUG if debug else stdlogging.INFO)

src/zimscraperlib/download.py

@@ -12,7 +12,7 @@
 import requests
 import yt_dlp as youtube_dl
 
-from . import logger
+from zimscraperlib import logger
 
 
 class YoutubeDownloader:

src/zimscraperlib/html.py

@@ -8,7 +8,7 @@
 
 from bs4 import BeautifulSoup
 
-from .types import ARTICLE_MIME
+from zimscraperlib.types import ARTICLE_MIME
 
 
 def find_title_in(content: Union[str, BinaryIO, TextIO], mime_type: str) -> str:

src/zimscraperlib/image/convertion.py

@@ -6,10 +6,10 @@
 
 import PIL
 
-from ..constants import ALPHA_NOT_SUPPORTED
-from .probing import format_for
-from .transformation import resize_image
-from .utils import save_image
+from zimscraperlib.constants import ALPHA_NOT_SUPPORTED
+from zimscraperlib.image.probing import format_for
+from zimscraperlib.image.transformation import resize_image
+from zimscraperlib.image.utils import save_image
 
 
 def convert_image(

src/zimscraperlib/image/optimization.py

@@ -35,9 +35,9 @@
 from optimize_images.img_dynamic_quality import jpeg_dynamic_quality
 from PIL import Image
 
-from .convertion import convert_image
-from .probing import format_for
-from .utils import save_image
+from zimscraperlib.image.convertion import convert_image
+from zimscraperlib.image.probing import format_for
+from zimscraperlib.image.utils import save_image
 
 
 def ensure_matches(

src/zimscraperlib/image/transformation.py

@@ -8,8 +8,8 @@
 import PIL
 from resizeimage import resizeimage
 
-from ..constants import ALPHA_NOT_SUPPORTED
-from .utils import save_image
+from zimscraperlib.constants import ALPHA_NOT_SUPPORTED
+from zimscraperlib.image.utils import save_image
 
 
 def resize_image(

src/zimscraperlib/inputs.py

@@ -6,10 +6,14 @@
 import tempfile
 from typing import Optional, Tuple, Union
 
-from . import logger
-from .constants import MAXIMUM_DESCRIPTION_METADATA_LENGTH as MAX_DESC_LENGTH
-from .constants import MAXIMUM_LONG_DESCRIPTION_METADATA_LENGTH as MAX_LONG_DESC_LENGTH
-from .download import stream_file
+from zimscraperlib import logger
+from zimscraperlib.constants import (
+    MAXIMUM_DESCRIPTION_METADATA_LENGTH as MAX_DESC_LENGTH,
+)
+from zimscraperlib.constants import (
+    MAXIMUM_LONG_DESCRIPTION_METADATA_LENGTH as MAX_LONG_DESC_LENGTH,
+)
+from zimscraperlib.download import stream_file
 
 
 def handle_user_provided_file(

src/zimscraperlib/logging.py

@@ -8,7 +8,7 @@
 from logging.handlers import RotatingFileHandler
 from typing import Iterable, Optional
 
-from .constants import NAME
+from zimscraperlib.constants import NAME
 
 DEFAULT_FORMAT = "[%(name)s::%(asctime)s] %(levelname)s:%(message)s"
 VERBOSE_DEPENDENCIES = ["urllib3", "PIL", "boto3", "botocore", "s3transfer"]

src/zimscraperlib/uri.py

@@ -3,8 +3,8 @@
 import urllib.parse
 from typing import Union
 
-from . import logger
-from .misc import first
+from zimscraperlib import logger
+from zimscraperlib.misc import first
 
 
 def rebuild_uri(

src/zimscraperlib/video/encoding.py

@@ -7,8 +7,8 @@
 import subprocess
 import tempfile
 
-from .. import logger
-from ..logging import nicer_args_join
+from zimscraperlib import logger
+from zimscraperlib.logging import nicer_args_join
 
 
 def reencode(

src/zimscraperlib/video/presets.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # vim: ai ts=4 sts=4 et sw=4 nu
 
-from .config import Config
+from zimscraperlib.video.config import Config
 
 preset_type = "video"
 

src/zimscraperlib/zim/__init__.py

@@ -11,11 +11,16 @@
 
 from libzim.writer import Blob
 
-from .archive import Archive
-from .creator import Creator
-from .filesystem import make_zim_file
-from .items import Item, StaticItem, URLItem
-from .providers import FileLikeProvider, FileProvider, StringProvider, URLProvider
+from zimscraperlib.zim.archive import Archive
+from zimscraperlib.zim.creator import Creator
+from zimscraperlib.zim.filesystem import make_zim_file
+from zimscraperlib.zim.items import Item, StaticItem, URLItem
+from zimscraperlib.zim.providers import (
+    FileLikeProvider,
+    FileProvider,
+    StringProvider,
+    URLProvider,
+)
 
 __all__ = [
     "Archive",

src/zimscraperlib/zim/archive.py

@@ -15,8 +15,8 @@
 import libzim.search  # Query, Searcher
 import libzim.suggestion  # SuggestionSearcher
 
-from ._libkiwix import convertTags, parseMimetypeCounter
-from .items import Item
+from zimscraperlib.zim._libkiwix import convertTags, parseMimetypeCounter
+from zimscraperlib.zim.items import Item
 
 
 class Archive(libzim.reader.Archive):

src/zimscraperlib/zim/creator.py

@@ -25,16 +25,20 @@
 
 import libzim.writer
 
-from ..constants import (
+from zimscraperlib.constants import (
     DEFAULT_DEV_ZIM_METADATA,
     FRONT_ARTICLE_MIMETYPES,
     MANDATORY_ZIM_METADATA_KEYS,
 )
-from ..filesystem import delete_callback, get_content_mimetype, get_file_mimetype
-from ..i18n import is_valid_iso_639_3
-from ..types import get_mime_for_name
-from .items import StaticItem
-from .metadata import (
+from zimscraperlib.filesystem import (
+    delete_callback,
+    get_content_mimetype,
+    get_file_mimetype,
+)
+from zimscraperlib.i18n import is_valid_iso_639_3
+from zimscraperlib.types import get_mime_for_name
+from zimscraperlib.zim.items import StaticItem
+from zimscraperlib.zim.metadata import (
     validate_counter,
     validate_date,
     validate_description,

src/zimscraperlib/zim/filesystem.py

@@ -31,12 +31,12 @@
 import re
 from typing import Optional, Sequence, Tuple
 
-from .. import logger
-from ..filesystem import get_file_mimetype
-from ..html import find_title_in_file
-from ..types import get_mime_for_name
-from .creator import Creator
-from .items import StaticItem
+from zimscraperlib import logger
+from zimscraperlib.filesystem import get_file_mimetype
+from zimscraperlib.html import find_title_in_file
+from zimscraperlib.types import get_mime_for_name
+from zimscraperlib.zim.creator import Creator
+from zimscraperlib.zim.items import StaticItem
 
 
 class FileItem(StaticItem):

src/zimscraperlib/zim/items.py

@@ -13,8 +13,13 @@
 
 import libzim.writer
 
-from ..download import stream_file
-from .providers import FileLikeProvider, FileProvider, StringProvider, URLProvider
+from zimscraperlib.download import stream_file
+from zimscraperlib.zim.providers import (
+    FileLikeProvider,
+    FileProvider,
+    StringProvider,
+    URLProvider,
+)
 
 
 class Item(libzim.writer.Item):

src/zimscraperlib/zim/metadata.py

@@ -3,15 +3,15 @@
 from collections.abc import Iterable as IterableT
 from typing import Any, Iterable, Union
 
-from ..constants import (
+from zimscraperlib.constants import (
     ILLUSTRATIONS_METADATA_RE,
     MANDATORY_ZIM_METADATA_KEYS,
     MAXIMUM_DESCRIPTION_METADATA_LENGTH,
     MAXIMUM_LONG_DESCRIPTION_METADATA_LENGTH,
     RECOMMENDED_MAX_TITLE_LENGTH,
 )
-from ..i18n import is_valid_iso_639_3
-from ..image.probing import is_valid_image
+from zimscraperlib.i18n import is_valid_iso_639_3
+from zimscraperlib.image.probing import is_valid_image
 
 
 def validate_required_values(name: str, value: Any):

src/zimscraperlib/zim/providers.py

@@ -16,7 +16,7 @@
 import libzim.writer
 import requests
 
-from ..download import _get_retry_adapter, stream_file
+from zimscraperlib.download import _get_retry_adapter, stream_file
 
 
 class FileProvider(libzim.writer.FileProvider):