From 1c89fec808b333ad615ed5c4b134082c4b970c7d Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 28 Sep 2015 23:11:46 +0200 Subject: [PATCH] Fixed import sorting --- src/pretix/base/migrations/0018_eventlock_token.py | 3 ++- src/pretix/base/services/locking.py | 2 +- src/tests/base/test_locking.py | 8 +++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/pretix/base/migrations/0018_eventlock_token.py b/src/pretix/base/migrations/0018_eventlock_token.py index b853a0e13..d25722191 100644 --- a/src/pretix/base/migrations/0018_eventlock_token.py +++ b/src/pretix/base/migrations/0018_eventlock_token.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations import uuid +from django.db import migrations, models + class Migration(migrations.Migration): diff --git a/src/pretix/base/services/locking.py b/src/pretix/base/services/locking.py index 9eaa812fe..b87acc347 100644 --- a/src/pretix/base/services/locking.py +++ b/src/pretix/base/services/locking.py @@ -1,7 +1,7 @@ import logging import time -from datetime import timedelta import uuid +from datetime import timedelta from django.conf import settings from django.db import transaction diff --git a/src/tests/base/test_locking.py b/src/tests/base/test_locking.py index 8b262ec3e..9080e51c4 100644 --- a/src/tests/base/test_locking.py +++ b/src/tests/base/test_locking.py @@ -1,8 +1,10 @@ import time -from django.utils.timezone import now -from pretix.base.models import Event, Organizer, EventLock -from pretix.base.services import locking + import pytest +from django.utils.timezone import now + +from pretix.base.models import Event, EventLock, Organizer +from pretix.base.services import locking @pytest.fixture