Diverse Code Cleanups

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

events/views.py

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
 # Create your views here.
-from . import models, forms
 from datetime import timedelta
+
 from django.contrib.auth.decorators import permission_required
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
 from django.http import HttpResponse, Http404
 from django.shortcuts import redirect
@@ -13,8 +13,11 @@ from django.utils.translation import ugettext as _
 from django.views import generic
 from icalendar import Calendar, Event
 import pyexiv2
+
 from utils.mixins import PermissionRequiredMixin
 
+from . import models, forms
+
 
 class DeleteEventPhoto(generic.DeleteView):
     model = models.Photo
@@ -22,6 +25,7 @@ class DeleteEventPhoto(generic.DeleteView):
     def get_object(self, queryset=None):
         return models.Photo.objects.get(pk=self.kwargs['pk'])
     """
+
     def get_success_url(self):
         return reverse('event-photo-list', args=[self.object.event.id])
 
@@ -29,18 +33,22 @@ class DeleteEventPhoto(generic.DeleteView):
     def dispatch(self, *args, **kwargs):
         return super(DeleteEventPhoto, self).dispatch(*args, **kwargs)
 
+
 class EventArchiveIndex(generic.ArchiveIndexView):
     allow_empty = True
     context_object_name = 'event_list'
     date_field = 'start'
     model = models.Event
-    paginate_by = 5
+    queryset = model.objects.all()
+    paginate_by = 15
+
 
     def get_context_data(self, **kwargs):
         context = generic.ArchiveIndexView.get_context_data(self, **kwargs)
         context['is_archive'] = True
         return context
 
+
 class EventArchiveMonth(generic.MonthArchiveView):
     date_field = 'start'
     make_object_list = True
@@ -54,6 +62,7 @@ class EventArchiveMonth(generic.MonthArchiveView):
         context['is_archive'] = True
         return context
 
+
 class EventArchiveYear(generic.YearArchiveView):
     date_field = 'start'
     make_object_list = True
@@ -67,24 +76,26 @@ class EventArchiveYear(generic.YearArchiveView):
         context['is_archive'] = True
         return context
 
+
 class EventDetail(generic.DetailView):
     model = models.Event
 
     def get_context_data(self, **kwargs):
         context = generic.DetailView.get_context_data(self, **kwargs)
-        context['form'] = forms.PhotoUploadForm(initial={'event':self.object, 'photographer': self.request.user})
+        context['form'] = forms.PhotoUploadForm(initial={'event': self.object, 'photographer': self.request.user})
         return context
 
+
 class EventForm(PermissionRequiredMixin, generic.UpdateView):
     form_class = forms.EventForm
     permission_required = 'events.add_event'
 
     def get_object(self, queryset=None):
-        '''
+        """
         If an id has been submitted, try return the existing Event for an update,
         else creates a new one.
         @param queryset:
-        '''
+        """
         if self.kwargs.get('pk'):
             event = models.Event.objects.get(pk=self.kwargs['pk'])
             if event.event_series:
@@ -94,15 +105,17 @@ class EventForm(PermissionRequiredMixin, generic.UpdateView):
         else:
             return models.Event()
 
+
 class EventGallery(generic.ListView):
     template_name = 'events/photo_gallery.html'
     queryset = models.Event.objects.filter(start__lt=timezone.now(), photo_count__gt=0)
     paginate_by = 12
 
+
 class EventListIcal(generic.View):
-    '''
+    """
     Generates an returns an iCal File with all upcoming events.
-    '''
+    """
 
     def add_event(self, event):
         ics_event = Event()
@@ -130,6 +143,7 @@ class EventListIcal(generic.View):
         response.write(self.calendar.to_ical())
         return response
 
+
 class EventPhoto(generic.UpdateView):
     form_class = forms.EditPhotoForm
     model = models.Photo
@@ -144,6 +158,7 @@ class EventPhoto(generic.UpdateView):
         else:
             return generic.UpdateView.post(self, request, *args, **kwargs)
 
+
 class EventPhotoList(generic.ListView):
     context_object_name = 'photo_list'
     paginate_by = 36
@@ -151,7 +166,7 @@ class EventPhotoList(generic.ListView):
     def get_context_data(self, **kwargs):
         context = generic.ListView.get_context_data(self, **kwargs)
         context['event'] = self.event
-        context['form'] = forms.PhotoUploadForm(initial={'event':self.event, 'photographer': self.request.user})
+        context['form'] = forms.PhotoUploadForm(initial={'event': self.event, 'photographer': self.request.user})
         return context
 
     def get_queryset(self):
@@ -161,6 +176,7 @@ class EventPhotoList(generic.ListView):
         except models.Event.DoesNotExist:
             raise Http404(_('Event does not exist'))
 
+
 class EventPhotoUpload(generic.FormView):
     form_class = forms.PhotoUploadForm
     template_name = 'events/photo_upload.html'
@@ -175,24 +191,20 @@ class EventPhotoUpload(generic.FormView):
         return context
 
     def get_initial(self):
-        '''
+        """
         Set the current logged in user a default value for the photographer.
-        '''
+        """
         return {
             'photographer': self.request.user,
         }
 
     def post(self, *args, **kwargs):
-        '''
-        
-        '''
-        self.event = models.Event.objects.get(id=self.request.REQUEST.get('event'))
-        photographer = self.request.POST.get('photographer')
-        if photographer:
-            photographer = User.objects.get(id=photographer)
-        else:
-            photographer = self.request.user
+        """
 
+        """
+        self.event = models.Event.objects.get(id=self.request.REQUEST.get('event'))
+        photographer = self.request.POST.get('photographer', self.request.user.id)
+        photographer = get_user_model().objects.get(id=photographer)
         self.counter = 1
         for upload in self.request.FILES.getlist('upload'):
             name = upload.name
@@ -221,8 +233,9 @@ class EventPhotoUpload(generic.FormView):
             description = exif_data['Exif.Image.ImageDescription'].value
         except:
             description = ''
-        return (created_date, description)
+        return created_date, description
+
 
 class UpcomingEvents(generic.ListView):
     queryset = models.Event.objects.upcoming(limit=None)
-    paginate_by = 12
+    paginate_by = 16