Format com

com/admin.py

@@ -30,5 +30,3 @@ admin.site.register(Sith)
 admin.site.register(News)
 admin.site.register(Weekmail)
 
-
-

com/models.py

@@ -25,15 +25,14 @@
 from django.shortcuts import render
 from django.db import models, transaction
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse_lazy, reverse
+from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.contrib.staticfiles.templatetags.staticfiles import static
 from django.core.mail import EmailMultiAlternatives
-from django.core.exceptions import ValidationError
 
 from core.models import User, Preferences
 from club.models import Club
-import os
+
 
 class Sith(models.Model):
     """A one instance class storing all the modifiable infos"""
@@ -48,6 +47,7 @@ class Sith(models.Model):
     def __str__(self):
         return "⛩ Sith ⛩"
 
+
 NEWS_TYPES = [
     ('NOTICE', _('Notice')),
     ('EVENT', _('Event')),
@@ -55,6 +55,7 @@ NEWS_TYPES = [
     ('CALL', _('Call')),
 ]
 
+
 class News(models.Model):
     """The news class"""
     title = models.CharField(_("title"), max_length=64)
@@ -81,6 +82,7 @@ class News(models.Model):
     def __str__(self):
         return "%s: %s" % (self.type, self.title)
 
+
 class NewsDate(models.Model):
     """
     A date class, useful for weekly events, or for events that just have no date
@@ -95,6 +97,7 @@ class NewsDate(models.Model):
     def __str__(self):
         return "%s: %s - %s" % (self.news.title, self.start_date, self.end_date)
 
+
 class Weekmail(models.Model):
     """
     The weekmail class
@@ -144,6 +147,7 @@ class Weekmail(models.Model):
     def is_owned_by(self, user):
         return user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
 
+
 class WeekmailArticle(models.Model):
     weekmail = models.ForeignKey(Weekmail, related_name="articles", verbose_name=_("weekmail"), null=True)
     title = models.CharField(_("title"), max_length=64)

com/tests.py

@@ -28,7 +28,7 @@ from django.core.urlresolvers import reverse
 from django.core.management import call_command
 
 from core.models import User, RealGroup
-from com.models import Sith
+
 
 class ComTest(TestCase):
     def setUp(self):
@@ -56,4 +56,3 @@ class ComTest(TestCase):
         r = self.client.get(reverse("core:index"))
         self.assertTrue(r.status_code == 200)
         self.assertTrue("""<div id="info_box">\\n            <div class="markdown"><h3>INFO: <strong>Caaaataaaapuuuulte!!!!</strong></h3>""" in str(r.content))
-

com/urls.py

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

com/views.py

@@ -22,9 +22,9 @@
 #
 #
 
-from django.shortcuts import render, redirect, get_object_or_404
+from django.shortcuts import redirect, get_object_or_404
 from django.http import HttpResponseRedirect
-from django.views.generic import ListView, DetailView, RedirectView
+from django.views.generic import ListView, DetailView
 from django.views.generic.edit import UpdateView, CreateView, DeleteView
 from django.views.generic.detail import SingleObjectMixin
 from django.utils.translation import ugettext_lazy as _
@@ -49,6 +49,7 @@ from club.models import Club
 
 sith = Sith.objects.first
 
+
 class ComTabsMixin(TabedViewMixin):
     def get_tabs_title(self):
         return _("Communication administration")
@@ -82,6 +83,7 @@ class ComTabsMixin(TabedViewMixin):
         })
         return tab_list
 
+
 class ComEditView(ComTabsMixin, CanEditPropMixin, UpdateView):
     model = Sith
     template_name = 'core/edit.jinja'
@@ -89,21 +91,25 @@ class ComEditView(ComTabsMixin, CanEditPropMixin, UpdateView):
     def get_object(self, queryset=None):
         return Sith.objects.first()
 
+
 class AlertMsgEditView(ComEditView):
     fields = ['alert_msg']
     current_tab = "alert"
     success_url = reverse_lazy('com:alert_edit')
 
+
 class InfoMsgEditView(ComEditView):
     fields = ['info_msg']
     current_tab = "info"
     success_url = reverse_lazy('com:info_edit')
 
+
 class IndexEditView(ComEditView):
     fields = ['index_page']
     current_tab = "index"
     success_url = reverse_lazy('com:index_edit')
 
+
 class WeekmailDestinationEditView(ComEditView):
     fields = ['weekmail_destinations']
     current_tab = "weekmail_destinations"
@@ -111,6 +117,7 @@ class WeekmailDestinationEditView(ComEditView):
 
 # News
 
+
 class NewsForm(forms.ModelForm):
     class Meta:
         model = News
@@ -155,6 +162,7 @@ class NewsForm(forms.ModelForm):
                 end_date += timedelta(days=7)
         return ret
 
+
 class NewsEditView(CanEditMixin, UpdateView):
     model = News
     form_class = NewsForm
@@ -165,15 +173,17 @@ class NewsEditView(CanEditMixin, UpdateView):
         init = {}
         try:
             init['start_date'] = self.object.dates.order_by('id').first().start_date.strftime('%Y-%m-%d %H:%M:%S')
-        except: pass
+        except:
+            pass
         try:
             init['end_date'] = self.object.dates.order_by('id').first().end_date.strftime('%Y-%m-%d %H:%M:%S')
