Skip to content

Commit

Permalink
Organize imports
Browse files Browse the repository at this point in the history
  • Loading branch information
ping committed Jul 31, 2023
1 parent 1bf3d32 commit ac3e8e1
Show file tree
Hide file tree
Showing 14 changed files with 80 additions and 80 deletions.
22 changes: 11 additions & 11 deletions calibre-plugin/action.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,30 @@

from calibre.gui2.actions import InterfaceAction
from qt.core import (
QToolButton,
QSize,
QIcon,
QColor,
QDesktopServices,
QIcon,
QPainter,
QXmlStreamReader,
QSvgRenderer,
QPixmap,
QSize,
QSvgRenderer,
QToolButton,
QUrl,
QDesktopServices,
QXmlStreamReader,
)

from . import logger, PLUGIN_NAME, PLUGIN_ICON
from . import PLUGIN_ICON, PLUGIN_NAME, logger
from .compat import (
_c,
Qt_GlobalColor_transparent,
QPainter_CompositionMode_CompositionMode_SourceIn,
QColor_fromString,
QPainter_CompositionMode_CompositionMode_SourceIn,
Qt_GlobalColor_transparent,
_c,
)
from .config import PREFS, PreferenceKeys
from .dialog import (
BaseDialogMixin,
LoansDialogMixin,
HoldsDialogMixin,
LoansDialogMixin,
MagazinesDialogMixin,
)
from .utils import ICON_MAP, PluginIcons
Expand Down
2 changes: 1 addition & 1 deletion calibre-plugin/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import re
from typing import Tuple

from qt.core import Qt, QPainter, QToolButton, QSlider, QHeaderView, QColor
from qt.core import QColor, QHeaderView, QPainter, QSlider, QToolButton, Qt

# noinspection PyUnreachableCode
if False:
Expand Down
4 changes: 2 additions & 2 deletions calibre-plugin/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
from calibre import confirm_config_name
from calibre.gui2 import error_dialog
from calibre.utils.config import JSONConfig
from qt.core import Qt, QWidget, QGridLayout, QLabel, QCheckBox, QLineEdit
from qt.core import QCheckBox, QGridLayout, QLabel, QLineEdit, QWidget, Qt

from . import logger, PLUGIN_NAME, DEMO_MODE
from . import DEMO_MODE, PLUGIN_NAME, logger
from .compat import _c
from .utils import PluginColors

Expand Down
24 changes: 12 additions & 12 deletions calibre-plugin/dialog/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@
from typing import Dict, List

from calibre.constants import DEBUG
from calibre.gui2 import info_dialog, error_dialog
from calibre.gui2 import error_dialog, info_dialog
from calibre.gui2.viewer.overlay import LoadingOverlay
from calibre.gui2.widgets2 import CenteredToolButton # available from calibre 5.33.0
from polyglot.io import PolyglotStringIO
from qt.core import (
Qt,
QApplication,
QDesktopServices,
QDialog,
QFont,
QGridLayout,
QThread,
QLabel,
QMenu,
QStatusBar,
QTabWidget,
QDesktopServices,
QThread,
QUrl,
QWidget,
QStatusBar,
QApplication,
QFont,
QMenu,
QLabel,
Qt,
)

from .. import logger, __version__, DEMO_MODE
from ..compat import _c, QToolButton_ToolButtonPopupMode_DelayedPopup
from ..config import PREFS, PreferenceKeys, BorrowActions
from .. import DEMO_MODE, __version__, logger
from ..compat import QToolButton_ToolButtonPopupMode_DelayedPopup, _c
from ..config import BorrowActions, PREFS, PreferenceKeys
from ..libby import LibbyClient
from ..libby.errors import ClientConnectionError as LibbyConnectionError
from ..models import LibbyModel
Expand Down
24 changes: 12 additions & 12 deletions calibre-plugin/dialog/holds.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,34 @@
from calibre.gui2.threaded_jobs import ThreadedJob
from polyglot.builtins import as_unicode
from qt.core import (
Qt,
QGridLayout,
QPushButton,
QCheckBox,
QAbstractItemView,
QTableView,
QSortFilterProxyModel,
QMenu,
QCheckBox,
QCursor,
QWidget,
QDialog,
QGridLayout,
QLabel,
QSlider,
QLayout,
QMenu,
QPushButton,
QSlider,
QSortFilterProxyModel,
QTableView,
QWidget,
Qt,
)

