WIP: Update to Python 3 and modern Django

.gitignore

@@ -2,13 +2,17 @@
 *.swp
 test.db*
 *.log
-sabot/settings.py
-sabot/prodSettings.py
-sabot/localSettings.py
+sabot/privateSettings.py
+sabot/local_settings.py
 sabot/conferenceSettings.py
 templates/sponsor/internalFaq.html
 templates/sponsor/publicFaq.html
 *.db
 media/*
 static/GitHub-Mark-32px.png
 d10env
+venv
+.idea
+*.bck
+*.old
+email_files

LICENSE

@@ -1,4 +1,8 @@
 The complete software part and website templates is licensed under the MIT License (see below).
+However, we use the python rt module that is licensed und GPLv3. As a consequence, this whole
+project is distributed under the terms of the GPLv3 even though all SaBot code itself is lisenced
+under the terms of the MIT License. If you want to use it under these terms, either disable the RT
+support on the code or provide an alternative implementation in sabot/rt.py.
 
 This license does not apply to
 - Sample invoice and offer documents provided in invoice/

account/backend.py

@@ -1,35 +1,36 @@
 import models
 from django.contrib.auth.models import User
 
+
 class TokenAuthenticationBackend(object):
-	supports_inactive_user = False
+    supports_inactive_user = False
 
-	def authenticate(self, token=None):
-		if token is None or len(token) == 0:
-			return None
-		try:
-			profile = models.UserProfile.objects.get(authToken__iexact=token)
-			return profile.user
-		except models.UserProfile.DoesNotExist:
-			return None
+    def authenticate(self, token=None):
+        if token is None or len(token) == 0:
+            return None
+        try:
+            profile = models.UserProfile.objects.get(authToken__iexact=token)
+            return profile.user
+        except models.UserProfile.DoesNotExist:
+            return None
 
+    def get_user(self, user_id):
+        try:
+            return User.objects.get(pk=user_id)
+        except User.DoesNotExist:
+            return None
 
-	def get_user(self, user_id):
-		try:
-			return User.objects.get(pk=user_id)
-		except User.DoesNotExist:
-			return None
 
 class APITokenMiddleware(object):
-	def __init__(self, get_response):
-		self.get_response = get_response
+    def __init__(self, get_response):
+        self.get_response = get_response
 
-	def __call__(self, request):
-		try:
-			token = request.META.get("HTTP_TOKEN")
-			if token is not None:
-				profile = models.UserProfile.objects.get(authToken__iexact=token)
-				request.user = profile.user
-		except models.UserProfile.DoesNotExist:
-			pass
-		return self.get_response(request)
+    def __call__(self, request):
+        try:
+            token = request.META.get("HTTP_TOKEN")
+            if token is not None:
+                profile = models.UserProfile.objects.get(authToken__iexact=token)
+                request.user = profile.user
+        except models.UserProfile.DoesNotExist:
+            pass
+        return self.get_response(request)

account/forms.py

@@ -1,50 +1,51 @@
-from registration.forms import RegistrationFormUniqueEmail
 from django import forms
+from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
 
+
+from django_registration.forms import RegistrationFormUniqueEmail
 from captcha.fields import ReCaptchaField
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Field, Submit, Div, HTML
-from crispy_forms.bootstrap import FormActions, StrictButton, TabHolder, Tab
 
 
 class RegistrationFormNameAndUniqueEmail(RegistrationFormUniqueEmail):
-	class Meta(RegistrationFormUniqueEmail.Meta):
-		fields = [
-			'username',
-			'first_name',
-			'last_name',
-			'email',
-			'password1',
-			'password2'
-		]
-		required_css_class = 'required'
+    class Meta(RegistrationFormUniqueEmail.Meta):
+        fields = [
+            User.USERNAME_FIELD,
+            User.get_email_field_name(),
+            "first_name",
+            "last_name",
+            "password1",
+            "password2",
+        ]
+        required_css_class = "required"
 
-	captcha = ReCaptchaField()
+    captcha = ReCaptchaField()
 
 
 class UserProfileForm(forms.Form):
-	firstName = forms.CharField(max_length=64,label=_("First name"))
-	lastName = forms.CharField(max_length=64,label=_("Last name"))
-	email = forms.EmailField(max_length=75,label=_("E-mail"))
+    firstName = forms.CharField(max_length=64, label=_("First name"))
+    lastName = forms.CharField(max_length=64, label=_("Last name"))
+    email = forms.EmailField(max_length=75, label=_("E-mail"))
 
-	def __init__(self, *args, **kwargs):
-		super(UserProfileForm, self).__init__(*args, **kwargs)
-		self.helper = FormHelper()
-		self.helper.add_input(Submit("Save","Save"))
+    def __init__(self, *args, **kwargs):
+        super(UserProfileForm, self).__init__(*args, **kwargs)
+        self.helper = FormHelper()
+        self.helper.add_input(Submit("Save", "Save"))
 
 
 class SetPasswordForm(forms.Form):
-	password1 = forms.CharField(widget=forms.PasswordInput, label=_("Password"))
-	password2 = forms.CharField(widget=forms.PasswordInput, label=_("Password (again)"))
-
-	def clean(self):
-		if 'password1' in self.cleaned_data and 'password2' in self.cleaned_data:
-			if self.cleaned_data['password1'] != self.cleaned_data['password2']:
-				raise forms.ValidationError(_("The two password fields didn't match."))
-		return self.cleaned_data
-
-	def __init__(self, *args, **kwargs):
-		super(SetPasswordForm, self).__init__(*args, **kwargs)
-		self.helper = FormHelper()
-		self.helper.add_input(Submit("submit","Set password"))
+    password1 = forms.CharField(widget=forms.PasswordInput, label=_("Password"))
+    password2 = forms.CharField(widget=forms.PasswordInput, label=_("Password (again)"))
+
+    def clean(self):
+        if "password1" in self.cleaned_data and "password2" in self.cleaned_data:
+            if self.cleaned_data["password1"] != self.cleaned_data["password2"]:
+                raise forms.ValidationError(_("The two password fields didn't match."))
+        return self.cleaned_data
+
+    def __init__(self, *args, **kwargs):
+        super(SetPasswordForm, self).__init__(*args, **kwargs)
+        self.helper = FormHelper()
+        self.helper.add_input(Submit("submit", "Set password"))

account/migrations/0001_initial.py

@@ -17,11 +17,26 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.CreateModel(
-            name='UserProfile',
+            name="UserProfile",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('authToken', models.CharField(max_length=64, null=True)),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='legacy_profile', to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("authToken", models.CharField(max_length=64, null=True)),
+                (
+                    "user",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="legacy_profile",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
         ),
     ]

account/models.py

@@ -1,8 +1,9 @@
 from django.db import models
 from django.contrib.auth.models import User
-from django.db.models.signals import post_save
 
-class UserProfile(models.Model):
-	user = models.OneToOneField(User, related_name="legacy_profile")
-	authToken = models.CharField(max_length=64, null=True)
 
+class UserProfile(models.Model):
+    user = models.OneToOneField(
+        User, related_name="legacy_profile", on_delete=models.CASCADE
+    )
+    authToken = models.CharField(max_length=64, null=True)