Used isort to order all import statements

This commit is contained in:
Raphael Michel
2015-07-19 20:46:34 +02:00
parent c2971d28a6
commit e828d711bd
107 changed files with 353 additions and 244 deletions

View File

@@ -1,12 +1,11 @@
import os
import sys
import time
from django.contrib.staticfiles.testing import StaticLiveServerTestCase
from django.conf import settings
from django.contrib.staticfiles.testing import StaticLiveServerTestCase
from selenium import webdriver
# could use Chrome, Firefox, etc... here
BROWSER = os.environ.get('TEST_BROWSER', 'PhantomJS')

View File

@@ -1,7 +1,7 @@
import random
from django.test import TestCase
from django.core.cache import cache as django_cache
from django.test import TestCase
from django.utils.timezone import now
from pretix.base.models import Event, Organizer

View File

@@ -1,9 +1,9 @@
from django.test import TestCase
from django.utils import translation
from django.utils.timezone import now
from pretix.base.i18n import LazyI18nString
from pretix.base.models import Event, Organizer, ItemCategory
from pretix.base.i18n import LazyI18nString
from pretix.base.models import Event, ItemCategory, Organizer
class I18nStringTest(TestCase):

View File

@@ -1,8 +1,8 @@
from django.conf import settings
from django.utils.timezone import now
from django.core import mail as djmail
from django.utils.translation import ugettext_lazy as _
import pytest
from django.conf import settings
from django.core import mail as djmail
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _
from pretix.base.models import Event, Organizer, User
from pretix.base.services.mail import mail

View File

@@ -1,6 +1,6 @@
from django.test import TestCase, Client
from django.utils.timezone import now
from django.conf import settings
from django.test import Client, TestCase
from django.utils.timezone import now
from pretix.base.models import Event, Organizer, User

View File

@@ -2,10 +2,11 @@ from datetime import timedelta
from django.test import TestCase
from django.utils.timezone import now
from pretix.base.models import (
Event, Organizer, Item, ItemVariation,
Property, PropertyValue, User, Quota,
Order, OrderPosition, CartPosition, Question)
CartPosition, Event, Item, ItemVariation, Order, OrderPosition, Organizer,
Property, PropertyValue, Question, Quota, User,
)
from pretix.base.services.orders import mark_order_paid
from pretix.base.types import VariationDict

View File

@@ -1,6 +1,6 @@
from django.conf import settings
from django.test import TestCase
from django.utils.timezone import now
from django.conf import settings
from pretix.base.models import Event, Organizer
from pretix.base.plugins import get_all_plugins

View File

@@ -1,10 +1,11 @@
from datetime import datetime, time, date
from datetime import date, datetime, time
from decimal import Decimal
from django.test import TestCase
from django.utils.timezone import now
from pretix.base.models import Event, Organizer, User, OrganizerSetting
from pretix.base import settings
from pretix.base.models import Event, Organizer, OrganizerSetting, User
from pretix.base.settings import SettingsSandbox

View File

@@ -1,7 +1,7 @@
from django.test import TestCase, Client
from django.test import Client, TestCase
from tests.base import BrowserTest
from pretix.base.models import User
from tests.base import BrowserTest
class LoginFormBrowserTest(BrowserTest):

View File

@@ -1,7 +1,11 @@
import datetime
from pretix.base.models import User, Organizer, Event, OrganizerPermission, EventPermission
from tests.base import BrowserTest
from pretix.base.models import (
Event, EventPermission, Organizer, OrganizerPermission, User,
)
class EventsTest(BrowserTest):

View File

@@ -1,13 +1,17 @@
import datetime
import os
import time
import datetime
import unittest
from django.utils.timezone import now
from selenium.webdriver.support.select import Select
from pretix.base.models import User, Organizer, Event, OrganizerPermission, EventPermission, ItemCategory, Property, \
PropertyValue, Question, Quota, Item
from tests.base import BrowserTest
from pretix.base.models import (
Event, EventPermission, Item, ItemCategory, Organizer, OrganizerPermission,
Property, PropertyValue, Question, Quota, User,
)
class ItemFormTest(BrowserTest):
def setUp(self):

View File

@@ -1,9 +1,13 @@
from datetime import timedelta
from decimal import Decimal
from django.utils.timezone import now
import pytest
from pretix.base.models import Event, Organizer, User, EventPermission, Order, OrganizerPermission, Item, OrderPosition
from django.utils.timezone import now
from pretix.base.models import (
Event, EventPermission, Item, Order, OrderPosition, Organizer,
OrganizerPermission, User,
)
@pytest.fixture

