Diverse Code Cleanups

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

events/models.py

@@ -31,7 +31,7 @@ CHOICES_VERTICAL = (
 
 
 def get_upload_path(instance, filename):
-    '''
+    """
     Generates the desired file path and filename for an uploaded Image.
     With this function Django can save the uploaded images to subfolders that
     also have a meaning for humans.
@@ -40,7 +40,7 @@ def get_upload_path(instance, filename):
     @type instance: a instace of an models.Model sub-class.
     @param filename: The filename of the uploaded image.
     @type filename: String
-    '''
+    """
     extension = filename[filename.rfind('.') + 1:]
     if isinstance(instance, Event):
         if instance.id:
@@ -57,9 +57,9 @@ def get_upload_path(instance, filename):
 
 
 def post_save_image(sender, instance=None, created=False, raw=False, **kwargs):
-    '''
+    """
     Reganerate the images.
-    '''
+    """
     os.remove(instance.display.path)
     os.remove(instance.callout.path)
     os.remove(instance.thumbnail.path)
@@ -95,7 +95,7 @@ class CalloutImage(ImageSpec):
 class DisplayImage(ImageSpec):
     format = 'PNG'
     processors = [processors.Transpose(),
-            processors.ResizeToFit(width=940, height=940, upscale=False)]
+                  processors.ResizeToFit(width=940, height=940, upscale=False)]
 
 
 class ThumbnailImage(CalloutImage):
@@ -121,7 +121,7 @@ class ImageModel(models.Model):
         except AttributeError:
             return None
         if anchor_horizontal and anchor_vertical:
-            return (self.anchor_horizontal, self.anchor_vertical)
+            return self.anchor_horizontal, self.anchor_vertical
         else:
             return None
 
@@ -130,7 +130,6 @@ class ImageModel(models.Model):
 
 
 class EventManager(models.Manager):
-
     def current_event(self):
         try:
             current = self.filter(start__lte=now())
@@ -164,15 +163,15 @@ class Event(ImageModel):
     end = models.DateTimeField(_('End'), blank=True, null=True)
     url = models.URLField(_('Homepage'), blank=True)
     image = models.ImageField(_("Image"), upload_to=get_upload_path,
-        storage=OverwriteStorage(), blank=True, null=True)
+                              storage=OverwriteStorage(), blank=True, null=True)
     is_tournament = models.BooleanField(_('Tournament'), default=False,
-        help_text=_(u'This event is a tournament, different rules apply for \
+                                        help_text=_(u'This event is a tournament, different rules apply for \
         the kyu ranking.'))
     photo_count = models.PositiveIntegerField(default=0, editable=False)
     event_series = models.ForeignKey('Event', blank=True, null=True,
-        on_delete=models.SET_NULL, editable=False,
-        verbose_name=_('Event Series'),
-        help_text=_(u'Wenn dieser Event zu einer Veranstaltungsreihe gehört \
+                                     on_delete=models.SET_NULL, editable=False,
+                                     verbose_name=_('Event Series'),
+                                     help_text=_(u'Wenn dieser Event zu einer Veranstaltungsreihe gehört \
         werden Ort, Beschreibung, Bild und Homepage von dem hier angegebenen \
         Event übernommen.'))
     objects = EventManager()
@@ -185,7 +184,7 @@ class Event(ImageModel):
     def __unicode__(self):
         try:
             return "%(name)s (%(date)s)" % {'name': self.name,
-                'date': self.start.date()}
+                                            'date': self.start.date()}
         except:
             return "New Event Model"
 
@@ -248,7 +247,7 @@ class Location(ImageModel):
     name = models.CharField(_("Name"), max_length=200)
     description = models.TextField(_("Description"), blank=True)
     image = models.ImageField(_("Image"), upload_to=get_upload_path,
-        storage=OverwriteStorage(), blank=True, null=True)
+                              storage=OverwriteStorage(), blank=True, null=True)
     url = models.URLField(_('Homepage'), blank=True)
     postal_code = models.CharField(_('Postal Code'), max_length=6)
     street_address = models.CharField(_('Street Address'), max_length=127)
@@ -283,7 +282,7 @@ class PhotoManager(models.Manager):
 class Photo(ImageModel):
     name = models.CharField(_("Name"), max_length=100, blank=True)
     image = models.ImageField(_("Image"), upload_to=get_upload_path,
-        storage=OverwriteStorage())
+                              storage=OverwriteStorage())
     anchor_horizontal = models.FloatField(
         _('horizontal Anchorpoint'),
         choices=CHOICES_HORIZONTAL,
@@ -300,14 +299,23 @@ class Photo(ImageModel):
     )
 
     event = models.ForeignKey(Event)
-    description = models.TextField(_("Description"), max_length=300,
-        blank=True)
-    photographer = models.ForeignKey('auth.User')
-    on_startpage = models.BooleanField(_("Startpage"), default=False,
-        help_text=_('Display this Photo on the Startpage Teaser'))
+    description = models.TextField(
+        _("Description"),
+        max_length=300,
+        blank=True
+    )
+    photographer = models.ForeignKey(settings.AUTH_USER_MODEL)
+    on_startpage = models.BooleanField(
+        _("Startpage"),
+        default=False,
+        help_text=_('Display this Photo on the Startpage Teaser')
+    )
     created_date = models.DateTimeField(_("Published on"))
-    views = models.PositiveIntegerField(_("Number of views"), editable=False,
-        default=0)
+    views = models.PositiveIntegerField(
+        _("Number of views"),
+        editable=False,
+        default=0
+    )
     objects = PhotoManager()
     metadata = None
     orientation = 1
@@ -340,12 +348,12 @@ class Photo(ImageModel):
         self.metadata.write()
 
     def rotate(self, rotate):
-        '''
+        """
         Sets an the Exif tag in an image to set the right direction.
         This provides lossless image rotation.
         @param rotate: 'clockwise' or 'counter-clockwise' the direction in
         which we should rotate the image in 90° steps.
-        '''
+        """
         if not self.metadata:
             self.read_metadata()
         if rotate == 'clockwise':
@@ -369,24 +377,27 @@ class Photo(ImageModel):
         self.save()
 
     def get_absolute_url(self):
-        return reverse('event-photo', kwargs={'event': self.event.id,
-            'pk': self.id})
+        return reverse(
+            'event-photo',
+            kwargs={'event': self.event.id, 'pk': self.id}
+        )
 
     @property
     def next_photo(self):
-            return self.get_next_by_created_date(event=self.event)
+        return self.get_next_by_created_date(event=self.event)
 
     @property
     def previous_photo(self):
-            return self.get_previous_by_created_date(event=self.event)
+        return self.get_previous_by_created_date(event=self.event)
 
     def save(self, **kwargs):
-        '''
+        """
         Triggers to save related Event to save. This should force an update for
         the denormalized Photo count.
-        '''
+        """
         ImageModel.save(self, **kwargs)
         self.save_metadata()
         self.event.save()
 
+
 models.signals.post_save.connect(post_save_image, sender=Photo)