From 3fe302f75021e0745ab3184317d2c345a6562146 Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Sun, 4 Aug 2019 19:04:26 +0200 Subject: [PATCH] Bugfixes --- app.py | 6 +++--- blueprints/admin.py | 2 +- core/shared.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app.py b/app.py index 9ae4fe8..14604b1 100644 --- a/app.py +++ b/app.py @@ -18,7 +18,6 @@ from flask import url_for from itsdangerous import BadSignature from little_boxes import activitypub as ap from little_boxes.activitypub import ActivityType -from little_boxes.activitypub import activity_from_doc from little_boxes.activitypub import clean_activity from little_boxes.activitypub import get_backend from little_boxes.errors import ActivityGoneError @@ -40,6 +39,7 @@ from config import MEDIA_CACHE from config import VERSION from core import activitypub from core import feed +from core.activitypub import activity_from_doc from core.activitypub import activity_url from core.activitypub import post_to_inbox from core.activitypub import post_to_outbox @@ -51,11 +51,11 @@ from core.meta import _meta from core.meta import by_remote_id from core.meta import in_outbox from core.meta import is_public -from core.shared import jsonify -from core.shared import is_api_request from core.shared import _build_thread from core.shared import _get_ip from core.shared import csrf +from core.shared import is_api_request +from core.shared import jsonify from core.shared import login_required from core.shared import noindex from core.shared import paginated_query diff --git a/blueprints/admin.py b/blueprints/admin.py index 71413ea..457ffb3 100644 --- a/blueprints/admin.py +++ b/blueprints/admin.py @@ -1,5 +1,4 @@ import json -from little_boxes.webfinger import get_actor_url from datetime import datetime from datetime import timedelta from datetime import timezone @@ -16,6 +15,7 @@ from flask import request from flask import session from flask import url_for from little_boxes import activitypub as ap +from little_boxes.webfinger import get_actor_url from passlib.hash import bcrypt from u2flib_server import u2f diff --git a/core/shared.py b/core/shared.py index 18f9e61..b649a4e 100644 --- a/core/shared.py +++ b/core/shared.py @@ -5,10 +5,10 @@ from typing import Any import flask from bson.objectid import ObjectId +from flask import Response from flask import current_app as app from flask import redirect from flask import request -from flask import Response from flask import session from flask import url_for from flask_wtf.csrf import CSRFProtect