From 2be026dd44863fecbe8c96a68459df18a26b14d4 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Fri, 14 Feb 2020 15:17:40 +0100 Subject: [PATCH] global: fix import order --- passbook/audit/models.py | 6 +++--- passbook/core/models.py | 2 +- passbook/lib/templatetags/utils.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/passbook/audit/models.py b/passbook/audit/models.py index 51bc8f893..8823dc8e3 100644 --- a/passbook/audit/models.py +++ b/passbook/audit/models.py @@ -1,14 +1,14 @@ """passbook audit models""" from enum import Enum -from uuid import UUID from inspect import getmodule, stack -from typing import Optional, Dict, Any +from typing import Any, Dict, Optional +from uuid import UUID from django.conf import settings from django.contrib.auth.models import AnonymousUser +from django.contrib.contenttypes.models import ContentType from django.contrib.postgres.fields import JSONField from django.core.exceptions import ValidationError -from django.contrib.contenttypes.models import ContentType from django.db import models from django.http import HttpRequest from django.utils.translation import gettext as _ diff --git a/passbook/core/models.py b/passbook/core/models.py index 645fe0c29..17169cdb9 100644 --- a/passbook/core/models.py +++ b/passbook/core/models.py @@ -11,10 +11,10 @@ from django.db import models from django.urls import reverse_lazy from django.utils.timezone import now from django.utils.translation import gettext as _ +from django_prometheus.models import ExportModelOperationsMixin from guardian.mixins import GuardianUserMixin from model_utils.managers import InheritanceManager from structlog import get_logger -from django_prometheus.models import ExportModelOperationsMixin from passbook.core.signals import password_changed from passbook.lib.models import CreatedUpdatedModel, UUIDModel diff --git a/passbook/lib/templatetags/utils.py b/passbook/lib/templatetags/utils.py index 43ce5dd95..6d7d7ad3a 100644 --- a/passbook/lib/templatetags/utils.py +++ b/passbook/lib/templatetags/utils.py @@ -3,9 +3,9 @@ from hashlib import md5 from urllib.parse import urlencode from django import template -from django.template import Context from django.apps import apps from django.db.models import Model +from django.template import Context from django.utils.html import escape from django.utils.translation import ugettext as _