fix / cleanup imports

abilian/app.py

@@ -20,7 +20,6 @@
 import sqlalchemy.exc
 import yaml
 from babel.dates import LOCALTZ
-from deprecated import deprecated
 from flask import Blueprint, Flask, _request_ctx_stack, abort, \
     appcontext_pushed, current_app, g, render_template, request, \
     request_started
@@ -1043,7 +1042,7 @@ def create_root_user(self):
 
     def validate_response(self, response):
         # work around circular import
-        from abilian.testing.util import assert_valid
+        from abilian.testing.validation import assert_valid
 
         assert_valid(response)
         return response

abilian/core/extensions/__init__.py

@@ -30,7 +30,7 @@ def _message_send(self, connection):
 
     If TESTING is True the message will not actually be sent.
 
-    :param message: a Message instance.
+    :param self: a Message instance.
     """
     sender = current_app.config["MAIL_SENDER"]
     if not self.extra_headers:

abilian/services/auth/views.py

@@ -10,7 +10,7 @@
 import random
 import string
 from datetime import datetime
-from typing import Any, List, Text
+from typing import Any
 
 from flask import current_app, flash, redirect, render_template, request, \
     url_for

abilian/services/indexing/adapter.py

@@ -8,7 +8,6 @@
 from operator import attrgetter
 
 import sqlalchemy as sa
-from flask import current_app
 from six import add_metaclass, string_types
 from whoosh.fields import TEXT
 

abilian/services/repository/service.py

@@ -11,7 +11,7 @@
 
 import sqlalchemy as sa
 import sqlalchemy.event
-from flask import _app_ctx_stack, current_app
+from flask import _app_ctx_stack
 from flask.globals import _lookup_app_object
 from six import text_type
 from sqlalchemy.orm.session import Session

abilian/services/security/service.py

@@ -7,7 +7,7 @@
 from itertools import chain
 
 import sqlalchemy as sa
-from flask import current_app, g
+from flask import g
 from flask_login import current_user
 from six import string_types, text_type
 from sqlalchemy import sql

abilian/services/settings/service.py

@@ -3,7 +3,6 @@
 from __future__ import absolute_import, division, print_function, \
     unicode_literals
 
-from flask import current_app
 from six import iteritems
 
 from abilian.core.extensions import db

abilian/services/tagging/models.py

@@ -18,8 +18,8 @@
 
 from sqlalchemy import Column, DateTime, ForeignKey, Integer, Unicode
 
-from abilian.core.entities import IdMixin
 from abilian.core.extensions import db
+from abilian.core.models import IdMixin
 
 
 class Tag(db.Model, IdMixin):

abilian/services/vocabularies/admin.py

@@ -3,7 +3,7 @@
 from __future__ import absolute_import, division, print_function, \
     unicode_literals
 
-from flask import current_app, g, redirect, render_template, request
+from flask import g, redirect, render_template, request
 
 from abilian.core.extensions import db
 from abilian.i18n import _, _l

abilian/web/admin/panels/dashboard.py

@@ -8,7 +8,7 @@
 import pandas as pd
 import six
 import sqlalchemy as sa
-from flask import current_app, render_template
+from flask import render_template
 from numpy import sum as numpysum
 
 from abilian.core.extensions import db