Format forum

forum/models.py

@@ -23,11 +23,9 @@
 #
 
 from django.db import models
-from django.core import validators
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import ValidationError
-from django.db import IntegrityError, transaction
 from django.core.urlresolvers import reverse
 from django.utils import timezone
 from django.utils.functional import cached_property
@@ -35,9 +33,10 @@ from django.utils.functional import cached_property
 from datetime import datetime
 import pytz
 
-from core.models import User, MetaGroup, Group, SithFile
+from core.models import User, Group
 from club.models import Club
 
+
 class Forum(models.Model):
     """
     The Forum class, made as a tree to allow nice tidy organization
@@ -118,10 +117,12 @@ class Forum(models.Model):
     def is_owned_by(self, user):
         if user.is_in_group(settings.SITH_GROUP_FORUM_ADMIN_ID):
             return True
-        try: m = Forum._club_memberships[self.id][user.id]
+        try:
+            m = Forum._club_memberships[self.id][user.id]
         except:
             m = self.owner_club.get_membership_for(user)
-            try: Forum._club_memberships[self.id][user.id] = m
+            try:
+                Forum._club_memberships[self.id][user.id] = m
             except:
                 Forum._club_memberships[self.id] = {}
                 Forum._club_memberships[self.id][user.id] = m
@@ -178,6 +179,7 @@ class Forum(models.Model):
             l += c.get_children_list()
         return l
 
+
 class ForumTopic(models.Model):
     forum = models.ForeignKey(Forum, related_name='topics')
     author = models.ForeignKey(User, related_name='forum_topics')
@@ -225,6 +227,7 @@ class ForumTopic(models.Model):
     def title(self):
         return self._title
 
+
 class ForumMessage(models.Model):
     """
     "A ForumMessage object represents a message in the forum" -- Cpt. Obvious
@@ -282,10 +285,11 @@ class ForumMessage(models.Model):
         return int(self.topic.messages.filter(id__lt=self.id).count() / settings.SITH_FORUM_PAGE_LENGTH) + 1
 
     def mark_as_read(self, user):
-        try: # Need the try/except because of AnonymousUser
+        try:  # Need the try/except because of AnonymousUser
             if not self.is_read(user):
                 self.readers.add(user)
-        except: pass
+        except:
+            pass
 
     def is_read(self, user):
         return (self.date < user.forum_infos.last_read_date) or (user in self.readers.all())
@@ -296,11 +300,13 @@ class ForumMessage(models.Model):
             return meta.action == "DELETE"
         return False
 
+
 MESSAGE_META_ACTIONS = [
     ('EDIT', _("Message edited by")),
     ('DELETE', _("Message deleted by")),
     ('UNDELETE', _("Message undeleted by")),
-        ]
+]
+
 
 class ForumMessageMeta(models.Model):
     user = models.ForeignKey(User, related_name="forum_message_metas")
@@ -326,4 +332,3 @@ class ForumUserInfo(models.Model):
 
     def __str__(self):
         return str(self.user)
-

forum/urls.py

@@ -22,7 +22,7 @@
 #
 #
 
-from django.conf.urls import url, include
+from django.conf.urls import url
 
 from forum.views import *
 

forum/views.py

@@ -22,30 +22,30 @@
 #
 #
 
-from django.shortcuts import render, get_object_or_404
+from django.shortcuts import get_object_or_404
 from django.views.generic import ListView, DetailView, RedirectView
 from django.views.generic.edit import UpdateView, CreateView, DeleteView
 from django.views.generic.detail import SingleObjectMixin
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.core.urlresolvers import reverse_lazy
 from django.utils import timezone
 from django.conf import settings
 from django import forms
-from django.db import models
 from django.core.exceptions import PermissionDenied
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 
-from ajax_select import make_ajax_form, make_ajax_field
+from ajax_select import make_ajax_field
 
-from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, CanCreateMixin, TabedViewMixin
+from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, CanCreateMixin
 from core.views.forms import MarkdownInput
-from core.models import Page
 from forum.models import Forum, ForumMessage, ForumTopic, ForumMessageMeta
 
+
 class ForumMainView(ListView):
     queryset = Forum.objects.filter(parent=None).prefetch_related("children___last_message__author", "children___last_message__topic")
     template_name = "forum/main.jinja"
 
+
 class ForumMarkAllAsRead(RedirectView):
     permanent = False
     url = reverse_lazy('forum:last_unread')
@@ -57,9 +57,11 @@ class ForumMarkAllAsRead(RedirectView):
             fi.save()
             for m in request.user.read_messages.filter(date__lt=fi.last_read_date):
                 m.readers.remove(request.user)  # Clean up to keep table low in data
-        except: pass
+        except:
+            pass
         return super(ForumMarkAllAsRead, self).get(request, *args, **kwargs)
 
+
 class ForumLastUnread(ListView):
     model = ForumTopic
     template_name = "forum/last_unread.jinja"
@@ -73,6 +75,7 @@ class ForumLastUnread(ListView):
             .prefetch_related('forum__edit_groups')
         return topic_list
 
+
 class ForumForm(forms.ModelForm):
     class Meta:
         model = Forum
@@ -80,6 +83,7 @@ class ForumForm(forms.ModelForm):
     edit_groups = make_ajax_field(Forum, 'edit_groups', 'groups', help_text="")
     view_groups = make_ajax_field(Forum, 'view_groups', 'groups', help_text="")
 
+
 class ForumCreateView(CanCreateMixin, CreateView):
     model = Forum
     form_class = ForumForm
