Restructure our python module. A lot.

src/.coveragerc

@@ -1,5 +1,5 @@
 [run]
-source = pretixbase,pretixcontrol,pretixpresale,pretixplugins
+source = pretix
 omit = */migrations/*,*/urls.py,*/tests/*,*/testdummy/*,*/admin.py
 
 [report]

src/pretix/base/__init__.py

@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class PretixBaseConfig(AppConfig):
+    name = 'pretix.base'
+    label = 'pretixbase'
+
+default_app_config = 'pretix.base.PretixBaseConfig'

src/pretix/base/admin.py

@@ -3,13 +3,13 @@ from django.contrib.auth.admin import UserAdmin
 from django.utils.translation import ugettext as _
 from django import forms
 
-from pretixbase.models import (
+from pretix.base.models import (
     User, Organizer, OrganizerPermission, Event, EventPermission,
     Property, PropertyValue, Item, ItemVariation, ItemCategory
 )
 
 
-class TixlUserCreationForm(forms.ModelForm):
+class PretixUserCreationForm(forms.ModelForm):
 
     """
     A form that creates a user, with no privileges, from the given username and
@@ -39,14 +39,14 @@ class TixlUserCreationForm(forms.ModelForm):
         return password2
 
     def save(self, commit=True):
-        user = super(TixlUserCreationForm, self).save(commit=False)
+        user = super(PretixUserCreationForm, self).save(commit=False)
         user.set_password(self.cleaned_data["password1"])
         if commit:
             user.save()
         return user
 
 
-class TixlUserAdmin(UserAdmin):
+class PretixUserAdmin(UserAdmin):
 
     fieldsets = (
         (None, {'fields': ('identifier', 'event', 'username', 'password')}),
@@ -59,7 +59,7 @@ class TixlUserAdmin(UserAdmin):
     search_fields = ('identifier', 'username', 'givenname', 'familyname', 'email')
     ordering = ('identifier',)
     list_filter = ('is_staff', 'is_active', 'groups')
-    add_form = TixlUserCreationForm
+    add_form = PretixUserCreationForm
 
 
 class OrganizerPermissionInline(admin.TabularInline):
@@ -126,7 +126,7 @@ class ItemAdmin(admin.ModelAdmin):
     search_fields = ('name', 'event', 'category', 'short_description')
 
 
-admin.site.register(User, TixlUserAdmin)
+admin.site.register(User, PretixUserAdmin)
 admin.site.register(Organizer, OrganizerAdmin)
 admin.site.register(Event, EventAdmin)
 admin.site.register(Property, PropertyAdmin)

src/pretix/base/cache.py

@@ -3,7 +3,7 @@ import hashlib
 
 from django.core.cache import caches
 
-from pretixbase.models import Event
+from pretix.base.models import Event
 
 
 class EventRelatedCache:

src/pretix/base/migrations/0001_initial.py

@@ -7,7 +7,7 @@ import django.core.validators
 from django.conf import settings
 import django.db.models.deletion
 import django.utils.timezone
-import pretixbase.models
+import pretix.base.models
 
 
 class Migration(migrations.Migration):
@@ -322,7 +322,8 @@ class Migration(migrations.Migration):
                 ('items', versions.models.VersionedManyToManyField(blank=True, related_name='quotas', to='pretixbase.Item', verbose_name='Item')),
                 ('lock_cache', models.ManyToManyField(blank=True, to='pretixbase.CartPosition')),
                 ('order_cache', models.ManyToManyField(blank=True, to='pretixbase.OrderPosition')),
-                ('variations', pretixbase.models.VariationsField(blank=True, related_name='quotas', to='pretixbase.ItemVariation', verbose_name='Variations')),
+                ('variations', pretix.base.models.VariationsField(blank=True, related_name='quotas',
+                                                                  to='pretixbase.ItemVariation', verbose_name='Variations')),
             ],
             options={
                 'verbose_name_plural': 'Quotas',

src/pretix/base/migrations/0002_auto_20150211_2031.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import pretixbase.models
+import pretix.base.models
 import versions.models
 
 

src/pretix/base/migrations/0003_auto_20150211_2042.py

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import models, migrations
 import versions.models
-import pretixbase.models
+import pretix.base.models
 
 
 class Migration(migrations.Migration):

src/pretix/base/migrations/0004_auto_20150211_2330.py

@@ -5,7 +5,7 @@ from django.db import models, migrations
 from django.utils.timezone import utc
 import versions.models
 import datetime
-import pretixbase.models
+import pretix.base.models
 
 
 class Migration(migrations.Migration):

src/pretix/base/migrations/0005_auto_20150212_0901.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import pretixbase.models
+import pretix.base.models
 import versions.models
 
 

src/pretix/base/migrations/0006_auto_20150212_0908.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import pretixbase.models
+import pretix.base.models
 import versions.models
 
 

src/pretix/base/migrations/0007_auto_20150212_0939.py

@@ -3,7 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import models, migrations
 import versions.models
-import pretixbase.models
+import pretix.base.models
 
 
 class Migration(migrations.Migration):

src/pretix/base/models.py

@@ -382,8 +382,8 @@ class Event(Versionable):
             "DATETIME_FORMAT" if self.show_times else "DATE_FORMAT"
         )
 
-    def get_cache(self) -> "pretixbase.cache.EventRelatedCache":
-        from pretixbase.cache import EventRelatedCache
+    def get_cache(self) -> "pretix.base.cache.EventRelatedCache":
+        from pretix.base.cache import EventRelatedCache
         return EventRelatedCache(self)
 
 
@@ -929,7 +929,7 @@ class VariationsField(VersionedManyToManyField):
     """
 
     def formfield(self, **kwargs):
-        from pretixcontrol.views.forms import VariationsField as FVariationsField
+        from pretix.control.views.forms import VariationsField as FVariationsField
         from django.db.models.fields.related import RelatedField
         defaults = {
             'form_class': FVariationsField,

src/pretix/base/plugins.py

@@ -12,12 +12,12 @@ class PluginType(Enum):
 
 def get_all_plugins() -> "List[class]":
     """
-    Returns the TixlPluginMeta classes of all plugins found in the installed Django apps.
+    Returns the PretixPluginMeta classes of all plugins found in the installed Django apps.
     """
     plugins = []
     for app in apps.get_app_configs():
-        if hasattr(app, 'TixlPluginMeta'):
-            meta = app.TixlPluginMeta
+        if hasattr(app, 'PretixPluginMeta'):
+            meta = app.PretixPluginMeta
             meta.module = app.name
             plugins.append(meta)
     return plugins

src/pretix/base/signals.py

@@ -17,7 +17,7 @@ class EventPluginSignal(django.dispatch.Signal):
         Send signal from sender to all connected receivers that belong to
         plugins enabled for the given Event.
 
-        sender is required to be an instance of ``pretixbase.models.Event``.
+        sender is required to be an instance of ``pretix.base.models.Event``.
         """
         assert isinstance(sender, Event)
 

src/pretix/base/tests/test_cache.py

@@ -4,7 +4,7 @@ from django.test import TestCase
 from django.core.cache import cache as django_cache
 from django.utils.timezone import now
 
-from pretixbase.models import Event, Organizer
+from pretix.base.models import Event, Organizer
 
 
 class CacheTest(TestCase):

src/pretix/base/tests/test_middleware.py

@@ -2,7 +2,7 @@ from django.test import TestCase, Client
 from django.utils.timezone import now
 from django.conf import settings
 
-from pretixbase.models import Event, Organizer, User
+from pretix.base.models import Event, Organizer, User
 
 
 class LocaleDeterminationTest(TestCase):

src/pretix/base/tests/test_models.py

@@ -2,12 +2,12 @@ from datetime import timedelta
 from django.test import TestCase
 from django.utils.timezone import now
 
-from pretixbase.models import (
+from pretix.base.models import (
     Event, Organizer, Item, ItemVariation,
     Property, PropertyValue, User, Quota,
     Order, OrderPosition, CartPosition
 )
-from pretixbase.types import VariationDict
+from pretix.base.types import VariationDict
 
 
 class ItemVariationsTest(TestCase):

src/pretix/base/tests/test_plugins.py

@@ -2,9 +2,9 @@ from django.test import TestCase
 from django.utils.timezone import now
 from django.conf import settings
 
-from pretixbase.models import Event, Organizer
-from pretixbase.plugins import get_all_plugins
-from pretixbase.signals import determine_availability
+from pretix.base.models import Event, Organizer
+from pretix.base.plugins import get_all_plugins
+from pretix.base.signals import determine_availability
 
 
 class PluginRegistryTest(TestCase):
@@ -49,9 +49,9 @@ class PluginSignalTest(TestCase):
         self.assertEqual(len(responses), 0)
 
     def test_one_plugin_active(self):
-        self.event.plugins = 'pretixplugins.testdummy'
+        self.event.plugins = 'pretix.plugins.testdummy'
         self.event.save()
         payload = {'foo': 'bar'}
         responses = determine_availability.send(self.event, **payload)
         self.assertEqual(len(responses), 1)
-        self.assertIn('pretixplugins.testdummy.signals', [r[0].__module__ for r in responses])
+        self.assertIn('pretix.plugins.testdummy.signals', [r[0].__module__ for r in responses])

src/pretix/control/__init__.py

@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class PretixControlConfig(AppConfig):
+    name = 'pretix.control'
+    label = 'pretixcontrol'
+
+default_app_config = 'pretix.control.PretixControlConfig'

src/pretix/control/middleware.py

@@ -7,7 +7,7 @@ from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.http import HttpResponseNotFound
 from django.utils.translation import ugettext as _
 
-from pretixbase.models import Event
+from pretix.base.models import Event
 
 
 class PermissionMiddleware:

src/pretix/control/permissions.py

@@ -1,7 +1,7 @@
 from django.http import HttpResponseForbidden
 from django.utils.translation import ugettext as _
 
-from pretixbase.models import EventPermission
+from pretix.base.models import EventPermission
 
 
 def event_permission_required(permission):

src/pretix/control/signals.py

@@ -1,4 +1,4 @@
-from pretixbase.signals import EventPluginSignal
+from pretix.base.signals import EventPluginSignal
 
 
 """

src/pretix/control/static/pretixcontrol/less/auth.less

@@ -1,4 +1,4 @@
-@import "../../../../pretixbase/static/bootstrap/less/bootstrap.less";
+@import "../../../../base/static/bootstrap/less/bootstrap.less";
 
 body {
 	background: #eee;

src/pretix/control/static/pretixcontrol/less/main.less

@@ -0,0 +1,4 @@
+@import "../../../../base/static/bootstrap/less/bootstrap.less";
+@import "../../../../base/static/fontawesome/less/font-awesome.less";
+@fa-font-path: "../../fontawesome/fonts";
+@import "forms.less";

src/pretix/control/tests/test_auth.py

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

src/pretix/control/tests/test_events.py

@@ -1,6 +1,6 @@
 import datetime
-from pretixbase.models import User, Organizer, Event, OrganizerPermission, EventPermission
-from pretixbase.tests import BrowserTest, on_platforms
+from pretix.base.models import User, Organizer, Event, OrganizerPermission, EventPermission
+from pretix.base.tests import BrowserTest, on_platforms
 
 
 @on_platforms()
@@ -54,8 +54,8 @@ class EventsTest(BrowserTest):
         self.driver.get('%s/control/event/%s/%s/settings/plugins' % (self.live_server_url, self.orga1.slug,
                                                                      self.event1.slug))
         self.assertIn("Restriction by time", self.driver.find_element_by_class_name("form-plugins").text)
-        self.assertIn("Enable", self.driver.find_element_by_name("plugin:pretixplugins.timerestriction").text)
-        self.driver.find_element_by_name("plugin:pretixplugins.timerestriction").click()
-        self.assertIn("Disable", self.driver.find_element_by_name("plugin:pretixplugins.timerestriction").text)
-        self.driver.find_element_by_name("plugin:pretixplugins.timerestriction").click()
-        self.assertIn("Enable", self.driver.find_element_by_name("plugin:pretixplugins.timerestriction").text)
+        self.assertIn("Enable", self.driver.find_element_by_name("plugin:pretix.plugins.timerestriction").text)
+        self.driver.find_element_by_name("plugin:pretix.plugins.timerestriction").click()
+        self.assertIn("Disable", self.driver.find_element_by_name("plugin:pretix.plugins.timerestriction").text)
+        self.driver.find_element_by_name("plugin:pretix.plugins.timerestriction").click()
+        self.assertIn("Enable", self.driver.find_element_by_name("plugin:pretix.plugins.timerestriction").text)

src/pretix/control/tests/test_items.py

@@ -3,9 +3,9 @@ import time
 import datetime
 from django.utils import unittest
 from selenium.webdriver.support.select import Select
-from pretixbase.models import User, Organizer, Event, OrganizerPermission, EventPermission, ItemCategory, Property, \
+from pretix.base.models import User, Organizer, Event, OrganizerPermission, EventPermission, ItemCategory, Property, \
     PropertyValue, Question, Quota, Item
-from pretixbase.tests import BrowserTest, on_platforms
+from pretix.base.tests import BrowserTest, on_platforms
 
 
 class ItemFormTest(BrowserTest):

src/pretix/control/tests/test_permissions.py

@@ -1,7 +1,7 @@
 from django.test import TestCase, Client
 from django.utils.timezone import now
 
-from pretixbase.models import Event, Organizer, User, EventPermission
+from pretix.base.models import Event, Organizer, User, EventPermission
 
 
 class PermissionMiddlewareTest(TestCase):

src/pretix/control/urls.py

@@ -1,22 +1,22 @@
 from django.conf.urls import patterns, url, include
-from pretixcontrol.views import main, event, item
+from pretix.control.views import main, event, item
 
 urlpatterns = patterns('',)
 urlpatterns += patterns(
-    'pretixcontrol.views.auth',
+    'pretix.control.views.auth',
     url(r'^logout$', 'logout', name='auth.logout'),
     url(r'^login$', 'login', name='auth.login'),
 )
 urlpatterns += patterns(
-    'pretixcontrol.views.main',
+    'pretix.control.views.main',
     url(r'^$', 'index', name='index'),
     url(r'^events/$', main.EventList.as_view(), name='events'),
 )
 urlpatterns += patterns(
-    'pretixcontrol.views.event',
+    'pretix.control.views.event',
     url(r'^event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include(
         patterns(
-            'pretixcontrol.views',
+            'pretix.control.views',
             url(r'^$', 'event.index', name='event.index'),
             url(r'^settings/$', event.EventUpdate.as_view(), name='event.settings'),
             url(r'^settings/plugins$', event.EventPlugins.as_view(), name='event.settings.plugins'),

src/pretix/control/views/event.py

@@ -7,10 +7,10 @@ from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
 
 from pytz import common_timezones
-from pretixbase.forms import VersionedModelForm
+from pretix.base.forms import VersionedModelForm
 
-from pretixbase.models import Event
-from pretixcontrol.permissions import EventPermissionRequiredMixin
+from pretix.base.models import Event
+from pretix.control.permissions import EventPermissionRequiredMixin
 
 
 class EventUpdateForm(VersionedModelForm):
@@ -75,7 +75,7 @@ class EventPlugins(EventPermissionRequiredMixin, TemplateView, SingleObjectMixin
         return self.request.event
 
     def get_context_data(self, *args, **kwargs) -> dict:
-        from pretixbase.plugins import get_all_plugins
+        from pretix.base.plugins import get_all_plugins
         context = super().get_context_data(*args, **kwargs)
         context['plugins'] = [p for p in get_all_plugins() if not p.name.startswith('.')]
         context['plugins_active'] = self.object.get_plugins()

src/pretix/control/views/forms.py

@@ -7,9 +7,9 @@ from django.utils.encoding import force_text
 from django.utils.html import format_html
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
-from pretixbase.forms import VersionedModelForm
+from pretix.base.forms import VersionedModelForm
 
-from pretixbase.models import ItemVariation, PropertyValue, Item
+from pretix.base.models import ItemVariation, PropertyValue, Item
 
 
 class TolerantFormsetModelForm(VersionedModelForm):

src/pretix/control/views/item.py

@@ -12,14 +12,14 @@ from django.http import HttpResponseRedirect, HttpResponseForbidden
 from django.shortcuts import redirect
 from django.forms.models import inlineformset_factory
 from django.utils.translation import ugettext_lazy as _
-from pretixbase.forms import VersionedModelForm
+from pretix.base.forms import VersionedModelForm
 
-from pretixbase.models import (
+from pretix.base.models import (
     Item, ItemCategory, Property, ItemVariation, PropertyValue, Question, Quota,
     Versionable)
-from pretixcontrol.permissions import EventPermissionRequiredMixin, event_permission_required
-from pretixcontrol.views.forms import TolerantFormsetModelForm, VariationsField
-from pretixcontrol.signals import restriction_formset
+from pretix.control.permissions import EventPermissionRequiredMixin, event_permission_required
+from pretix.control.views.forms import TolerantFormsetModelForm, VariationsField
+from pretix.control.signals import restriction_formset
 
 
 class ItemList(ListView):

src/pretix/control/views/main.py

@@ -1,7 +1,7 @@
 from django.shortcuts import render
 from django.views.generic import ListView
 
-from pretixbase.models import Event
+from pretix.base.models import Event
 
 
 class EventList(ListView):

src/pretix/plugins/testdummy/__init__.py

@@ -1,12 +1,12 @@
 from django.apps import AppConfig
-from pretixbase.plugins import PluginType
+from pretix.base.plugins import PluginType
 
 
 class TestDummyApp(AppConfig):
-    name = 'pretixplugins.testdummy'
+    name = 'pretix.plugins.testdummy'
     verbose_name = '.testdummy'
 
-    class TixlPluginMeta:
+    class PretixPluginMeta:
         type = PluginType.RESTRICTION
         name = '.testdummy'
         version = '1.0.0'
@@ -14,4 +14,4 @@ class TestDummyApp(AppConfig):
     def ready(self):
         from . import signals  # NOQA
 
-default_app_config = 'pretixplugins.testdummy.TestDummyApp'
+default_app_config = 'pretix.plugins.testdummy.TestDummyApp'

src/pretix/plugins/testdummy/signals.py

@@ -1,6 +1,6 @@
 from django.dispatch import receiver
 
-from pretixbase.signals import determine_availability
+from pretix.base.signals import determine_availability
 
 
 @receiver(determine_availability)

src/pretix/plugins/timerestriction/__init__.py

@@ -1,13 +1,13 @@
 from django.apps import AppConfig
 from django.utils.translation import ugettext_lazy as _
-from pretixbase.plugins import PluginType
+from pretix.base.plugins import PluginType
 
 
 class TimeRestrictionApp(AppConfig):
-    name = 'pretixplugins.timerestriction'
+    name = 'pretix.plugins.timerestriction'
     verbose_name = _("Time restriction")
 
-    class TixlPluginMeta:
+    class PretixPluginMeta:
         type = PluginType.RESTRICTION
         name = _("Restriction by time")
         author = _("the pretix team")
@@ -19,4 +19,4 @@ class TimeRestrictionApp(AppConfig):
     def ready(self):
         from . import signals  # NOQA
 
-default_app_config = 'pretixplugins.timerestriction.TimeRestrictionApp'
+default_app_config = 'pretix.plugins.timerestriction.TimeRestrictionApp'

src/pretix/plugins/timerestriction/migrations/0001_initial.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
-import pretixbase.models
+import pretix.base.models
 import versions.models
 
 
@@ -26,7 +26,8 @@ class Migration(migrations.Migration):
                 ('price', models.DecimalField(null=True, blank=True, verbose_name='Price in time frame', max_digits=7, decimal_places=2)),
                 ('event', versions.models.VersionedForeignKey(to='pretixbase.Event', related_name='restrictions_timerestriction_timerestriction', verbose_name='Event')),
                 ('item', versions.models.VersionedForeignKey(to='pretixbase.Item', blank=True, null=True, related_name='restrictions_timerestriction_timerestriction', verbose_name='Item')),
-                ('variations', pretixbase.models.VariationsField(to='pretixbase.ItemVariation', blank=True, verbose_name='Variations', related_name='restrictions_timerestriction_timerestriction')),
+                ('variations', pretix.base.models.VariationsField(to='pretixbase.ItemVariation', blank=True,
+                                                                  verbose_name='Variations', related_name='restrictions_timerestriction_timerestriction')),
             ],
             options={
                 'verbose_name': 'Restriction',

src/pretix/plugins/timerestriction/models.py

@@ -1,7 +1,7 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from pretixbase.models import BaseRestriction
+from pretix.base.models import BaseRestriction
 
 
 class TimeRestriction(BaseRestriction):

src/pretix/plugins/timerestriction/signals.py

@@ -3,10 +3,10 @@ from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 from django.forms.models import inlineformset_factory
 
-from pretixbase.signals import determine_availability
-from pretixbase.models import Item
-from pretixcontrol.views.forms import RestrictionInlineFormset, RestrictionForm
-from pretixcontrol.signals import restriction_formset
+from pretix.base.signals import determine_availability
+from pretix.base.models import Item
+from pretix.control.views.forms import RestrictionInlineFormset, RestrictionForm
+from pretix.control.signals import restriction_formset
 
 from .models import TimeRestriction
 

src/pretix/plugins/timerestriction/tests.py

@@ -3,13 +3,13 @@ from datetime import timedelta
 from django.test import TestCase
 from django.utils.timezone import now
 
-from pretixbase.models import (
+from pretix.base.models import (
     Event, Organizer, Item, Property, PropertyValue, ItemVariation
 )
 
 # Do NOT use relative imports here
-from pretixplugins.timerestriction import signals
-from pretixplugins.timerestriction.models import TimeRestriction
+from pretix.plugins.timerestriction import signals
+from pretix.plugins.timerestriction.models import TimeRestriction
 
 
 class TimeRestrictionTest(TestCase):

src/pretix/presale/__init__.py

@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class PretixPresaleConfig(AppConfig):
+    name = 'pretix.presale'
+    label = 'pretixpresale'
+
+default_app_config = 'pretix.presale.PretixPresaleConfig'

src/pretix/presale/middleware.py

@@ -1,7 +1,7 @@
 from django.core.urlresolvers import resolve
 from django.http import HttpResponseNotFound
 
-from pretixbase.models import Event
+from pretix.base.models import Event
 
 
 class EventMiddleware:

src/pretix/presale/static/pretixpresale/less/main.less

@@ -0,0 +1,5 @@
+@import "../../../../base/static/bootstrap/less/bootstrap.less";
+@import "../../../../base/static/fontawesome/less/font-awesome.less";
+@fa-font-path: "../../fontawesome/fonts";
+
+@import "event.less";