Used isort to order all import statements

This commit is contained in:
Raphael Michel
2015-07-19 20:46:34 +02:00
parent c2971d28a6
commit e828d711bd
107 changed files with 353 additions and 244 deletions

View File

@@ -1,5 +1,6 @@
from django.conf import settings
from django.core.urlresolvers import resolve, get_script_prefix
from django.core.urlresolvers import get_script_prefix, resolve
from .signals import html_head, nav_event

View File

@@ -1,5 +1,6 @@
from functools import partial
from itertools import product
from django import forms
from django.core.exceptions import ValidationError
from django.db import transaction
@@ -9,9 +10,9 @@ from django.utils.encoding import force_text
from django.utils.html import format_html
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from pretix.base.forms import VersionedModelForm
from pretix.base.models import ItemVariation, Item
from pretix.base.forms import VersionedModelForm
from pretix.base.models import Item, ItemVariation
class I18nInlineFormSet(BaseInlineFormSet):

View File

@@ -1,7 +1,9 @@
from django.contrib.auth.forms import AuthenticationForm as BaseAuthenticationForm
from django import forms
from django.utils.translation import ugettext as _
from django.contrib.auth import authenticate
from django.contrib.auth.forms import \
AuthenticationForm as BaseAuthenticationForm
from django.utils.translation import ugettext as _
from pretix.base.models import User

View File

@@ -1,10 +1,9 @@
from django.conf import settings
from django import forms
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from pytz import common_timezones
from pretix.base.forms import VersionedModelForm, SettingsForm
from pretix.base.forms import SettingsForm, VersionedModelForm
from pretix.base.models import Event

View File

@@ -1,11 +1,14 @@
import copy
from django.db import models
from django.forms import BooleanField
from django.utils.translation import ugettext_lazy as _
from pretix.base.forms import VersionedModelForm, I18nModelForm
from pretix.base.forms import I18nModelForm, VersionedModelForm
from pretix.base.models import (
Item, ItemCategory, Property, ItemVariation, PropertyValue, Question, Quota,
Versionable)
Item, ItemCategory, ItemVariation, Property, PropertyValue, Question,
Quota, Versionable,
)
from pretix.control.forms import TolerantFormsetModelForm, VariationsField

View File

@@ -1,5 +1,4 @@
from pretix.base.forms import VersionedModelForm
from pretix.base.models import Order

View File

@@ -1,7 +1,7 @@
from django import forms
from django.utils.translation import ugettext_lazy as _
from pretix.base.forms import VersionedModelForm
from pretix.base.forms import VersionedModelForm
from pretix.base.models import Organizer

View File

@@ -1,13 +1,14 @@
from urllib.parse import urlparse
from django.conf import settings
from django.core.urlresolvers import resolve, get_script_prefix
from django.utils.encoding import force_str
from django.shortcuts import resolve_url
from django.contrib.auth import REDIRECT_FIELD_NAME
from django.core.urlresolvers import get_script_prefix, resolve
from django.http import HttpResponseNotFound
from django.shortcuts import resolve_url
from django.utils.encoding import force_str
from django.utils.translation import ugettext as _
from pretix.base.models import Event, Organizer, EventPermission
from pretix.base.models import Event, EventPermission, Organizer
class PermissionMiddleware:

View File

