Diverse Code Cleanups

*Code wurde PEP-8 gerecht formatiert
* Kleine Fehler die der PyCharm Inspector beanstandet wurden korrigiert

membership/models.py

@@ -4,7 +4,6 @@ from . import PAID_MEMBERSHIP_GROUP
 from datetime import timedelta
 from django.utils import timezone
 from django.conf import settings
-from django.contrib.auth.models import User
 from django.core.exceptions import FieldError
 from django.core.urlresolvers import reverse
 from django.db import models
@@ -23,29 +22,29 @@ GENDER_CHOICES = (
 
 
 def get_upload_path(instance, filename):
-    '''
+    """
     Erstellt den Pfad und Dateinamen für den Upload dynmisch.
 
     @param instance: The Membership Object for the uploaded image
     @param filename: the filename of the uploaded image
-    '''
+    """
     extension = path.splitext(filename)[1]
     return 'membership/%s%s' % (instance.user.username, extension)
 
 
 class ActivationManager(models.Manager):
-    '''
+    """
     Manages pending user registrations
-    '''
+    """
 
     def activate(self, activation_key):
-        '''
+        """
         searches the pending registrations for the given activation key.
         Set the corresponding user to active, if the key was found
         and the key has not expired yet.s
 
         @param activation_key: the key found in the activation email
-        '''
+        """
         try:
             activation_request = self.get(activation_key=activation_key)
             if activation_request.expired():
@@ -61,10 +60,10 @@ class ActivationManager(models.Manager):
             return False
 
     def create_pending_registration(self, user):
-        '''
+        """
         creates a PendingActivation instance with an random activation key.
         @param user: the user that requests activation.
-        '''
+        """
         salt = str(random.random())
         activation_key = hashlib.sha1(salt + user.username).hexdigest()
 
@@ -78,12 +77,16 @@ class ActivationManager(models.Manager):
 
 
 class ActivationRequest(models.Model):
-    '''
+    """
     Each ActivationRequest contains an activation key and an user.
     The key will be send by email to the user
     if the user clicks on the link he can activate his in_active account.
-    '''
-    user = models.ForeignKey(User, unique=True, verbose_name=_('user'))
+    """
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        unique=True,
+        verbose_name=_('user')
+    )
     activation_key = models.CharField(_('activation key'), max_length=40)
     objects = ActivationManager()
 
@@ -115,6 +118,7 @@ class ActivationRequest(models.Model):
             return True
         else:
             return False
+
     expired.boolean = True
 
     @property
@@ -135,28 +139,26 @@ class ActivationRequest(models.Model):
 
 
 class MembershipManager(models.Manager):
-
     def get(self, *args, **kwargs):
-        '''
+        """
         First try's to fetch the requested Membership Object from the Database,
         if the requestetd Membership does not Exists (yet) try to fetch the
         corresponding User, and create the Membership with the filled in
         Userdata.
-        '''
+        """
         try:
             if 'username' in kwargs:
                 return models.Manager.get(self,
-                    user__username=kwargs['username']
-                )
+                                          user__username=kwargs['username'])
             else:
                 return models.Manager.get(self, *args, **kwargs)
         except FieldError:
-            user = User.objects.get(*args, **kwargs)
+            user = settings.AUTH_USER_MODEL.objects.get(*args, **kwargs)
         except Membership.DoesNotExist:
             if 'user' in kwargs:
-                user = User.objects.get(pk=kwargs['user'].id)
+                user = settings.AUTH_USER_MODEL.objects.get(pk=kwargs['user'].id)
             else:
-                user = User.objects.get(*args, **kwargs)
+                user = settings.AUTH_USER_MODEL.objects.get(*args, **kwargs)
 
         membership = Membership(
             user=user,
@@ -169,7 +171,10 @@ class MembershipManager(models.Manager):
 
 
 class Membership(models.Model):
-    user = models.OneToOneField(User)
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        unique=True
+    )
     nickname = models.SlugField(_('Nickname'), unique=True)
     gender = models.CharField(
         _("Gender"),
@@ -186,39 +191,46 @@ class Membership(models.Model):
         blank=True,
         null=True
     )
-    membership = models.BooleanField(_('Membership'),
+    membership = models.BooleanField(
+        _('Membership'),
         default=False,
         help_text=_('Yes, I confirm that I am in agreement with the statutes \
         and would like to become a member.')
     )
     birthday = models.DateField(_("Birthday Date"), blank=True, null=True)
-    telephone = models.CharField(_("Telephone"),
+    telephone = models.CharField(
+        _("Telephone"),
         max_length=30,
         blank=True,
         null=True
     )
-    street_name = models.CharField(_("Address"),
+    street_name = models.CharField(
+        _("Address"),
         max_length=75,
         blank=True,
         null=True
     )
-    post_code = models.PositiveSmallIntegerField(_("Postcode"),
+    post_code = models.PositiveSmallIntegerField(
+        _("Postcode"),
         blank=True,
         null=True
     )
-    city = models.CharField(_("Town/City"),
+    city = models.CharField(
+        _("Town/City"),
         max_length=75,
         blank=True,
         null=True
     )
     deposit = models.PositiveSmallIntegerField(default=0, editable=False)
     registration_date = models.DateField(auto_now_add=True, editable=False)
-    paid_until = models.DateField(_('Paid until'),
+    paid_until = models.DateField(
+        _('Paid until'),
         blank=True,
         null=True,
         editable=True
     )
-    confirmed = models.BooleanField(_('Confirmed'),
+    confirmed = models.BooleanField(
+        _('Confirmed'),
         default=False,
         help_text=_('This person has paid the membership fee.')
     )
@@ -258,7 +270,8 @@ class Membership(models.Model):
             self.email = self.user.email
 
     def get_absolute_url(self):
-        return reverse('membership-details',
+        return reverse(
+            'membership-details',
             kwargs={'username': self.user.username}
         )