diff --git a/src/pretixbase/middleware.py b/src/pretixbase/middleware.py index e61af7c011..efebc65e87 100644 --- a/src/pretixbase/middleware.py +++ b/src/pretixbase/middleware.py @@ -1,7 +1,6 @@ import pytz from django.conf import settings -from django.core.urlresolvers import resolve from django.middleware.locale import LocaleMiddleware as BaseLocaleMiddleware from django.utils.translation.trans_real import ( get_supported_language_variant, @@ -14,7 +13,6 @@ from django.utils import translation, timezone from collections import OrderedDict from django.utils.cache import patch_vary_headers -from pretixbase.models import Event _supported = None diff --git a/src/pretixbase/tests/__init__.py b/src/pretixbase/tests/__init__.py index d563d39224..1090761f72 100644 --- a/src/pretixbase/tests/__init__.py +++ b/src/pretixbase/tests/__init__.py @@ -2,7 +2,6 @@ import os import sys from django.contrib.staticfiles.testing import StaticLiveServerTestCase -from django.test import LiveServerTestCase from django.conf import settings from selenium import webdriver diff --git a/src/pretixcontrol/tests/test_items.py b/src/pretixcontrol/tests/test_items.py index 1b4d60aa18..9dc2f8452f 100644 --- a/src/pretixcontrol/tests/test_items.py +++ b/src/pretixcontrol/tests/test_items.py @@ -18,7 +18,7 @@ class ItemFormTest(BrowserTest): self.event1 = Event.objects.create( organizer=self.orga1, name='30C3', slug='30c3', date_from=datetime.datetime(2013, 12, 26, tzinfo=datetime.timezone.utc), - ) + ) OrganizerPermission.objects.create(organizer=self.orga1, user=self.user) EventPermission.objects.create(event=self.event1, user=self.user, can_change_items=True, can_change_settings=True) diff --git a/src/pretixcontrol/urls.py b/src/pretixcontrol/urls.py index fe5113b392..73f87503b1 100644 --- a/src/pretixcontrol/urls.py +++ b/src/pretixcontrol/urls.py @@ -54,5 +54,5 @@ urlpatterns += patterns( name='event.items.quotas.delete'), url(r'^quotas/add$', item.QuotaCreate.as_view(), name='event.items.quotas.add'), ) - )) + )) ) diff --git a/src/pretixcontrol/views/forms.py b/src/pretixcontrol/views/forms.py index 4d3809955e..261f8d4668 100644 --- a/src/pretixcontrol/views/forms.py +++ b/src/pretixcontrol/views/forms.py @@ -1,7 +1,7 @@ from itertools import product from django import forms from django.core.exceptions import ValidationError -from django.db import transaction, IntegrityError +from django.db import transaction from django.forms.widgets import flatatt from django.utils.encoding import force_text from django.utils.html import format_html diff --git a/src/pretixcontrol/views/item.py b/src/pretixcontrol/views/item.py index bca14f9ba8..b3ec94a4d2 100644 --- a/src/pretixcontrol/views/item.py +++ b/src/pretixcontrol/views/item.py @@ -649,7 +649,7 @@ class ItemCreate(EventPermissionRequiredMixin, CreateView): 'organizer': self.request.event.organizer.slug, 'event': self.request.event.slug, 'item': self.object.identity, - }) + '?success=true' + }) + '?success=true' def get_form_kwargs(self): """ diff --git a/src/pretixplugins/timerestriction/signals.py b/src/pretixplugins/timerestriction/signals.py index 27568ae7f9..0106c8e912 100644 --- a/src/pretixplugins/timerestriction/signals.py +++ b/src/pretixplugins/timerestriction/signals.py @@ -5,7 +5,7 @@ from django.forms.models import inlineformset_factory from pretixbase.signals import determine_availability from pretixbase.models import Item -from pretixcontrol.views.forms import VariationsField, RestrictionInlineFormset, RestrictionForm +from pretixcontrol.views.forms import RestrictionInlineFormset, RestrictionForm from pretixcontrol.signals import restriction_formset from .models import TimeRestriction diff --git a/src/pretixpresale/admin.py b/src/pretixpresale/admin.py deleted file mode 100644 index 8c38f3f3da..0000000000 --- a/src/pretixpresale/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/src/pretixpresale/middleware.py b/src/pretixpresale/middleware.py index 75b2e63bea..5277bbee66 100644 --- a/src/pretixpresale/middleware.py +++ b/src/pretixpresale/middleware.py @@ -1,11 +1,5 @@ -from django.conf import settings from django.core.urlresolvers import resolve -from django.utils.encoding import force_str -from django.utils.six.moves.urllib.parse import urlparse -from django.shortcuts import resolve_url -from django.contrib.auth import REDIRECT_FIELD_NAME from django.http import HttpResponseNotFound -from django.utils.translation import ugettext as _ from pretixbase.models import Event diff --git a/src/pretixpresale/views/cart.py b/src/pretixpresale/views/cart.py index e75c642bf8..cbf561f174 100644 --- a/src/pretixpresale/views/cart.py +++ b/src/pretixpresale/views/cart.py @@ -21,7 +21,7 @@ class CartActionMixin(CartMixin): return reverse('presale:event.index', kwargs={ 'event': self.request.event.slug, 'organizer': self.request.event.organizer.slug, - }) + }) def get_success_url(self): return self.get_next_url()