@@ -1,6 +1,5 @@
from pretix.base.signals import EventPluginSignal
"""
This signal is sent out to build configuration forms for all restriction formsets
(see plugin API documentation for details).

View File

@@ -1,8 +1,7 @@
from django import template
from django.utils import formats
from django.utils.html import conditional_escape
from django.utils.safestring import mark_safe
from django.utils import formats
register = template.Library()

View File

@@ -1,7 +1,8 @@
from django.conf.urls import url, include
from django.conf.urls import include, url
from pretix.control.views import main, event, item, auth, orders, user, organizer
from pretix.control.views import (
auth, event, item, main, orders, organizer, user,
)
urlpatterns = [
url(r'^logout$', auth.logout, name='auth.logout'),

View File

@@ -1,9 +1,13 @@
from django.conf import settings
from django.shortcuts import render, redirect
from django.contrib.auth import login as auth_login, authenticate
from django.contrib.auth import logout as auth_logout
from django.contrib.auth import (
authenticate, login as auth_login, logout as auth_logout,
)
from django.shortcuts import redirect, render
from pretix.base.models import User
from pretix.control.forms.auth import AuthenticationForm, GlobalRegistrationForm
from pretix.control.forms.auth import (
AuthenticationForm, GlobalRegistrationForm,
)
def login(request):

View File

@@ -1,21 +1,29 @@
from collections import OrderedDict
from django import forms
from django import forms
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.db.models import Sum
from django.forms import modelformset_factory
from django.shortcuts import render, redirect
from django.shortcuts import redirect, render
from django.utils.functional import cached_property
from django.utils.translation import ugettext_lazy as _
from django.views.generic import FormView
from django.views.generic.base import TemplateView
from django.views.generic.detail import SingleObjectMixin
from django.utils.translation import ugettext_lazy as _
from django.core.urlresolvers import reverse
from pretix.base.forms import VersionedModelForm
from pretix.control.forms.event import ProviderForm, TicketSettingsForm, EventSettingsForm, EventUpdateForm
from pretix.base.models import Event, OrderPosition, Order, Item, EventPermission, User
from pretix.base.signals import register_payment_providers, register_ticket_outputs
from pretix.base.models import (
Event, EventPermission, Item, Order, OrderPosition, User,
)
from pretix.base.signals import (
register_payment_providers, register_ticket_outputs,
)
from pretix.control.forms.event import (
EventSettingsForm, EventUpdateForm, ProviderForm, TicketSettingsForm,
)
from pretix.control.permissions import EventPermissionRequiredMixin
from . import UpdateView

View File

@@ -1,26 +1,33 @@
from itertools import product
from django.contrib import messages
from django.core.urlresolvers import resolve, reverse
from django.db import transaction
from django.forms.models import inlineformset_factory
from django.http import Http404, HttpResponseForbidden, HttpResponseRedirect
from django.shortcuts import redirect
from django.utils.functional import cached_property
from django.utils.translation import ugettext_lazy as _
from django.views.generic import ListView
from django.views.generic.edit import DeleteView
from django.views.generic.base import TemplateView
from django.views.generic.detail import SingleObjectMixin
from django.core.urlresolvers import resolve, reverse
from django.http import HttpResponseRedirect, HttpResponseForbidden, Http404
from django.shortcuts import redirect
from django.forms.models import inlineformset_factory
from django.utils.translation import ugettext_lazy as _
from django.views.generic.edit import DeleteView
from pretix.base.models import (
Item, ItemCategory, Property, ItemVariation, PropertyValue, Question, Quota)
from pretix.control.forms.item import ItemVariationForm, QuotaForm, QuestionForm, PropertyForm, PropertyValueForm, \
CategoryForm
from pretix.control.forms.item import ItemFormGeneral
from pretix.control.permissions import EventPermissionRequiredMixin, event_permission_required
from pretix.control.forms import VariationsField, I18nInlineFormSet
Item, ItemCategory, ItemVariation, Property, PropertyValue, Question,
Quota,
)
from pretix.control.forms import I18nInlineFormSet, VariationsField
from pretix.control.forms.item import (
CategoryForm, ItemFormGeneral, ItemVariationForm, PropertyForm,
PropertyValueForm, QuestionForm, QuotaForm,
)
from pretix.control.permissions import (
EventPermissionRequiredMixin, event_permission_required,
)
from pretix.control.signals import restriction_formset
from . import UpdateView, CreateView
from . import CreateView, UpdateView
class ItemList(ListView):

View File

@@ -1,8 +1,8 @@
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.shortcuts import render
from django.views.generic import ListView, CreateView, TemplateView
from django.utils.translation import ugettext_lazy as _
from django.views.generic import CreateView, ListView, TemplateView
from pretix.base.models import Event, EventPermission, OrganizerPermission
from pretix.control.forms.event import EventCreateForm

View File

@@ -1,14 +1,15 @@
from itertools import groupby
from django.contrib import messages
from django.db.models import Count, Q, Sum
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _
from django.db.models import Q, Count, Sum
from django.http import HttpResponse
from django.shortcuts import redirect, render
from django.utils.functional import cached_property
from django.views.generic import ListView, DetailView, TemplateView, View
from pretix.base.models import Order, Quota, OrderPosition, ItemCategory, Item
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _
from django.views.generic import DetailView, ListView, TemplateView, View
from pretix.base.models import Item, ItemCategory, Order, OrderPosition, Quota
from pretix.base.services.orders import mark_order_paid
from pretix.base.signals import register_payment_providers
from pretix.control.forms.orders import ExtendForm

View File

@@ -2,10 +2,10 @@ from django.contrib import messages
from django.core.urlresolvers import reverse
from django.http import HttpResponseForbidden
from django.utils.translation import ugettext_lazy as _
from django.views.generic import ListView, UpdateView, CreateView
from django.views.generic import CreateView, ListView, UpdateView
from pretix.base.models import Organizer, OrganizerPermission
from pretix.control.forms.organizer import OrganizerUpdateForm, OrganizerForm
from pretix.control.forms.organizer import OrganizerForm, OrganizerUpdateForm
from pretix.control.permissions import OrganizerPermissionRequiredMixin

View File

@@ -1,10 +1,10 @@
from django.contrib import messages
from django.contrib.auth import update_session_auth_hash
from django.core.urlresolvers import reverse
from django.views.generic import UpdateView
from django.utils.translation import ugettext_lazy as _
from pretix.base.forms.user import UserSettingsForm
from django.views.generic import UpdateView
from pretix.base.forms.user import UserSettingsForm
from pretix.base.models import User