Use consistent flake8 settings everywhere and fix flake8 issues

This commit is contained in:
Raphael Michel
2016-10-13 22:57:57 +02:00
parent fa0803aa68
commit 503f6dd06f
24 changed files with 25 additions and 33 deletions
-1
View File
@@ -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
+8 -8
View File
@@ -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')
]
]
}
}
-1
View File
@@ -1,6 +1,5 @@
import csv
import io
import json
from collections import OrderedDict
from django import forms
-1
View File
@@ -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
+1 -1
View File
@@ -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():
+1 -1
View File
@@ -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
-1
View File
@@ -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
-1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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