-        except: pass
+        except:
+            pass
         return init
 
     def post(self, request, *args, **kwargs):
         form = self.get_form()
-        if form.is_valid() and not 'preview' in request.POST.keys():
+        if form.is_valid() and 'preview' not in request.POST.keys():
             return self.form_valid(form)
         else:
             return self.form_invalid(form)
@@ -192,6 +202,7 @@ class NewsEditView(CanEditMixin, UpdateView):
                     Notification(user=u, url=reverse("com:news_detail", kwargs={'news_id': self.object.id}), type="NEWS_MODERATION").save()
         return super(NewsEditView, self).form_valid(form)
 
+
 class NewsCreateView(CanCreateMixin, CreateView):
     model = News
     form_class = NewsForm
@@ -201,12 +212,13 @@ class NewsCreateView(CanCreateMixin, CreateView):
         init = {'author': self.request.user}
         try:
             init['club'] = Club.objects.filter(id=self.request.GET['club']).first()
-        except: pass
+        except:
+            pass
         return init
 
     def post(self, request, *args, **kwargs):
         form = self.get_form()
-        if form.is_valid() and not 'preview' in request.POST.keys():
+        if form.is_valid() and 'preview' not in request.POST.keys():
             return self.form_valid(form)
         else:
             self.object = form.instance
@@ -224,6 +236,7 @@ class NewsCreateView(CanCreateMixin, CreateView):
                     Notification(user=u, url=reverse("com:news_detail", kwargs={'news_id': self.object.id}), type="NEWS_MODERATION").save()
         return super(NewsCreateView, self).form_valid(form)
 
+
 class NewsModerateView(CanEditMixin, SingleObjectMixin):
     model = News
     pk_url_kwarg = 'news_id'
@@ -240,11 +253,13 @@ class NewsModerateView(CanEditMixin, SingleObjectMixin):
             return redirect(self.request.GET['next'])
         return redirect('com:news_admin_list')
 
+
 class NewsAdminListView(CanEditMixin, ListView):
     model = News
     template_name = 'com/news_admin_list.jinja'
     queryset = News.objects.filter(dates__end_date__gte=timezone.now()).distinct().order_by('id')
 
+
 class NewsListView(CanViewMixin, ListView):
     model = News
     template_name = 'com/news_list.jinja'
@@ -255,6 +270,7 @@ class NewsListView(CanViewMixin, ListView):
         kwargs['timedelta'] = timedelta
         return kwargs
 
+
 class NewsDetailView(CanViewMixin, DetailView):
     model = News
     template_name = 'com/news_detail.jinja'
@@ -262,6 +278,7 @@ class NewsDetailView(CanViewMixin, DetailView):
 
 # Weekmail
 
+
 class WeekmailPreviewView(ComTabsMixin, CanEditPropMixin, DetailView):
     model = Weekmail
     template_name = 'com/weekmail_preview.jinja'
@@ -274,7 +291,8 @@ class WeekmailPreviewView(ComTabsMixin, CanEditPropMixin, DetailView):
             if request.POST['send'] == "validate":
                 self.object.send()
                 return HttpResponseRedirect(reverse('com:weekmail') + "?qn_weekmail_send_success")
-        except: pass
+        except:
+            pass
         return super(WeekmailEditView, self).get(request, *args, **kwargs)
 
     def get_object(self, queryset=None):
@@ -286,6 +304,7 @@ class WeekmailPreviewView(ComTabsMixin, CanEditPropMixin, DetailView):
         kwargs['weekmail_rendered'] = self.object.render_html()
         return kwargs
 
+
 class WeekmailEditView(ComTabsMixin, QuickNotifMixin, CanEditPropMixin, UpdateView):
     model = Weekmail
     template_name = 'com/weekmail.jinja'
@@ -341,6 +360,7 @@ class WeekmailEditView(ComTabsMixin, QuickNotifMixin, CanEditPropMixin, UpdateVi
         kwargs['orphans'] = WeekmailArticle.objects.filter(weekmail=None)
         return kwargs
 
+
 class WeekmailArticleEditView(ComTabsMixin, QuickNotifMixin, CanEditPropMixin, UpdateView):
     """Edit an article"""
     model = WeekmailArticle
@@ -351,6 +371,7 @@ class WeekmailArticleEditView(ComTabsMixin, QuickNotifMixin, CanEditPropMixin, U
     quick_notif_url_arg = "qn_weekmail_article_edit"
     current_tab = "weekmail"
 
+
 class WeekmailArticleCreateView(QuickNotifMixin, CreateView):
     """Post an article"""
     model = WeekmailArticle
@@ -363,7 +384,8 @@ class WeekmailArticleCreateView(QuickNotifMixin, CreateView):
         init = {}
         try:
             init['club'] = Club.objects.filter(id=self.request.GET['club']).first()
-        except: pass
+        except:
+            pass
         return init
 
     def post(self, request, *args, **kwargs):
@@ -385,14 +407,10 @@ class WeekmailArticleCreateView(QuickNotifMixin, CreateView):
         form.instance.author = self.request.user
         return super(WeekmailArticleCreateView, self).form_valid(form)
 
+
 class WeekmailArticleDeleteView(CanEditPropMixin, DeleteView):
     """Delete an article"""
     model = WeekmailArticle
     template_name = 'core/delete_confirm.jinja'
     success_url = reverse_lazy('com:weekmail')
     pk_url_kwarg = "article_id"
-
-
-
-
-