diff --git a/mayan/apps/common/forms.py b/mayan/apps/common/forms.py index 57e71c6d16..2b09759742 100644 --- a/mayan/apps/common/forms.py +++ b/mayan/apps/common/forms.py @@ -4,7 +4,6 @@ import os from django import forms from django.conf import settings -from django.contrib.auth import get_user_model from django.db import models from django.utils.module_loading import import_string from django.utils.translation import ugettext_lazy as _ diff --git a/mayan/apps/common/links.py b/mayan/apps/common/links.py index cfadec28e6..0f58551f10 100644 --- a/mayan/apps/common/links.py +++ b/mayan/apps/common/links.py @@ -4,7 +4,7 @@ from django.apps import apps from django.utils.translation import ugettext_lazy as _ from mayan.apps.navigation import Link -from mayan.apps.navigation.classes import Separator, Text +from mayan.apps.navigation.classes import Separator from .icons import ( icon_about, icon_check_version, icon_current_user_locale_profile_details, diff --git a/mayan/apps/common/templatetags/common_tags.py b/mayan/apps/common/templatetags/common_tags.py index b251558cc2..fee8bd31c6 100644 --- a/mayan/apps/common/templatetags/common_tags.py +++ b/mayan/apps/common/templatetags/common_tags.py @@ -1,7 +1,5 @@ from __future__ import unicode_literals -from json import dumps - from django.template import Context, Library from django.template.defaultfilters import truncatechars from django.template.loader import get_template diff --git a/mayan/apps/common/utils.py b/mayan/apps/common/utils.py index 4759bb9732..b7d3cc81aa 100644 --- a/mayan/apps/common/utils.py +++ b/mayan/apps/common/utils.py @@ -14,7 +14,6 @@ from django.utils.http import urlencode as django_urlencode from django.utils.http import urlquote as django_urlquote from django.utils.six.moves import reduce as reduce_function from django.utils.six.moves import xmlrpc_client -from django.utils.translation import ugettext_lazy as _ import mayan diff --git a/mayan/apps/documents/widgets.py b/mayan/apps/documents/widgets.py index 11cea2bead..10fbc7e173 100644 --- a/mayan/apps/documents/widgets.py +++ b/mayan/apps/documents/widgets.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals from django import forms from django.template.loader import render_to_string -from django.utils.safestring import mark_safe from .settings import ( setting_display_height, setting_display_width, setting_preview_height, diff --git a/mayan/apps/events/apps.py b/mayan/apps/events/apps.py index f729268503..b063e6b35e 100644 --- a/mayan/apps/events/apps.py +++ b/mayan/apps/events/apps.py @@ -98,5 +98,5 @@ class EventsApp(MayanAppConfig): menu_user.bind_links( links=( link_event_types_subscriptions_list, link_current_user_events - ), position=50 + ), position=50 ) diff --git a/mayan/apps/events/widgets.py b/mayan/apps/events/widgets.py index 4d8109480b..2acacdfd37 100644 --- a/mayan/apps/events/widgets.py +++ b/mayan/apps/events/widgets.py @@ -3,12 +3,9 @@ from __future__ import unicode_literals from django.apps import apps from django.template import Context, Template from django.urls import reverse -from django.utils.encoding import force_text from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ -from mayan.apps.common.utils import resolve_attribute - from .classes import EventType diff --git a/mayan/apps/navigation/classes.py b/mayan/apps/navigation/classes.py index 8542049de9..874e630b27 100644 --- a/mayan/apps/navigation/classes.py +++ b/mayan/apps/navigation/classes.py @@ -13,7 +13,7 @@ from django.db.models.constants import LOOKUP_SEP from django.shortcuts import resolve_url from django.template import VariableDoesNotExist, Variable from django.template.defaulttags import URLNode -from django.urls import Resolver404, resolve +from django.urls import resolve from django.utils.encoding import force_str, force_text from django.utils.translation import ugettext_lazy as _ diff --git a/mayan/apps/user_management/methods.py b/mayan/apps/user_management/methods.py index 1bfa84c1b7..06baed3e71 100644 --- a/mayan/apps/user_management/methods.py +++ b/mayan/apps/user_management/methods.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -from django.apps import apps from django.shortcuts import reverse diff --git a/mayan/apps/user_management/utils.py b/mayan/apps/user_management/utils.py index d33f9a1d4c..5d5f689609 100644 --- a/mayan/apps/user_management/utils.py +++ b/mayan/apps/user_management/utils.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals from django.apps import apps from django.contrib.auth import get_user_model +from django.utils.translation import ugettext_lazy as _ def get_groups(): diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py index 51d38102cd..b98e04635a 100644 --- a/mayan/apps/user_management/views.py +++ b/mayan/apps/user_management/views.py @@ -20,7 +20,7 @@ from mayan.apps.common.views import ( ) from .events import event_user_created, event_user_edited -from .forms import UserForm, UserForm_view +from .forms import UserForm from .icons import icon_group_setup, icon_user_setup from .links import link_group_create, link_user_create from .permissions import (