From b46cb10aeb9b5ddd36ff01648583ed7318c60b1f Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Fri, 8 May 2020 23:21:08 -0400 Subject: [PATCH] Run isort --- docs/changelog.py | 1 + docs/conf.py | 3 +-- setup.cfg | 3 +++ sigal/image.py | 3 ++- sigal/plugins/adjust.py | 1 - sigal/plugins/encrypt/encrypt.py | 12 ++++++------ sigal/plugins/encrypt/endec.py | 9 ++++----- sigal/plugins/feeds.py | 2 +- sigal/plugins/upload_s3.py | 4 ++-- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/docs/changelog.py b/docs/changelog.py index 9e9b89c..ff78ead 100644 --- a/docs/changelog.py +++ b/docs/changelog.py @@ -37,6 +37,7 @@ import os import re from git import Repo + from github import Github this_repo = Repo(os.path.join(os.path.dirname(__file__), "..")) diff --git a/docs/conf.py b/docs/conf.py index 5943e7d..965c465 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,9 +1,8 @@ import os import sys -from pkg_resources import get_distribution - import alabaster +from pkg_resources import get_distribution # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the diff --git a/setup.cfg b/setup.cfg index 3b5b507..aea490c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -58,3 +58,6 @@ ignore = [flake8] ignore = E731, W504 + +[isort] +known_third_party=blinker,click,jinja2,markdown,natsort,PIL,Pillow diff --git a/sigal/image.py b/sigal/image.py index 32e7bce..0908b74 100644 --- a/sigal/image.py +++ b/sigal/image.py @@ -37,10 +37,11 @@ import warnings from copy import deepcopy from datetime import datetime -import pilkit.processors from PIL import Image as PILImage from PIL import ImageFile, ImageOps, IptcImagePlugin from PIL.ExifTags import GPSTAGS, TAGS + +import pilkit.processors from pilkit.processors import Transpose from pilkit.utils import save_image diff --git a/sigal/plugins/adjust.py b/sigal/plugins/adjust.py index b41d508..4e6daa6 100644 --- a/sigal/plugins/adjust.py +++ b/sigal/plugins/adjust.py @@ -16,7 +16,6 @@ Settings:: import logging from pilkit.processors import Adjust - from sigal import signals logger = logging.getLogger(__name__) diff --git a/sigal/plugins/encrypt/encrypt.py b/sigal/plugins/encrypt/encrypt.py index 60866cc..f9fabba 100644 --- a/sigal/plugins/encrypt/encrypt.py +++ b/sigal/plugins/encrypt/encrypt.py @@ -56,19 +56,20 @@ Compatibility with other plugins: meaningless since viewers cannot easily decrypt them outside a browser. ''' +import logging import os +import pickle import random import string -import logging -import pickle from io import BytesIO from itertools import chain -from sigal import signals -from sigal.utils import url_from_path, copy -from sigal.settings import get_thumb from click import progressbar +from sigal import signals +from sigal.settings import get_thumb +from sigal.utils import copy, url_from_path + from .endec import encrypt, kdf_gen_key logger = logging.getLogger(__name__) @@ -268,4 +269,3 @@ def register(settings): signals.gallery_build.connect(encrypt_gallery) signals.album_initialized.connect(load_property) signals.before_render.connect(inject_scripts) - diff --git a/sigal/plugins/encrypt/endec.py b/sigal/plugins/encrypt/endec.py index 8bc4f64..565e32f 100644 --- a/sigal/plugins/encrypt/endec.py +++ b/sigal/plugins/encrypt/endec.py @@ -23,15 +23,15 @@ import io import os -from pathlib import Path from base64 import b64decode +from pathlib import Path from typing import BinaryIO -from cryptography.hazmat.primitives.ciphers.aead import AESGCM -from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC +from cryptography.exceptions import InvalidTag from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import hashes -from cryptography.exceptions import InvalidTag +from cryptography.hazmat.primitives.ciphers.aead import AESGCM +from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC backend = default_backend() MAGIC_STRING = "_e_n_c_r_y_p_t_e_d_".encode("utf-8") @@ -114,4 +114,3 @@ if __name__ == "__main__": args = parser.parse_args() args.execute(args) - diff --git a/sigal/plugins/feeds.py b/sigal/plugins/feeds.py index 6de972d..b7c49fd 100644 --- a/sigal/plugins/feeds.py +++ b/sigal/plugins/feeds.py @@ -20,9 +20,9 @@ import logging import os from datetime import datetime -from feedgenerator import Atom1Feed, Rss201rev2Feed from jinja2 import Markup +from feedgenerator import Atom1Feed, Rss201rev2Feed from sigal import signals logger = logging.getLogger(__name__) diff --git a/sigal/plugins/upload_s3.py b/sigal/plugins/upload_s3.py index f038077..49e27f5 100644 --- a/sigal/plugins/upload_s3.py +++ b/sigal/plugins/upload_s3.py @@ -25,10 +25,10 @@ Settings (all settings are wrapped in ``upload_s3_options`` dict): import logging import os -import boto -from boto.s3.key import Key from click import progressbar +import boto +from boto.s3.key import Key from sigal import signals logger = logging.getLogger(__name__)