From a833a130fc9e0f204886fc76aed2c9dbf1460b05 Mon Sep 17 00:00:00 2001 From: un-pogaz <46523284+un-pogaz@users.noreply.github.com> Date: Fri, 24 Jan 2025 11:14:17 +0100 Subject: [PATCH] check relative import (manual) ruff 'TID' --- ruff-strict-pep8.toml | 2 +- src/calibre/db/notes/connect.py | 5 ++--- src/calibre/gui2/tweak_book/editor/syntax/base.py | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ruff-strict-pep8.toml b/ruff-strict-pep8.toml index 297c7084e4..ee0751078a 100644 --- a/ruff-strict-pep8.toml +++ b/ruff-strict-pep8.toml @@ -18,7 +18,7 @@ quote-style = 'single' [lint] ignore = ['E402', 'E722', 'E741', 'UP012', 'UP030', 'UP032', 'UP038'] -select = ['E', 'F', 'I', 'W', 'INT', 'Q', 'UP', 'YTT'] +select = ['E', 'F', 'I', 'W', 'INT', 'Q', 'UP', 'YTT', 'TID'] [lint.per-file-ignores] "recipes/*" = ['UP'] diff --git a/src/calibre/db/notes/connect.py b/src/calibre/db/notes/connect.py index fe6c05832c..2355d7c457 100644 --- a/src/calibre/db/notes/connect.py +++ b/src/calibre/db/notes/connect.py @@ -16,13 +16,12 @@ from calibre import sanitize_file_name from calibre.constants import iswindows from calibre.db import FTSQueryError from calibre.db.annotations import unicode_normalize +from calibre.db.constants import NOTES_DB_NAME, NOTES_DIR_NAME +from calibre.db.notes.schema_upgrade import SchemaUpgrade from calibre.utils.copy_files import WINDOWS_SLEEP_FOR_RETRY_TIME from calibre.utils.filenames import copyfile_using_links, make_long_path_useable from calibre.utils.icu import lower as icu_lower -from .schema_upgrade import SchemaUpgrade -from ..constants import NOTES_DB_NAME, NOTES_DIR_NAME - if iswindows: from calibre_extensions import winutil diff --git a/src/calibre/gui2/tweak_book/editor/syntax/base.py b/src/calibre/gui2/tweak_book/editor/syntax/base.py index d47b7e39a1..e2fc58a9f2 100644 --- a/src/calibre/gui2/tweak_book/editor/syntax/base.py +++ b/src/calibre/gui2/tweak_book/editor/syntax/base.py @@ -7,12 +7,11 @@ from collections import defaultdict, deque from qt.core import QTextBlock, QTextBlockUserData, QTextCursor, QTextFormat, QTextLayout, QTimer +from calibre.gui2.tweak_book.editor.themes import highlight_to_char_format from calibre.gui2.widgets import BusyCursor from calibre.utils.icu import utf16_length from polyglot.builtins import iteritems -from ..themes import highlight_to_char_format - def run_loop(user_data, state_map, formats, text): state = user_data.state