diff --git a/src/make_testdata.py b/src/make_testdata.py index b78251098b..6cc415544b 100644 --- a/src/make_testdata.py +++ b/src/make_testdata.py @@ -1,6 +1,7 @@ #!/usr/bin/env python import os import sys +from datetime import datetime os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.settings") diff --git a/src/pretix/base/models/event.py b/src/pretix/base/models/event.py index 3f9f0a9938..83f491bb1a 100644 --- a/src/pretix/base/models/event.py +++ b/src/pretix/base/models/event.py @@ -1,5 +1,4 @@ import uuid -from datetime import datetime from django.conf import settings from django.core.exceptions import ValidationError diff --git a/src/pretix/base/models/items.py b/src/pretix/base/models/items.py index e11399dad1..15d90e6d29 100644 --- a/src/pretix/base/models/items.py +++ b/src/pretix/base/models/items.py @@ -1,6 +1,5 @@ import sys import uuid -from datetime import datetime from decimal import Decimal from django.db import models diff --git a/src/pretix/base/models/vouchers.py b/src/pretix/base/models/vouchers.py index 52ee1895c7..d1d60b982f 100644 --- a/src/pretix/base/models/vouchers.py +++ b/src/pretix/base/models/vouchers.py @@ -1,5 +1,4 @@ import random -from decimal import Decimal from django.core.exceptions import ValidationError from django.db import models diff --git a/src/pretix/base/payment.py b/src/pretix/base/payment.py index 0a72c0b1fa..83ec8c7719 100644 --- a/src/pretix/base/payment.py +++ b/src/pretix/base/payment.py @@ -3,7 +3,7 @@ from decimal import Decimal from django import forms from django.contrib import messages -from django.db.models import Q, Sum +from django.db.models import Sum from django.dispatch import receiver from django.forms import Form from django.http import HttpRequest diff --git a/src/pretix/base/services/cart.py b/src/pretix/base/services/cart.py index 5074d9c237..b8edaafa2b 100644 --- a/src/pretix/base/services/cart.py +++ b/src/pretix/base/services/cart.py @@ -5,7 +5,7 @@ from django.conf import settings from django.db.models import Q from django.utils.timezone import now from django.utils.translation import ugettext as _ -from typing import List, Optional, Tuple +from typing import List, Optional from pretix.base.i18n import LazyLocaleException from pretix.base.models import ( diff --git a/src/pretix/base/services/invoices.py b/src/pretix/base/services/invoices.py index 433d3d019f..8083196c95 100644 --- a/src/pretix/base/services/invoices.py +++ b/src/pretix/base/services/invoices.py @@ -9,7 +9,6 @@ from django.conf import settings from django.contrib.staticfiles import finders from django.core.files.base import ContentFile from django.db import transaction -from django.utils import translation from django.utils.formats import date_format from django.utils.translation import pgettext, ugettext as _ from reportlab.lib import pagesizes diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py index 66d4717a6c..4d64234445 100644 --- a/src/pretix/base/services/orders.py +++ b/src/pretix/base/services/orders.py @@ -16,7 +16,7 @@ from pretix.base.models import ( from pretix.base.models.orders import InvoiceAddress from pretix.base.payment import BasePaymentProvider from pretix.base.services.invoices import ( - generate_cancellation, generate_invoice, invoice_pdf, + generate_cancellation, generate_invoice, ) from pretix.base.services.mail import mail from pretix.base.signals import ( diff --git a/src/pretix/control/views/main.py b/src/pretix/control/views/main.py index 590d3c2d71..3a30d25d5f 100644 --- a/src/pretix/control/views/main.py +++ b/src/pretix/control/views/main.py @@ -7,9 +7,7 @@ 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, EventCreateSettingsForm, EventSettingsForm, -) +from pretix.control.forms.event import EventCreateForm, EventCreateSettingsForm from pretix.control.permissions import OrganizerPermissionRequiredMixin diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index d68c2efb13..6c392b31bf 100644 --- a/src/pretix/control/views/orders.py +++ b/src/pretix/control/views/orders.py @@ -1,15 +1,14 @@ from datetime import timedelta from itertools import groupby -from django import forms from django.contrib import messages from django.core.urlresolvers import reverse from django.db.models import Q from django.http import Http404, HttpResponseNotAllowed from django.shortcuts import redirect, render -from django.utils.functional import cached_property, lazy +from django.utils.functional import cached_property from django.utils.timezone import now -from django.utils.translation import gettext, ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _ from django.views.generic import DetailView, ListView, TemplateView, View from pretix.base.i18n import language diff --git a/src/pretix/control/views/vouchers.py b/src/pretix/control/views/vouchers.py index 91dbeaa35a..73298f1bc6 100644 --- a/src/pretix/control/views/vouchers.py +++ b/src/pretix/control/views/vouchers.py @@ -1,5 +1,3 @@ -import copy - from django.contrib import messages from django.core.urlresolvers import resolve, reverse from django.db import transaction diff --git a/src/pretix/presale/urls.py b/src/pretix/presale/urls.py index 794ed0c40d..8f7615878c 100644 --- a/src/pretix/presale/urls.py +++ b/src/pretix/presale/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from django.conf.urls import url import pretix.presale.views.cart import pretix.presale.views.checkout diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py index 0daf80cd15..5f1b5371e2 100644 --- a/src/pretix/presale/views/order.py +++ b/src/pretix/presale/views/order.py @@ -1,7 +1,6 @@ from datetime import timedelta from django.contrib import messages -from django.core.exceptions import PermissionDenied from django.core.urlresolvers import reverse from django.http import Http404 from django.shortcuts import redirect diff --git a/src/pretix/settings.py b/src/pretix/settings.py index 3d87400e1f..f69edd8ac5 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -194,7 +194,7 @@ MIDDLEWARE_CLASSES = [ ] try: - import debug_toolbar + import debug_toolbar # noqa if DEBUG: INSTALLED_APPS.append('debug_toolbar.apps.DebugToolbarConfig') MIDDLEWARE_CLASSES.append('debug_toolbar.middleware.DebugToolbarMiddleware') diff --git a/src/setup.cfg b/src/setup.cfg index f410fdc5e8..4ada48c62f 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -1,7 +1,7 @@ [flake8] ignore = N802,W503,E402 max-line-length = 160 -exclude = migrations,.ropeproject,static,mt940.py,_static,build,make_testdata.py,tests/settings.py +exclude = migrations,.ropeproject,static,mt940.py,_static,build,make_testdata.py,tests/settings.py,pretix/base/models/__init__.py max-complexity = 11 [isort] diff --git a/src/tests/base/test_payment.py b/src/tests/base/test_payment.py index 106a695ebe..cc40bb4a54 100644 --- a/src/tests/base/test_payment.py +++ b/src/tests/base/test_payment.py @@ -1,12 +1,10 @@ -import time from decimal import Decimal import pytest from django.utils.timezone import now from tests.testdummy.payment import DummyPaymentProvider -from pretix.base.models import Event, EventLock, Organizer -from pretix.base.services import locking +from pretix.base.models import Event, Organizer @pytest.fixture diff --git a/src/tests/base/test_settings.py b/src/tests/base/test_settings.py index ecaec63a21..ef50b197ed 100644 --- a/src/tests/base/test_settings.py +++ b/src/tests/base/test_settings.py @@ -8,7 +8,7 @@ from django.utils.timezone import now from pretix.base import settings from pretix.base.i18n import LazyI18nString -from pretix.base.models import Event, Organizer, OrganizerSetting, User +from pretix.base.models import Event, Organizer, User from pretix.base.settings import SettingsSandbox diff --git a/src/tests/base/test_templatetag.py b/src/tests/base/test_templatetag.py index f0c92e22a0..1beea4809a 100644 --- a/src/tests/base/test_templatetag.py +++ b/src/tests/base/test_templatetag.py @@ -1,12 +1,5 @@ -import pytest -from django.conf import settings -from django.core.urlresolvers import NoReverseMatch -from django.template import Context, Template, TemplateSyntaxError +from django.template import Context, Template from django.test import RequestFactory -from django.utils.timezone import now - -from pretix.base.models import Event, Organizer -from pretix.multidomain.models import KnownDomain TEMPLATE_REPLACE_PAGE = Template("{% load urlreplace %}{% url_replace request 'page' 3 %}") diff --git a/src/tests/multidomain/test_middlewares.py b/src/tests/multidomain/test_middlewares.py index 859b9b9c75..9c3c4b9d71 100644 --- a/src/tests/multidomain/test_middlewares.py +++ b/src/tests/multidomain/test_middlewares.py @@ -1,6 +1,5 @@ import pytest from django.conf import settings -from django.http import Http404 from django.test.utils import override_settings from django.utils.timezone import now