From 2f0bb5f39f0345ceba50fd4475ca14ff4af0e869 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Wed, 9 Sep 2015 23:56:34 +0200
Subject: [PATCH] Fixed import structure because testing was broken

---
 src/pretix/__init__.py           | 5 -----
 src/pretix/base/__init__.py      | 5 +++++
 src/pretix/base/services/mail.py | 5 +----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/pretix/__init__.py b/src/pretix/__init__.py
index 7f6d5e1c44..6c8e6b979c 100644
--- a/src/pretix/__init__.py
+++ b/src/pretix/__init__.py
@@ -1,6 +1 @@
 __version__ = "0.0.0"
-
-try:
-    from .celery import app as celery_app
-except ImportError:
-    pass
diff --git a/src/pretix/base/__init__.py b/src/pretix/base/__init__.py
index 41a919e4e0..adaa408c32 100644
--- a/src/pretix/base/__init__.py
+++ b/src/pretix/base/__init__.py
@@ -9,4 +9,9 @@ class PretixBaseConfig(AppConfig):
         from . import exporter  # NOQA
         from . import payment  # NOQA
 
+        try:
+            from .celery import app as celery_app  # NOQA
+        except ImportError:
+            pass
+
 default_app_config = 'pretix.base.PretixBaseConfig'
diff --git a/src/pretix/base/services/mail.py b/src/pretix/base/services/mail.py
index 09db5e9e05..1f4615d8c9 100644
--- a/src/pretix/base/services/mail.py
+++ b/src/pretix/base/services/mail.py
@@ -72,10 +72,7 @@ def mail(user: User, subject: str, template: str, context: dict=None, event: Eve
 
 
 def mail_send(to, subject, body, sender):
-    email = EmailMessage(
-        subject, body, sender,
-        to=to
-    )
+    email = EmailMessage(subject, body, sender, to=to)
 
     try:
         email.send(fail_silently=False)