From 503f6dd06f0f2bfa4820b8f48c96e9d99c9d5ce1 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 13 Oct 2016 22:56:31 +0200 Subject: [PATCH] Use consistent flake8 settings everywhere and fix flake8 issues --- .travis.sh | 2 +- src/pretix/base/exporters/invoices.py | 1 - src/pretix/base/exporters/json.py | 16 ++++++++-------- src/pretix/base/exporters/orderlist.py | 1 - src/pretix/base/models/invoices.py | 1 - src/pretix/base/models/vouchers.py | 2 +- src/pretix/base/services/cart.py | 2 +- src/pretix/base/services/export.py | 1 - src/pretix/base/services/invoices.py | 1 - src/pretix/base/services/orders.py | 2 +- src/pretix/base/views/cachedfiles.py | 2 +- src/pretix/control/views/event.py | 2 +- src/pretix/control/views/orders.py | 2 +- src/pretix/plugins/banktransfer/payment.py | 1 - src/pretix/plugins/banktransfer/views.py | 4 ++-- src/pretix/plugins/stripe/views.py | 2 +- src/pretix/settings.py | 2 +- src/setup.cfg | 2 +- src/tests/base/test_locking.py | 2 +- src/tests/control/test_auth.py | 4 ++-- src/tests/control/test_events.py | 1 - src/tests/control/test_items.py | 2 +- src/tests/presale/test_event.py | 1 - src/tests/presale/test_orders.py | 2 +- 24 files changed, 25 insertions(+), 33 deletions(-) diff --git a/.travis.sh b/.travis.sh index b6bc015e13..a4c49a2349 100755 --- a/.travis.sh +++ b/.travis.sh @@ -7,7 +7,7 @@ echo "Executing job $1" if [ "$1" == "style" ]; then XDG_CACHE_HOME=/cache pip3 install -Ur src/requirements.txt -r src/requirements/dev.txt -r src/requirements/py34.txt cd src - flake8 --ignore=E123,F403,F401,N802,C901,W503,E402 . + flake8 . isort -c -rc . fi if [ "$1" == "doctests" ]; then diff --git a/src/pretix/base/exporters/invoices.py b/src/pretix/base/exporters/invoices.py index b9f3460a77..62a37dcad4 100644 --- a/src/pretix/base/exporters/invoices.py +++ b/src/pretix/base/exporters/invoices.py @@ -6,7 +6,6 @@ from django.dispatch import receiver from django.utils.translation import ugettext as _ from ..exporter import BaseExporter -from ..models import Invoice from ..signals import register_data_exporters diff --git a/src/pretix/base/exporters/json.py b/src/pretix/base/exporters/json.py index 0ef23c496a..fa361e818d 100644 --- a/src/pretix/base/exporters/json.py +++ b/src/pretix/base/exporters/json.py @@ -25,7 +25,7 @@ class JSONExporter(BaseExporter): 'id': category.id, 'name': str(category.name) } for category in self.event.categories.all() - ], + ], 'items': [ { 'id': item.id, @@ -43,16 +43,16 @@ class JSONExporter(BaseExporter): item.default_price, 'name': str(variation) } for variation in item.variations.all() - ] + ] } for item in self.event.items.all().prefetch_related('variations') - ], + ], 'questions': [ { 'id': question.id, 'question': str(question.question), 'type': question.type } for question in self.event.questions.all() - ], + ], 'orders': [ { 'code': order.code, @@ -74,12 +74,12 @@ class JSONExporter(BaseExporter): 'question': answer.question_id, 'answer': answer.answer } for answer in position.answers.all() - ] + ] } for position in order.positions.all() - ] + ] } for order in self.event.orders.all().prefetch_related('positions', 'positions__answers') - ], + ], 'quotas': [ { 'id': quota.id, @@ -87,7 +87,7 @@ class JSONExporter(BaseExporter): 'items': [item.id for item in quota.items.all()], 'variations': [variation.id for variation in quota.variations.all()], } for quota in self.event.quotas.all().prefetch_related('items', 'variations') - ] + ] } } diff --git a/src/pretix/base/exporters/orderlist.py b/src/pretix/base/exporters/orderlist.py index 41f97a0e10..4328cb4ab5 100644 --- a/src/pretix/base/exporters/orderlist.py +++ b/src/pretix/base/exporters/orderlist.py @@ -1,6 +1,5 @@ import csv import io -import json from collections import OrderedDict from django import forms diff --git a/src/pretix/base/models/invoices.py b/src/pretix/base/models/invoices.py index 3fc66e7ca3..695f512fb2 100644 --- a/src/pretix/base/models/invoices.py +++ b/src/pretix/base/models/invoices.py @@ -3,7 +3,6 @@ from datetime import date from decimal import Decimal from django.db import DatabaseError, models, transaction -from django.db.models import Max from django.utils.crypto import get_random_string from django.utils.functional import cached_property diff --git a/src/pretix/base/models/vouchers.py b/src/pretix/base/models/vouchers.py index d314c1ed24..053f02c22b 100644 --- a/src/pretix/base/models/vouchers.py +++ b/src/pretix/base/models/vouchers.py @@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy as _ from .base import LoggedModel from .event import Event from .items import Item, ItemVariation, Quota -from .orders import CartPosition, Order, OrderPosition +from .orders import CartPosition def _generate_random_code(): diff --git a/src/pretix/base/services/cart.py b/src/pretix/base/services/cart.py index 8893a84214..989fa6cfab 100644 --- a/src/pretix/base/services/cart.py +++ b/src/pretix/base/services/cart.py @@ -8,7 +8,7 @@ from django.utils.translation import ugettext as _ from pretix.base.i18n import LazyLocaleException from pretix.base.models import ( - CartPosition, Event, EventLock, Item, ItemVariation, Quota, Voucher, + CartPosition, Event, Item, ItemVariation, Quota, Voucher, ) from pretix.base.services.locking import LockTimeoutException from pretix.celery import app diff --git a/src/pretix/base/services/export.py b/src/pretix/base/services/export.py index d2a6bf2e4a..f11d71dc24 100644 --- a/src/pretix/base/services/export.py +++ b/src/pretix/base/services/export.py @@ -1,6 +1,5 @@ from typing import Any, Dict -from django.conf import settings from django.core.files.base import ContentFile from pretix.base.models import CachedFile, Event, cachedfile_name diff --git a/src/pretix/base/services/invoices.py b/src/pretix/base/services/invoices.py index 52239adff2..c6c138efd4 100644 --- a/src/pretix/base/services/invoices.py +++ b/src/pretix/base/services/invoices.py @@ -5,7 +5,6 @@ from datetime import date from decimal import Decimal from locale import format as lformat -from django.conf import settings from django.contrib.staticfiles import finders from django.core.files.base import ContentFile from django.db import transaction diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py index 2e39424237..a13a2c54c0 100644 --- a/src/pretix/base/services/orders.py +++ b/src/pretix/base/services/orders.py @@ -15,7 +15,7 @@ from pretix.base.i18n import ( LazyDate, LazyLocaleException, LazyNumber, language, ) from pretix.base.models import ( - CartPosition, Event, EventLock, Item, ItemVariation, Order, OrderPosition, + CartPosition, Event, Item, ItemVariation, Order, OrderPosition, Quota, User, ) from pretix.base.models.orders import InvoiceAddress diff --git a/src/pretix/base/views/cachedfiles.py b/src/pretix/base/views/cachedfiles.py index b10f2d8c97..60727dfad7 100644 --- a/src/pretix/base/views/cachedfiles.py +++ b/src/pretix/base/views/cachedfiles.py @@ -1,7 +1,7 @@ import os from django.http import FileResponse, HttpRequest, HttpResponse -from django.shortcuts import get_object_or_404, redirect +from django.shortcuts import get_object_or_404 from django.utils.functional import cached_property from django.views.generic import TemplateView diff --git a/src/pretix/control/views/event.py b/src/pretix/control/views/event.py index e374815436..5c70ff63d5 100644 --- a/src/pretix/control/views/event.py +++ b/src/pretix/control/views/event.py @@ -336,7 +336,7 @@ class MailSettings(EventSettingsFormView): self.request.event.log_action( 'pretix.event.settings', user=self.request.user, data={ k: form.cleaned_data.get(k) for k in form.changed_data - } + } ) if request.POST.get('test', '0').strip() == '1': diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index 3d8e20b330..1d956a6217 100644 --- a/src/pretix/control/views/orders.py +++ b/src/pretix/control/views/orders.py @@ -13,7 +13,7 @@ from django.views.generic import DetailView, ListView, TemplateView, View from pretix.base.i18n import language from pretix.base.models import ( - CachedFile, CachedTicket, EventLock, Invoice, Item, ItemVariation, Order, + CachedFile, CachedTicket, Invoice, Item, ItemVariation, Order, Quota, ) from pretix.base.services import tickets diff --git a/src/pretix/plugins/banktransfer/payment.py b/src/pretix/plugins/banktransfer/payment.py index 44e176962d..968457b948 100644 --- a/src/pretix/plugins/banktransfer/payment.py +++ b/src/pretix/plugins/banktransfer/payment.py @@ -1,7 +1,6 @@ import json from collections import OrderedDict -from django import forms from django.template.loader import get_template from django.utils.translation import ugettext_lazy as _ diff --git a/src/pretix/plugins/banktransfer/views.py b/src/pretix/plugins/banktransfer/views.py index a577a47114..705f87c868 100644 --- a/src/pretix/plugins/banktransfer/views.py +++ b/src/pretix/plugins/banktransfer/views.py @@ -12,7 +12,7 @@ from django.shortcuts import get_object_or_404, redirect, render from django.utils.functional import cached_property from django.utils.timezone import now from django.utils.translation import ugettext as _ -from django.views.generic import DetailView, ListView, TemplateView, View +from django.views.generic import DetailView, ListView, View from pretix.base.models import Order, Quota from pretix.base.services.mail import SendMailException @@ -283,7 +283,7 @@ class ImportView(EventPermissionRequiredMixin, ListView): [ self.request.POST.get('col[%d][%d]' % (i, j)) for j in range(int(self.request.POST.get('cols'))) - ] + ] ) if 'reference' not in self.request.POST: messages.error(self.request, _('You need to select the column containing the payment reference.')) diff --git a/src/pretix/plugins/stripe/views.py b/src/pretix/plugins/stripe/views.py index c610e9b9ac..af716388a7 100644 --- a/src/pretix/plugins/stripe/views.py +++ b/src/pretix/plugins/stripe/views.py @@ -6,7 +6,7 @@ from django.http import HttpResponse from django.views.decorators.csrf import csrf_exempt from django.views.decorators.http import require_POST -from pretix.base.models import Event, Order +from pretix.base.models import Order from pretix.base.services.orders import mark_order_refunded from pretix.plugins.stripe.payment import Stripe from pretix.presale.utils import event_view diff --git a/src/pretix/settings.py b/src/pretix/settings.py index 675c733953..4598737df6 100644 --- a/src/pretix/settings.py +++ b/src/pretix/settings.py @@ -182,7 +182,7 @@ INSTALLED_APPS = [ ] try: - import django_extensions + import django_extensions # noqa INSTALLED_APPS.append('django_extensions') except ImportError: pass diff --git a/src/setup.cfg b/src/setup.cfg index a90114a7fd..daeb05f1c4 100644 --- a/src/setup.cfg +++ b/src/setup.cfg @@ -1,5 +1,5 @@ [flake8] -ignore = N802,W503,E402 +ignore = N802,W503,E402,C901 max-line-length = 160 exclude = migrations,.ropeproject,static,mt940.py,_static,build,make_testdata.py,*/testutils/settings.py,tests/settings.py,pretix/base/models/__init__.py max-complexity = 11 diff --git a/src/tests/base/test_locking.py b/src/tests/base/test_locking.py index c98e990972..320cd6cf03 100644 --- a/src/tests/base/test_locking.py +++ b/src/tests/base/test_locking.py @@ -3,7 +3,7 @@ import time import pytest from django.utils.timezone import now -from pretix.base.models import Event, EventLock, Organizer +from pretix.base.models import Event, Organizer from pretix.base.services import locking from pretix.base.services.locking import ( LockReleaseException, LockTimeoutException, diff --git a/src/tests/control/test_auth.py b/src/tests/control/test_auth.py index 131397a31c..5f61644c02 100644 --- a/src/tests/control/test_auth.py +++ b/src/tests/control/test_auth.py @@ -286,7 +286,7 @@ class PasswordRecoveryFormTest(TestCase): def test_unknown(self): response = self.client.post('/control/forgot', { 'email': 'dummy@dummy.dummy', - }) + }) self.assertEqual(response.status_code, 200) def test_email_sent(self): @@ -294,7 +294,7 @@ class PasswordRecoveryFormTest(TestCase): response = self.client.post('/control/forgot', { 'email': 'demo@demo.dummy', - }) + }) self.assertEqual(response.status_code, 302) assert len(djmail.outbox) == 1 diff --git a/src/tests/control/test_events.py b/src/tests/control/test_events.py index 72b901b166..801d50f833 100644 --- a/src/tests/control/test_events.py +++ b/src/tests/control/test_events.py @@ -6,7 +6,6 @@ from tests.base import SoupTest, extract_form_fields from pretix.base.models import ( Event, EventPermission, Organizer, OrganizerPermission, User, ) -from pretix.presale.style import regenerate_css from pretix.testutils.mock import mocker_context diff --git a/src/tests/control/test_items.py b/src/tests/control/test_items.py index 0cb404f321..8518f69a9c 100644 --- a/src/tests/control/test_items.py +++ b/src/tests/control/test_items.py @@ -6,7 +6,7 @@ from tests.base import SoupTest, extract_form_fields from pretix.base.models import ( Event, EventPermission, Item, ItemCategory, ItemVariation, Order, - OrderPosition, Organizer, OrganizerPermission, Question, QuestionAnswer, + OrderPosition, Organizer, OrganizerPermission, Question, Quota, User, ) diff --git a/src/tests/presale/test_event.py b/src/tests/presale/test_event.py index 62669f3131..40b33098a5 100644 --- a/src/tests/presale/test_event.py +++ b/src/tests/presale/test_event.py @@ -1,5 +1,4 @@ import datetime -import time from decimal import Decimal from django.core import mail diff --git a/src/tests/presale/test_orders.py b/src/tests/presale/test_orders.py index 438b2fb537..3ab626720c 100644 --- a/src/tests/presale/test_orders.py +++ b/src/tests/presale/test_orders.py @@ -386,7 +386,7 @@ class OrdersTest(TestCase): generate_invoice(self.order) response = self.client.get( '/%s/%s/order/%s/%s/pay/change' % (self.orga.slug, self.event.slug, self.order.code, self.order.secret), - ) + ) assert 'Test dummy' in response.rendered_content assert '+ 12.00' in response.rendered_content response = self.client.post(