from .base import BaseDialogMixin
from ..borrow_book import LibbyBorrowHold
from ..compat import (
_c,
QHeaderView_ResizeMode_Stretch,
QHeaderView_ResizeMode_ResizeToContents,
QHeaderView_ResizeMode_Stretch,
QSlider_TickPosition_TicksBelow,
_c,
)
from ..config import PREFS, PreferenceKeys, PreferenceTexts
from ..hold_actions import LibbyHoldCancel, LibbyHoldUpdate
from ..libby import LibbyClient
from ..models import get_media_title, LibbyHoldsModel, LibbyModel
from ..models import LibbyHoldsModel, LibbyModel, get_media_title
from ..utils import PluginIcons

# noinspection PyUnreachableCode
Expand Down
22 changes: 11 additions & 11 deletions calibre-plugin/dialog/loans.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,32 @@
from calibre.gui2.threaded_jobs import ThreadedJob
from polyglot.builtins import as_unicode
from qt.core import (
Qt,
QAbstractItemView,
QCheckBox,
QCursor,
QGridLayout,
QMenu,
QPushButton,
QCheckBox,
QAbstractItemView,
QTableView,
QSortFilterProxyModel,
QMenu,
QCursor,
QTableView,
QWidget,
Qt,
)

from .base import BaseDialogMixin
from ..compat import (
_c,
QHeaderView_ResizeMode_Stretch,
QHeaderView_ResizeMode_ResizeToContents,
QHeaderView_ResizeMode_Stretch,
_c,
)
from ..config import PREFS, PreferenceKeys, PreferenceTexts
from ..ebook_download import CustomEbookDownload
from ..libby import LibbyClient
from ..loan_actions import LibbyLoanReturn
from ..magazine_download import CustomMagazineDownload
from ..magazine_download_utils import extract_isbn, extract_asin
from ..models import get_media_title, LibbyLoansModel, LibbyModel
from ..utils import PluginIcons, OD_IDENTIFIER, generate_od_identifier
from ..magazine_download_utils import extract_asin, extract_isbn
from ..models import LibbyLoansModel, LibbyModel, get_media_title
from ..utils import OD_IDENTIFIER, PluginIcons, generate_od_identifier

# noinspection PyUnreachableCode
if False:
Expand Down
22 changes: 11 additions & 11 deletions calibre-plugin/dialog/magazines.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,33 @@
from calibre.gui2.threaded_jobs import ThreadedJob
from polyglot.builtins import as_unicode
from qt.core import (
Qt,
QWidget,
QAbstractItemView,
QCheckBox,
QComboBox,
QCursor,
QGridLayout,
QLabel,
QLineEdit,
QComboBox,
QMenu,
QPushButton,
QAbstractItemView,
QTableView,
QSortFilterProxyModel,
QCheckBox,
QMenu,
QCursor,
QTableView,
QThread,
QWidget,
Qt,
)

from .base import BaseDialogMixin
from ..borrow_book import LibbyBorrowHold
from ..compat import (
_c,
QHeaderView_ResizeMode_Stretch,
QHeaderView_ResizeMode_ResizeToContents,
QHeaderView_ResizeMode_Stretch,
_c,
)
from ..config import PREFS, PreferenceKeys, PreferenceTexts
from ..libby import LibbyClient
from ..libby.client import LibbyFormats, LibbyMediaTypes
from ..models import get_media_title, LibbyMagazinesModel, LibbyCardsModel, LibbyModel
from ..models import LibbyCardsModel, LibbyMagazinesModel, LibbyModel, get_media_title
from ..overdrive import OverDriveClient
from ..utils import PluginIcons
from ..workers import OverDriveLibraryMediaWorker
Expand Down
4 changes: 2 additions & 2 deletions calibre-plugin/download.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@

import time
from pathlib import Path
from typing import List, Dict, Optional
from typing import Dict, List, Optional