@@ -93,12 +97,15 @@ class ForumCreateView(CanCreateMixin, CreateView):
             init['owner_club'] = parent.owner_club
             init['edit_groups'] = parent.edit_groups.all()
             init['view_groups'] = parent.view_groups.all()
-        except: pass
+        except:
+            pass
         return init
 
+
 class ForumEditForm(ForumForm):
     recursive = forms.BooleanField(label=_("Apply rights and club owner recursively"), required=False)
 
+
 class ForumEditView(CanEditPropMixin, UpdateView):
     model = Forum
     pk_url_kwarg = "forum_id"
@@ -112,12 +119,14 @@ class ForumEditView(CanEditPropMixin, UpdateView):
             self.object.apply_rights_recursively()
         return ret
 
+
 class ForumDeleteView(CanEditPropMixin, DeleteView):
     model = Forum
     pk_url_kwarg = "forum_id"
     template_name = "core/delete_confirm.jinja"
     success_url = reverse_lazy('forum:main')
 
+
 class ForumDetailView(CanViewMixin, DetailView):
     model = Forum
     template_name = "forum/forum.jinja"
@@ -139,6 +148,7 @@ class ForumDetailView(CanViewMixin, DetailView):
             kwargs["topics"] = paginator.page(paginator.num_pages)
         return kwargs
 
+
 class TopicForm(forms.ModelForm):
     class Meta:
         model = ForumMessage
@@ -148,6 +158,7 @@ class TopicForm(forms.ModelForm):
         }
     title = forms.CharField(required=True, label=_("Title"))
 
+
 class ForumTopicCreateView(CanCreateMixin, CreateView):
     model = ForumMessage
     form_class = TopicForm
@@ -166,12 +177,14 @@ class ForumTopicCreateView(CanCreateMixin, CreateView):
         form.instance.author = self.request.user
         return super(ForumTopicCreateView, self).form_valid(form)
 
+
 class ForumTopicEditView(CanEditMixin, UpdateView):
     model = ForumTopic
     fields = ['forum']
     pk_url_kwarg = "topic_id"
     template_name = "core/edit.jinja"
 
+
 class ForumTopicDetailView(CanViewMixin, DetailView):
     model = ForumTopic
     pk_url_kwarg = "topic_id"
@@ -186,7 +199,7 @@ class ForumTopicDetailView(CanViewMixin, DetailView):
             kwargs['first_unread_message_id'] = msg.id
         except:
             kwargs['first_unread_message_id'] = float("inf")
-        paginator = Paginator(self.object.messages.select_related('author__avatar_pict')\
+        paginator = Paginator(self.object.messages.select_related('author__avatar_pict')
                               .prefetch_related('topic__forum__edit_groups', 'readers').order_by('date'),
                               settings.SITH_FORUM_PAGE_LENGTH)
         page = self.request.GET.get('page')
@@ -198,6 +211,7 @@ class ForumTopicDetailView(CanViewMixin, DetailView):
             kwargs["msgs"] = paginator.page(paginator.num_pages)
         return kwargs
 
+
 class ForumMessageView(SingleObjectMixin, RedirectView):
     model = ForumMessage
     pk_url_kwarg = "message_id"
@@ -207,9 +221,10 @@ class ForumMessageView(SingleObjectMixin, RedirectView):
         self.object = self.get_object()
         return self.object.get_url()
 
+
 class ForumMessageEditView(CanEditMixin, UpdateView):
     model = ForumMessage
-    form_class = forms.modelform_factory(model=ForumMessage, fields=['title', 'message',], widgets={'message': MarkdownInput})
+    form_class = forms.modelform_factory(model=ForumMessage, fields=['title', 'message', ], widgets={'message': MarkdownInput})
     template_name = "forum/reply.jinja"
     pk_url_kwarg = "message_id"
 
@@ -222,6 +237,7 @@ class ForumMessageEditView(CanEditMixin, UpdateView):
         kwargs['topic'] = self.object.topic
         return kwargs
 
+
 class ForumMessageDeleteView(SingleObjectMixin, RedirectView):
     model = ForumMessage
     pk_url_kwarg = "message_id"
@@ -233,6 +249,7 @@ class ForumMessageDeleteView(SingleObjectMixin, RedirectView):
             ForumMessageMeta(message=self.object, user=self.request.user, action="DELETE").save()
         return self.object.get_absolute_url()
 
+
 class ForumMessageUndeleteView(SingleObjectMixin, RedirectView):
     model = ForumMessage
     pk_url_kwarg = "message_id"
@@ -244,9 +261,10 @@ class ForumMessageUndeleteView(SingleObjectMixin, RedirectView):
             ForumMessageMeta(message=self.object, user=self.request.user, action="UNDELETE").save()
         return self.object.get_absolute_url()
 
+
 class ForumMessageCreateView(CanCreateMixin, CreateView):
     model = ForumMessage
-    form_class = forms.modelform_factory(model=ForumMessage, fields=['title', 'message',], widgets={'message': MarkdownInput})
+    form_class = forms.modelform_factory(model=ForumMessage, fields=['title', 'message', ], widgets={'message': MarkdownInput})
     template_name = "forum/reply.jinja"
 
     def dispatch(self, request, *args, **kwargs):
@@ -277,4 +295,3 @@ class ForumMessageCreateView(CanCreateMixin, CreateView):
         kwargs = super(ForumMessageCreateView, self).get_context_data(**kwargs)
         kwargs['topic'] = self.topic
         return kwargs
-