Skip to content

Commit b6f25e5

Browse files
committed
Automatic ruff fixes with unsafe rules
1 parent 2a18db4 commit b6f25e5

19 files changed

+68
-48
lines changed

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ ignore = [
182182
"S603",
183183
# Ignore complexity
184184
"C901", "PLR0911", "PLR0912", "PLR0913", "PLR0915",
185+
# To be fixed once more recent Python versions are available
186+
"UP006", "UP007"
185187
]
186188
unfixable = [
187189
# Don't touch unused imports

src/zimscraperlib/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import logging as stdlogging
55
import os
66

7-
from .constants import NAME
8-
from .logging import getLogger
7+
from zimscraperlib.constants import NAME
8+
from zimscraperlib.logging import getLogger
99

1010
debug = os.getenv("ZIMSCRAPERLIB_DEBUG")
1111
logger = getLogger(NAME, level=stdlogging.DEBUG if debug else stdlogging.INFO)

src/zimscraperlib/download.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import requests
1313
import yt_dlp as youtube_dl
1414

15-
from . import logger
15+
from zimscraperlib import logger
1616

1717

1818
class YoutubeDownloader:

src/zimscraperlib/html.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from bs4 import BeautifulSoup
1010

11-
from .types import ARTICLE_MIME
11+
from zimscraperlib.types import ARTICLE_MIME
1212

1313

1414
def find_title_in(content: Union[str, BinaryIO, TextIO], mime_type: str) -> str:

src/zimscraperlib/image/convertion.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
import PIL
88

9-
from ..constants import ALPHA_NOT_SUPPORTED
10-
from .probing import format_for
11-
from .transformation import resize_image
12-
from .utils import save_image
9+
from zimscraperlib.constants import ALPHA_NOT_SUPPORTED
10+
from zimscraperlib.image.probing import format_for
11+
from zimscraperlib.image.transformation import resize_image
12+
from zimscraperlib.image.utils import save_image
1313

1414

1515
def convert_image(

src/zimscraperlib/image/optimization.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
from optimize_images.img_dynamic_quality import jpeg_dynamic_quality
3636
from PIL import Image
3737

38-
from .convertion import convert_image
39-
from .probing import format_for
40-
from .utils import save_image
38+
from zimscraperlib.image.convertion import convert_image
39+
from zimscraperlib.image.probing import format_for
40+
from zimscraperlib.image.utils import save_image
4141

4242

4343
def ensure_matches(

src/zimscraperlib/image/transformation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import PIL
99
from resizeimage import resizeimage
1010

11-
from ..constants import ALPHA_NOT_SUPPORTED
12-
from .utils import save_image
11+
from zimscraperlib.constants import ALPHA_NOT_SUPPORTED
12+
from zimscraperlib.image.utils import save_image
1313

1414

1515
def resize_image(

src/zimscraperlib/inputs.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
import tempfile
77
from typing import Optional, Tuple, Union
88

9-
from . import logger
10-
from .constants import MAXIMUM_DESCRIPTION_METADATA_LENGTH as MAX_DESC_LENGTH
11-
from .constants import MAXIMUM_LONG_DESCRIPTION_METADATA_LENGTH as MAX_LONG_DESC_LENGTH
12-
from .download import stream_file
9+
from zimscraperlib import logger
10+
from zimscraperlib.constants import (
11+
MAXIMUM_DESCRIPTION_METADATA_LENGTH as MAX_DESC_LENGTH,
12+
)
13+
from zimscraperlib.constants import (
14+
MAXIMUM_LONG_DESCRIPTION_METADATA_LENGTH as MAX_LONG_DESC_LENGTH,
15+
)
16+
from zimscraperlib.download import stream_file
1317

1418

1519
def handle_user_provided_file(

src/zimscraperlib/logging.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from logging.handlers import RotatingFileHandler
99
from typing import Iterable, Optional
1010

11-
from .constants import NAME
11+
from zimscraperlib.constants import NAME
1212

1313
DEFAULT_FORMAT = "[%(name)s::%(asctime)s] %(levelname)s:%(message)s"
1414
VERBOSE_DEPENDENCIES = ["urllib3", "PIL", "boto3", "botocore", "s3transfer"]

src/zimscraperlib/uri.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import urllib.parse
44
from typing import Union
55

6-
from . import logger
7-
from .misc import first
6+
from zimscraperlib import logger
7+
from zimscraperlib.misc import first
88

99

1010
def rebuild_uri(

src/zimscraperlib/video/encoding.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import subprocess
88
import tempfile
99

10-
from .. import logger
11-
from ..logging import nicer_args_join
10+
from zimscraperlib import logger
11+
from zimscraperlib.logging import nicer_args_join
1212

1313

1414
def reencode(

src/zimscraperlib/video/presets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python3
22
# vim: ai ts=4 sts=4 et sw=4 nu
33

4-
from .config import Config
4+
from zimscraperlib.video.config import Config
55

66
preset_type = "video"
77

src/zimscraperlib/zim/__init__.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,16 @@
1111

1212
from libzim.writer import Blob
1313

14-
from .archive import Archive
15-
from .creator import Creator
16-
from .filesystem import make_zim_file
17-
from .items import Item, StaticItem, URLItem
18-
from .providers import FileLikeProvider, FileProvider, StringProvider, URLProvider
14+
from zimscraperlib.zim.archive import Archive
15+
from zimscraperlib.zim.creator import Creator
16+
from zimscraperlib.zim.filesystem import make_zim_file
17+
from zimscraperlib.zim.items import Item, StaticItem, URLItem
18+
from zimscraperlib.zim.providers import (
19+
FileLikeProvider,
20+
FileProvider,
21+
StringProvider,
22+
URLProvider,
23+
)
1924

2025
__all__ = [
2126
"Archive",

src/zimscraperlib/zim/archive.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import libzim.search # Query, Searcher
1616
import libzim.suggestion # SuggestionSearcher
1717

18-
from ._libkiwix import convertTags, parseMimetypeCounter
19-
from .items import Item
18+
from zimscraperlib.zim._libkiwix import convertTags, parseMimetypeCounter
19+
from zimscraperlib.zim.items import Item
2020

2121

2222
class Archive(libzim.reader.Archive):

src/zimscraperlib/zim/creator.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,20 @@
2525

2626
import libzim.writer
2727

28-
from ..constants import (
28+
from zimscraperlib.constants import (
2929
DEFAULT_DEV_ZIM_METADATA,
3030
FRONT_ARTICLE_MIMETYPES,
3131
MANDATORY_ZIM_METADATA_KEYS,
3232
)
33-
from ..filesystem import delete_callback, get_content_mimetype, get_file_mimetype
34-
from ..i18n import is_valid_iso_639_3
35-
from ..types import get_mime_for_name
36-
from .items import StaticItem
37-
from .metadata import (
33+
from zimscraperlib.filesystem import (
34+
delete_callback,
35+
get_content_mimetype,
36+
get_file_mimetype,
37+
)
38+
from zimscraperlib.i18n import is_valid_iso_639_3
39+
from zimscraperlib.types import get_mime_for_name
40+
from zimscraperlib.zim.items import StaticItem
41+
from zimscraperlib.zim.metadata import (
3842
validate_counter,
3943
validate_date,
4044
validate_description,

src/zimscraperlib/zim/filesystem.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
import re
3232
from typing import Optional, Sequence, Tuple
3333

34-
from .. import logger
35-
from ..filesystem import get_file_mimetype
36-
from ..html import find_title_in_file
37-
from ..types import get_mime_for_name
38-
from .creator import Creator
39-
from .items import StaticItem
34+
from zimscraperlib import logger
35+
from zimscraperlib.filesystem import get_file_mimetype
36+
from zimscraperlib.html import find_title_in_file
37+
from zimscraperlib.types import get_mime_for_name
38+
from zimscraperlib.zim.creator import Creator
39+
from zimscraperlib.zim.items import StaticItem
4040

4141

4242
class FileItem(StaticItem):

src/zimscraperlib/zim/items.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,13 @@
1313

1414
import libzim.writer
1515

16-
from ..download import stream_file
17-
from .providers import FileLikeProvider, FileProvider, StringProvider, URLProvider
16+
from zimscraperlib.download import stream_file
17+
from zimscraperlib.zim.providers import (
18+
FileLikeProvider,
19+
FileProvider,
20+
StringProvider,
21+
URLProvider,
22+
)
1823

1924

2025
class Item(libzim.writer.Item):

src/zimscraperlib/zim/metadata.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
from collections.abc import Iterable as IterableT
44
from typing import Any, Iterable, Union
55

6-
from ..constants import (
6+
from zimscraperlib.constants import (
77
ILLUSTRATIONS_METADATA_RE,
88
MANDATORY_ZIM_METADATA_KEYS,
99
MAXIMUM_DESCRIPTION_METADATA_LENGTH,
1010
MAXIMUM_LONG_DESCRIPTION_METADATA_LENGTH,
1111
RECOMMENDED_MAX_TITLE_LENGTH,
1212
)
13-
from ..i18n import is_valid_iso_639_3
14-
from ..image.probing import is_valid_image
13+
from zimscraperlib.i18n import is_valid_iso_639_3
14+
from zimscraperlib.image.probing import is_valid_image
1515

1616

1717
def validate_required_values(name: str, value: Any):

src/zimscraperlib/zim/providers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import libzim.writer
1717
import requests
1818

19-
from ..download import _get_retry_adapter, stream_file
19+
from zimscraperlib.download import _get_retry_adapter, stream_file
2020

2121

2222
class FileProvider(libzim.writer.FileProvider):

0 commit comments

Comments
 (0)