from .config import PREFS, PreferenceKeys
from .libby import LibbyClient
from .magazine_download_utils import extract_isbn, extract_asin
from .magazine_download_utils import extract_asin, extract_isbn
from .utils import OD_IDENTIFIER, generate_od_identifier


Expand Down
8 changes: 4 additions & 4 deletions calibre-plugin/libby/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
from http.client import HTTPException
from http.cookiejar import CookieJar
from io import BytesIO
from socket import timeout as SocketTimeout, error as SocketError
from socket import error as SocketError, timeout as SocketTimeout
from ssl import SSLError
from typing import Optional, Dict, List, Union, Tuple
from typing import Dict, List, Optional, Tuple, Union
from urllib import request
from urllib.error import HTTPError, URLError
from urllib.parse import urljoin, urlencode
from urllib.request import Request, build_opener, HTTPCookieProcessor
from urllib.parse import urlencode, urljoin
from urllib.request import HTTPCookieProcessor, Request, build_opener

from .errors import ClientConnectionError, ErrorHandler

Expand Down
10 changes: 5 additions & 5 deletions calibre-plugin/magazine_download.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@
from functools import cmp_to_key
from pathlib import Path
from typing import Dict, List, Optional
from urllib.parse import urlparse, urljoin
from urllib.parse import urljoin, urlparse

from bs4 import BeautifulSoup, Doctype, Tag, element
from calibre.ptempfile import PersistentTemporaryDirectory

from .compat import _c
from .download import LibbyDownload
from .libby import LibbyClient
from .libby.client import LibbyMediaTypes, LibbyFormats
from .libby.client import LibbyFormats, LibbyMediaTypes
from .magazine_download_utils import (
build_opf_package,
extract_isbn,
get_best_cover_url,
guess_mimetype,
extract_isbn,
slugify,
is_windows,
build_opf_package,
slugify,
)
from .overdrive import OverDriveClient

Expand Down
2 changes: 1 addition & 1 deletion calibre-plugin/magazine_download_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from pathlib import Path
from typing import Dict, List, Optional

from .libby.client import LibbyFormats, LibbyClient
from .libby.client import LibbyClient, LibbyFormats

MIMETYPE_MAP = {
".xhtml": "application/xhtml+xml",
Expand Down
8 changes: 4 additions & 4 deletions calibre-plugin/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
#
from collections import namedtuple
from datetime import datetime
from typing import Dict, Optional, List
from typing import Dict, List, Optional

from calibre.utils.config import tweaks
from calibre.utils.date import format_date, dt_as_local
from calibre.utils.date import dt_as_local, format_date
from calibre.utils.icu import lower as icu_lower
from qt.core import Qt, QAbstractTableModel, QModelIndex, QFont, QColor
from qt.core import QAbstractTableModel, QColor, QFont, QModelIndex, Qt

from . import DEMO_MODE
from .compat import _c, hex_to_rgb
from .config import PREFS, PreferenceKeys
from .libby import LibbyClient
from .libby.client import LibbyMediaTypes
from .magazine_download_utils import extract_isbn, extract_asin
from .magazine_download_utils import extract_asin, extract_isbn
from .utils import PluginColors, PluginIcons

# noinspection PyUnreachableCode
Expand Down
6 changes: 3 additions & 3 deletions calibre-plugin/overdrive/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
import logging
from http.client import HTTPException
from io import BytesIO
from socket import timeout as SocketTimeout, error as SocketError
from socket import error as SocketError, timeout as SocketTimeout
from ssl import SSLError
from typing import Optional, Dict, List, Union
from typing import Dict, List, Optional, Union
from urllib.error import HTTPError, URLError
from urllib.parse import urljoin, urlencode
from urllib.parse import urlencode, urljoin
from urllib.request import Request, build_opener

from .common import pageable
Expand Down
2 changes: 1 addition & 1 deletion calibre-plugin/overdrive/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
# information
#

from functools import wraps
from collections.abc import Callable
from functools import wraps

MAX_PAGEABLE = 100

Expand Down

0 comments on commit ac3e8e1

Please sign in to comment.