Used isort to order all import statements

src/pretix/base/cache.py

@@ -1,5 +1,5 @@
-import time
 import hashlib
+import time
 
 from django.core.cache import caches
 

src/pretix/base/forms/__init__.py

@@ -1,11 +1,13 @@
 import copy
-from django.db import models
-from django.forms.models import ModelFormMetaclass, BaseModelForm
+
 from django import forms
+from django.db import models
+from django.forms.models import BaseModelForm, ModelFormMetaclass
 from django.utils import six
-from pretix.base.i18n import I18nFormField
-from versions.models import Versionable
 from django.utils.translation import ugettext_lazy as _
+from versions.models import Versionable
+
+from pretix.base.i18n import I18nFormField
 
 
 class BaseI18nModelForm(BaseModelForm):

src/pretix/base/forms/user.py

@@ -2,7 +2,6 @@ from django import forms
 from django.contrib.auth.hashers import check_password
 from django.db.models import Q
 from django.utils.translation import ugettext_lazy as _
-# from pytz import common_timezones
 
 from pretix.base.models import User
 

src/pretix/base/i18n.py

@@ -1,8 +1,9 @@
 import copy
 import json
-from django.conf import settings
-from django.db.models import TextField, SubfieldBase
+
 from django import forms
+from django.conf import settings
+from django.db.models import SubfieldBase, TextField
 from django.utils import translation
 from django.utils.safestring import mark_safe
 

src/pretix/base/middleware.py

@@ -1,19 +1,16 @@
-from django.core.urlresolvers import get_script_prefix
-import pytz
-
-from django.conf import settings
-from django.middleware.locale import LocaleMiddleware as BaseLocaleMiddleware
-from django.utils.translation.trans_real import (
-    get_supported_language_variant,
-    parse_accept_lang_header,
-    language_code_re,
-    check_for_language
-)
-from django.utils.translation import LANGUAGE_SESSION_KEY
-from django.utils import translation, timezone
 from collections import OrderedDict
-from django.utils.cache import patch_vary_headers
 
+import pytz
+from django.conf import settings
+from django.core.urlresolvers import get_script_prefix
+from django.middleware.locale import LocaleMiddleware as BaseLocaleMiddleware
+from django.utils import timezone, translation
+from django.utils.cache import patch_vary_headers
+from django.utils.translation import LANGUAGE_SESSION_KEY
+from django.utils.translation.trans_real import (
+    check_for_language, get_supported_language_variant, language_code_re,
+    parse_accept_lang_header,
+)
 
 _supported = None
 

src/pretix/base/migrations/0001_initial.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from django.contrib.auth.hashers import make_password
 
-from django.db import models, migrations
-import pretix.base.models
-import django.db.models.deletion
-import pretix.base.i18n
-import versions.models
 import django.core.validators
+import django.db.models.deletion
+import versions.models
 from django.conf import settings
+from django.contrib.auth.hashers import make_password
+from django.db import migrations, models
+
+import pretix.base.i18n
+import pretix.base.models
 
 
 def initial_user(apps, schema_editor):

src/pretix/base/migrations/0002_auto_20150524_1148.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

src/pretix/base/migrations/0003_auto_20150602_2232.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
 import django.core.validators
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

src/pretix/base/migrations/0004_eventpermission_can_change_permissions.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

src/pretix/base/models.py

@@ -1,24 +1,30 @@
-from datetime import datetime, timedelta
-from itertools import product
 import copy
-import uuid
 import random
 import time
+import uuid
+from datetime import datetime, timedelta
+from itertools import product
 
-from django.db import models
+import six
 from django.conf import settings
-from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin
+from django.contrib.auth.models import (
+    AbstractBaseUser, BaseUserManager, PermissionsMixin,
+)
+from django.core.validators import RegexValidator
+from django.db import models
 from django.db.models import Q, Count
+from django.template.defaultfilters import date as _date
 from django.utils.functional import cached_property
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
-from django.template.defaultfilters import date as _date
-from django.core.validators import RegexValidator
+from versions.models import (
+    Versionable as BaseVersionable, VersionedForeignKey,
+    VersionedManyToManyField, get_utc_now,
+)
+
 from pretix.base.i18n import I18nCharField, I18nTextField
 from pretix.base.settings import SettingsProxy
-import six
-from versions.models import Versionable as BaseVersionable
-from versions.models import VersionedForeignKey, VersionedManyToManyField, get_utc_now
+
 from .types import VariationDict
 
 

src/pretix/base/payment.py

@@ -1,17 +1,17 @@
 from collections import OrderedDict
 from decimal import Decimal
+
 from django import forms
 from django.contrib import messages
-from django.db.models import Sum, Q
+from django.db.models import Q, Sum
 from django.dispatch import receiver
-
 from django.forms import Form
 from django.http import HttpRequest
 from django.template.loader import get_template
 from django.utils.translation import ugettext_lazy as _
-from pretix.base.models import Order, CartPosition
-from pretix.base.services.orders import mark_order_paid
 
+from pretix.base.models import CartPosition, Order
+from pretix.base.services.orders import mark_order_paid
 from pretix.base.settings import SettingsSandbox
 from pretix.base.signals import register_payment_providers
 

src/pretix/base/services/locking.py

@@ -1,9 +1,10 @@
-from datetime import timedelta
 import logging
 import time
+from datetime import timedelta
+
+from django.conf import settings
 from django.db.models import Q
 from django.utils.timezone import now
-from pretix import settings
 
 from pretix.base.models import Quota
 

src/pretix/base/services/mail.py

@@ -1,4 +1,5 @@
 import logging
+
 from django.conf import settings
 from django.core.mail import EmailMessage
 from django.core.urlresolvers import reverse
@@ -7,7 +8,7 @@ from django.utils import translation
 from django.utils.translation import ugettext as _
 
 from pretix.base.i18n import LazyI18nString
-from pretix.base.models import User, Event
+from pretix.base.models import Event, User
 from pretix.helpers.urls import build_absolute_uri
 
 logger = logging.getLogger('pretix.base.mail')

src/pretix/base/services/orders.py

@@ -1,8 +1,10 @@
-from datetime import timedelta, datetime
+from datetime import datetime, timedelta
+
 from django.db import transaction
 from django.utils.timezone import now
-from pretix.base.models import Order, Quota, OrderPosition
 from django.utils.translation import ugettext_lazy as _
+
+from pretix.base.models import Order, OrderPosition, Quota
 from pretix.base.services.mail import mail
 from pretix.helpers.urls import build_absolute_uri
 

src/pretix/base/settings.py

@@ -1,13 +1,12 @@
-from datetime import datetime, date, time
-import json
 import decimal
+import json
+from datetime import date, datetime, time
 
 import dateutil.parser
-from django.db.models import Model
 from django.conf import settings
+from django.db.models import Model
 from versions.models import Versionable
 
-
 DEFAULTS = {
     'user_mail_required': {
         'default': 'False',

src/pretix/base/ticketoutput.py

@@ -1,10 +1,10 @@
 from collections import OrderedDict
-from django import forms
 
+from django import forms
 from django.http import HttpRequest, HttpResponse
 from django.utils.translation import ugettext_lazy as _
-from pretix.base.models import Order
 
+from pretix.base.models import Order
 from pretix.base.settings import SettingsSandbox