diff --git a/_generate.py b/_generate.py index c22db50d..ced96b09 100644 --- a/_generate.py +++ b/_generate.py @@ -13,28 +13,28 @@ import sys import time from collections import namedtuple -from datetime import datetime, timezone, timedelta +from datetime import datetime, timedelta, timezone from functools import cmp_to_key from math import ceil from pathlib import Path from timeit import default_timer as timer -from typing import List, Dict, Optional -from urllib.parse import urljoin, urlencode +from typing import Dict, List, Optional +from urllib.parse import urlencode, urljoin from xml.dom import minidom import humanize # type: ignore import requests # type: ignore from bleach import linkify -from _opds import init_feed, simple_tag, extension_contenttype_map -from _recipe_utils import sort_category, Recipe, is_windows +from _opds import extension_contenttype_map, init_feed, simple_tag +from _recipe_utils import Recipe, is_windows, sort_category from _recipes import ( - recipes as default_recipes, categories_sort as default_categories_sort, + recipes as default_recipes, ) from _recipes_custom import ( - recipes as custom_recipes, categories_sort as custom_categories_sort, + recipes as custom_recipes, ) from _utils import generate_cover, slugify diff --git a/_opds.py b/_opds.py index ba52a2d5..466b3894 100644 --- a/_opds.py +++ b/_opds.py @@ -5,7 +5,7 @@ # Helpers to generate opds xml - extremely minimal from datetime import datetime -from typing import Optional, Dict +from typing import Dict, Optional from xml.dom import minidom extension_contenttype_map = { diff --git a/_recipe_utils.py b/_recipe_utils.py index fc3fe1ea..3f9ae8cc 100644 --- a/_recipe_utils.py +++ b/_recipe_utils.py @@ -5,8 +5,8 @@ import sys from calendar import monthrange from dataclasses import dataclass, field -from datetime import datetime, timezone, timedelta -from typing import List, Union, Callable, Dict +from datetime import datetime, timedelta, timezone +from typing import Callable, Dict, List, Union # adapted from calibre.constants.iswindows _plat = sys.platform.lower() diff --git a/_recipes.py b/_recipes.py index 8f11204f..657e8ae7 100644 --- a/_recipes.py +++ b/_recipes.py @@ -13,13 +13,13 @@ from typing import List from _recipe_utils import ( - Recipe, CoverOptions, - onlyon_days, - onlyat_hours, - onlyon_weekdays, + Recipe, first_n_days_of_month, last_n_days_of_month, + onlyat_hours, + onlyon_days, + onlyon_weekdays, ) # Only mobi work as periodicals on the Kindle diff --git a/_utils.py b/_utils.py index c89533a4..525b94d7 100644 --- a/_utils.py +++ b/_utils.py @@ -9,7 +9,7 @@ import textwrap import unicodedata from pathlib import Path -from typing import Tuple, Optional +from typing import Optional, Tuple import requests from PIL import Image, ImageDraw, ImageFont # type: ignore