View File

@@ -1,8 +1,11 @@
from datetime import timedelta
from django.utils.timezone import now
import pytest
from pretix.base.models import Event, Organizer, User, EventPermission, Order, OrganizerPermission
from django.utils.timezone import now
from pretix.base.models import (
Event, EventPermission, Order, Organizer, OrganizerPermission, User,
)
@pytest.fixture

View File

@@ -1,6 +1,7 @@
from pretix.base.models import User
from tests.base import BrowserTest
from pretix.base.models import User
class UserSettingsTest(BrowserTest):
def setUp(self):

View File

@@ -1,7 +1,8 @@
from django.conf import settings
from pretix.helpers.urls import build_absolute_uri
from django.core import urlresolvers
from pretix.helpers.urls import build_absolute_uri
def test_site_url_domain():
settings.SITE_URL = 'https://example.com'

View File

@@ -1,4 +1,5 @@
import os.path
from django.test import TestCase
# Do NOT use relative imports here

View File

@@ -4,9 +4,8 @@ from django.test import TestCase
from django.utils.timezone import now
from pretix.base.models import (
Event, Organizer, Item, Property, PropertyValue, ItemVariation
Event, Item, ItemVariation, Organizer, Property, PropertyValue,
)
# Do NOT use relative imports here
from pretix.plugins.timerestriction import signals
from pretix.plugins.timerestriction.models import TimeRestriction

View File

@@ -1,8 +1,10 @@
import time
from pretix.base.models import User
from tests.base import BrowserTest
from tests.presale.test_event import EventTestMixin
from pretix.base.models import User
class UserSettingsTest(EventTestMixin, BrowserTest):
def setUp(self):

View File

@@ -1,14 +1,17 @@
import datetime
import time
from datetime import timedelta
from bs4 import BeautifulSoup
from django.test import TestCase
from django.utils.timezone import now
from datetime import timedelta
from pretix.base.models import Item, Organizer, Event, ItemCategory, Quota, Property, PropertyValue, ItemVariation, User, \
CartPosition, Question, QuestionAnswer
from tests.base import BrowserTest
from pretix.base.models import (
CartPosition, Event, Item, ItemCategory, ItemVariation, Organizer,
Property, PropertyValue, Question, QuestionAnswer, Quota, User,
)
class CartTestMixin:

View File

@@ -1,11 +1,14 @@
import datetime
from datetime import timedelta
from bs4 import BeautifulSoup
from django.test import TestCase
from django.utils.timezone import now
from datetime import timedelta
from pretix.base.models import Item, Organizer, Event, ItemCategory, Quota, User, \
CartPosition, Question, Order, OrderPosition
from pretix.base.models import (
CartPosition, Event, Item, ItemCategory, Order, OrderPosition, Organizer,
Question, Quota, User,
)
class CheckoutTestCase(TestCase):

View File

@@ -1,11 +1,15 @@
import datetime
import time
from django.test import TestCase
from django.utils.timezone import now
from pretix.base.models import Item, Organizer, Event, ItemCategory, Quota, Property, PropertyValue, ItemVariation, User
from tests.base import BrowserTest
from pretix.base.models import (
Event, Item, ItemCategory, ItemVariation, Organizer, Property,
PropertyValue, Quota, User,
)
class EventTestMixin:

View File

@@ -1,11 +1,14 @@
import datetime
from decimal import Decimal
from bs4 import BeautifulSoup
from django.test import TestCase
from django.utils.timezone import now
from pretix.base.models import Organizer, Event, Order, User, ItemCategory, Quota, Item, Property, PropertyValue, \
ItemVariation, OrderPosition, Question
from pretix.base.models import (
Event, Item, ItemCategory, ItemVariation, Order, OrderPosition, Organizer,
Property, PropertyValue, Question, Quota, User,
)
class OrdersTest(TestCase):

View File

@@ -1,4 +1,5 @@
from django.apps import AppConfig
from pretix.base.plugins import PluginType

View File

@@ -1,8 +1,8 @@
import logging
from django.http import HttpResponse
from pretix.base.ticketoutput import BaseTicketOutput
from pretix.base.ticketoutput import BaseTicketOutput
logger = logging.getLogger('tests.testdummy.ticketoutput')