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(

0 commit comments

Comments
 (0)