From 49ea85caeefe6b2969c382aef4b3fc1ba94321d6 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Wed, 3 Jun 2015 13:25:26 +0200 Subject: [PATCH] Resolve flake8 warnings --- src/make_testdata.py | 2 +- src/pretix/base/models.py | 4 ++-- src/pretix/control/forms/event.py | 4 ++-- src/pretix/plugins/banktransfer/__init__.py | 2 +- src/pretix/plugins/banktransfer/urls.py | 4 ++-- src/pretix/plugins/banktransfer/views.py | 2 +- src/pretix/plugins/paypal/__init__.py | 2 +- src/pretix/plugins/stripe/__init__.py | 2 +- src/pretix/plugins/ticketoutputpdf/__init__.py | 2 +- src/pretix/plugins/ticketoutputpdf/ticketoutput.py | 7 +------ src/tests/control/test_permissions.py | 3 +-- 11 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/make_testdata.py b/src/make_testdata.py index 94f4a69d10..d7faa545b6 100644 --- a/src/make_testdata.py +++ b/src/make_testdata.py @@ -1,11 +1,11 @@ #!/usr/bin/env python import os import sys -from datetime import date, timedelta, datetime os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pretix.settings") import django + django.setup() from pretix.base.models import * diff --git a/src/pretix/base/models.py b/src/pretix/base/models.py index 71de53ba20..59f8f0bbe0 100644 --- a/src/pretix/base/models.py +++ b/src/pretix/base/models.py @@ -304,8 +304,8 @@ class Organizer(Versionable): validators=[ RegexValidator( regex="^[a-zA-Z0-9.-]+$", - message=_("The slug may only contain letters, numbers, dots and dashes."), - ) + message=_("The slug may only contain letters, numbers, dots and dashes.") + ) ], verbose_name=_("Slug"), ) diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index f1a5b34633..4a699b1f8a 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -34,8 +34,8 @@ class EventCreateForm(VersionedModelForm): if Event.objects.filter(slug=slug, organizer=self.organizer).exists(): raise forms.ValidationError( self.error_messages['duplicate_slug'], - code='duplicate_slug', - ) + code='duplicate_slug' + ) return slug diff --git a/src/pretix/plugins/banktransfer/__init__.py b/src/pretix/plugins/banktransfer/__init__.py index 0a08759210..26bf1eb61c 100644 --- a/src/pretix/plugins/banktransfer/__init__.py +++ b/src/pretix/plugins/banktransfer/__init__.py @@ -23,7 +23,7 @@ class BankTransferApp(AppConfig): def compatibility_warnings(self): errs = [] try: - import chardet + import chardet # NOQA except ImportError: errs.append(_("Install the python package 'chardet' for better CSV import capabilities.")) return errs diff --git a/src/pretix/plugins/banktransfer/urls.py b/src/pretix/plugins/banktransfer/urls.py index 11942818bc..1ae7520aac 100644 --- a/src/pretix/plugins/banktransfer/urls.py +++ b/src/pretix/plugins/banktransfer/urls.py @@ -1,9 +1,9 @@ from django.conf.urls import url -from .views import * +from . import views urlpatterns = [ - url(r'^control/event/(?P[^/]+)/(?P[^/]+)/banktransfer/import/', ImportView.as_view(), + url(r'^control/event/(?P[^/]+)/(?P[^/]+)/banktransfer/import/', views.ImportView.as_view(), name='import'), ] diff --git a/src/pretix/plugins/banktransfer/views.py b/src/pretix/plugins/banktransfer/views.py index 4c30d24ded..56da4da64e 100644 --- a/src/pretix/plugins/banktransfer/views.py +++ b/src/pretix/plugins/banktransfer/views.py @@ -3,8 +3,8 @@ from decimal import Decimal import json import logging import re + from django.contrib import messages -from django.core.urlresolvers import reverse from django.shortcuts import redirect, render from django.utils.timezone import now from django.views.generic import TemplateView diff --git a/src/pretix/plugins/paypal/__init__.py b/src/pretix/plugins/paypal/__init__.py index 5f79d58bba..a43460b41b 100644 --- a/src/pretix/plugins/paypal/__init__.py +++ b/src/pretix/plugins/paypal/__init__.py @@ -22,7 +22,7 @@ class PaypalApp(AppConfig): def compatibility_errors(self): errs = [] try: - import paypalrestsdk + import paypalrestsdk # NOQA except ImportError: errs.append("Python package 'paypalrestsdk' is not installed.") return errs diff --git a/src/pretix/plugins/stripe/__init__.py b/src/pretix/plugins/stripe/__init__.py index 3240de1473..b1da15ffa1 100644 --- a/src/pretix/plugins/stripe/__init__.py +++ b/src/pretix/plugins/stripe/__init__.py @@ -23,7 +23,7 @@ class StripeApp(AppConfig): def compatibility_errors(self): errs = [] try: - import stripe + import stripe # NOQA except ImportError: errs.append("Python package 'stripe' is not installed.") return errs diff --git a/src/pretix/plugins/ticketoutputpdf/__init__.py b/src/pretix/plugins/ticketoutputpdf/__init__.py index a3c8bdefd8..c3184a474d 100644 --- a/src/pretix/plugins/ticketoutputpdf/__init__.py +++ b/src/pretix/plugins/ticketoutputpdf/__init__.py @@ -22,7 +22,7 @@ class TicketOutputPdfApp(AppConfig): def compatibility_errors(self): errs = [] try: - import reportlab + import reportlab # NOQA except ImportError: errs.append("Python package 'reportlab' is not installed.") return errs diff --git a/src/pretix/plugins/ticketoutputpdf/ticketoutput.py b/src/pretix/plugins/ticketoutputpdf/ticketoutput.py index 16364f2040..1ec4c69525 100644 --- a/src/pretix/plugins/ticketoutputpdf/ticketoutput.py +++ b/src/pretix/plugins/ticketoutputpdf/ticketoutput.py @@ -1,13 +1,9 @@ from io import BytesIO import logging -from django.contrib import messages + from django.contrib.staticfiles import finders from django.http import HttpResponse -from django.shortcuts import redirect -from django.utils.timezone import now from django.utils.translation import ugettext_lazy as _ -from pretix.base.models import Order - from pretix.base.ticketoutput import BaseTicketOutput @@ -15,7 +11,6 @@ logger = logging.getLogger('pretix.plugins.ticketoutputpdf') class PdfTicketOutput(BaseTicketOutput): - identifier = 'pdf' verbose_name = _('PDF output') download_button_text = _('Download PDF') diff --git a/src/tests/control/test_permissions.py b/src/tests/control/test_permissions.py index 11cbe13f65..a80f5c01c8 100644 --- a/src/tests/control/test_permissions.py +++ b/src/tests/control/test_permissions.py @@ -1,8 +1,7 @@ from datetime import timedelta -from django.test import Client, TestCase + from django.utils.timezone import now import pytest - from pretix.base.models import Event, Organizer, User, EventPermission, Order