Fehlerbereinigung.

Mahjong Ranking berechnet nun die richtigen Ränge zu den legendären Kyu/Dan Punkten.

Stablie Version bevor die Datenstruktur des Mahjongrankings vereinfacht wird.

src/utils/html5/forms.py

@@ -245,15 +245,15 @@ class ReCaptchaField(django.forms.fields.CharField):
         response_value = values[1]
         super(ReCaptchaField, self).clean(response_value)
         if not challenge_value:
-            raise util.ValidationError(
+            raise ValidationError(
                 _(u'The CAPTCHA challenge is missing.'))
         elif not response_value:
-            raise util.ValidationError(
+            raise ValidationError(
                 _(u'The CAPTCHA solution is missing.'))
         elif self._check_recaptcha(challenge_value, response_value):
             return challenge_value
         else:
-            raise util.ValidationError(
+            raise ValidationError(
                 _(u'The CAPTCHA solution was incorrect.'))
 
 

src/utils/massmailer.py

@@ -4,9 +4,7 @@ from django.core import mail
 from django.contrib.sites.models import Site
 from django.conf import settings
 from django.template import loader, Context
-
-
-USER_MODEL = settings.AUTH_USER_MODEL
+from django.contrib.auth import get_user_model
 
 class MassMailer(object):
     """
@@ -21,6 +19,7 @@ class MassMailer(object):
     html_template = None
 
     def __init__(self, subject=None, template=None, context=None):
+        self.USER_MODEL = get_user_model()
         self.mail_queue = set()
         self.recipients = set()
         self.subject = subject
@@ -45,14 +44,14 @@ class MassMailer(object):
         self.log.debug("closed the SMTP connection. I'm done")
 
     def add_recipient(self, recipient):
-        if isinstance(recipient, USER_MODEL):
+        if isinstance(recipient, self.USER_MODEL):
             self.recipients.add(recipient)
         else:
             self.log.warn('%s is not a User Object!', recipient)
 
     def add_recipients(self, user_list):
         for user in user_list:
-            if isinstance(user, USER_MODEL):
+            if isinstance(user, self.USER_MODEL):
                 self.log.debug('Adding %s as Recipient' % user)
                 self.recipients.add(user)
             else: