fixes with autopep8

bt/admin.py

 from django.contrib import admin
 from bt import models
 
+
 class CommentInline(admin.TabularInline):
-   model = models.Comment
-   max_num = 1
+    model = models.Comment
+    max_num = 1
+
 
 class ViolationAdmin(admin.ModelAdmin):
-   list_display = ('state', 'country', 'operator', 'contract', 'resource_name', 'media', 'activationid', 'old', 'creation_date')
-   list_filter = ('state', 'operator_ref', 'contract', 'resource_name', 'media', 'country', 'old')
-   inlines = [CommentInline, ]
+    list_display = ('state', 'country', 'operator', 'contract', 'resource_name', 'media', 'activationid', 'old', 'creation_date')
+    list_filter = ('state', 'operator_ref', 'contract', 'resource_name', 'media', 'country', 'old')
+    inlines = [CommentInline, ]
+
+
 admin.site.register(models.Violation, ViolationAdmin)
 
+
 class CommentAdmin(admin.ModelAdmin):
-   list_display = ('violation', 'submitter_name', 'comment')
-   list_filter = ('violation', 'submitter_name')
+    list_display = ('violation', 'submitter_name', 'comment')
+    list_filter = ('violation', 'submitter_name')
+
+
 admin.site.register(models.Comment, CommentAdmin)
 
+
 class AttachmentAdmin(admin.ModelAdmin):
-   list_display = ('name', 'comment')
+    list_display = ('name', 'comment')
+
+
 admin.site.register(models.Attachment, AttachmentAdmin)
 
+
 class ConfirmationAdmin(admin.ModelAdmin):
-   list_display = ('violation', 'key')
-   list_filter = ('violation__operator_ref', 'violation__contract', 'violation__resource_name', 'violation__media', 'violation__country')
+    list_display = ('violation', 'key')
+    list_filter = ('violation__operator_ref', 'violation__contract', 'violation__resource_name', 'violation__media', 'violation__country')
+
+
 admin.site.register(models.Confirmation, ConfirmationAdmin)
 
+
 class FeaturedCaseAdmin(admin.ModelAdmin):
     pass
+
+
 admin.site.register(models.FeaturedCase, FeaturedCaseAdmin)
 
+
 class OperatorAdmin(admin.ModelAdmin):
-   list_display = ("__unicode__", "reported_violations")
-   search_fields = ('name', )
-   pass
-admin.site.register(models.Operator, OperatorAdmin)
\ No newline at end of file
+    list_display = ("__unicode__", "reported_violations")
+    search_fields = ('name', )
+    pass
+
+
+admin.site.register(models.Operator, OperatorAdmin)

bt/api.py

@@ -5,7 +5,7 @@ from tastypie.resources import ModelResource, ALL, ALL_WITH_RELATIONS
 from bt.models import Violation, Operator
 
 
-#class UserResource(ModelResource):
+# class UserResource(ModelResource):
 #    class Meta:
 #        queryset = User.objects.all()
 #        resource_name = 'auth/user'

bt/feeds.py

@@ -2,6 +2,7 @@ from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
 from bt.models import Violation
 
+
 class RssSiteNewsFeed(Feed):
     title = "NNMON - Latest NN Infringements"
     link = "/"
@@ -17,7 +18,7 @@ class RssSiteNewsFeed(Feed):
     def item_title(self, item):
         return "%s (%s) %s" % (item.operator, item.country, item.contract)
 
+
 class AtomSiteNewsFeed(RssSiteNewsFeed):
     feed_type = Atom1Feed
     subtitle = RssSiteNewsFeed.description
-

bt/forms.py

@@ -8,16 +8,19 @@ from bt.multifile import MultiFileField
 from operator import itemgetter
 from captcha.fields import CaptchaField
 
+
 class AdvancedEditor(forms.Textarea):
     class Media:
-        js = (settings.MEDIA_URL+'/js/tinymce/tiny_mce.js',)
+        js = (settings.MEDIA_URL + '/js/tinymce/tiny_mce.js',)
 
         def __init__(self, language=None, attrs=None):
             self.language = language or settings.LANGUAGE_CODE[:2]
             self.attrs = {'class': 'advancededitor'}
-            if attrs: self.attrs.update(attrs)
+            if attrs:
+                self.attrs.update(attrs)
             super(AdvancedEditor, self).__init__(attrs)
 
+
 class AddViolation(forms.Form):
     resource_name = forms.CharField(required=True, max_length=4096, label=_('Please describe the discrimination'), help_text=_("What service or site, or person is unavailable or seems artificially slowed down. e.g. VoIP, p2p, filesharing, specific websites, etc."))
     country = forms.ChoiceField(required=True, choices=(('',''),)+tuple(sorted(COUNTRIES,key=itemgetter(1))), label=_("Country"), help_text=_('EU member state where the discrimination is reported.'))
@@ -67,5 +70,6 @@ class SearchViolation(SearchForm):
 
         return sqs
 
+
 class QuickSearchViolation(forms.Form):
     query = forms.CharField(required='True', max_length=256, label=_("Search"), help_text=_('Search for an existing violation'))

bt/models.py

@@ -36,7 +36,7 @@ COUNTRIES = (
     ('FI', _('Finland')),
     ('SE', _('Sweden')),
     ('UK', _('United Kingdom')),
-    )
+)
 RESOURCES = (
     ('other', _('other')),
     ('port', _('port')),
@@ -48,7 +48,7 @@ RESOURCES = (
     ('video', _('video streaming')),
     ('audio', _('audio streaming')),
     ('class', _('class of application or contraint')),
-    )
+)
 TYPES = (
     ('zerorating', _('Zero Rating')),
     ('specialised', _('Specialised Service')),
@@ -56,11 +56,11 @@ TYPES = (
     ('throttling', _('Throttling')),
     ('prioritisation', _('Prioritisation')),
     ('other', _('Other'))
-    )
+)
 MEDIA = (
     ('fixed', _('Fixed')),
     ('mobile', _('Mobile')),
-    )
+)
 STATUS = (
     ('moreinfo', _('Need more info')),
     ('new', _('New')),
@@ -69,7 +69,8 @@ STATUS = (
     ('ooscope', _('Out of scope')),
     ('resolved', _('Resolved')),
     ('closed', _('Closed')),
-    )
+)
+
 
 class Operator(models.Model):
     """
@@ -85,6 +86,7 @@ class Operator(models.Model):
     def __unicode__(self):
         return self.name
 
+
 class Violation(models.Model):
     country = models.CharField(max_length=2, choices=COUNTRIES)
     operator_ref = models.ForeignKey(Operator, related_name="violations")
@@ -92,12 +94,12 @@ class Violation(models.Model):
     resource = models.CharField(max_length=20, choices=RESOURCES, blank=True)
     resource_name = models.CharField(max_length=4096, blank=True)
     type = models.CharField(max_length=20, choices=TYPES, blank=True)
-    media = models.CharField( max_length=20, choices=MEDIA, blank=True)
-    temporary = models.BooleanField( )
+    media = models.CharField(max_length=20, choices=MEDIA, blank=True)
+    temporary = models.BooleanField()
     contractual = models.BooleanField()
     contract_excerpt = models.TextField(null=True, blank=True)
     loophole = models.BooleanField()
-    activationid= models.CharField(max_length=128, null=True, blank=True)
+    activationid = models.CharField(max_length=128, null=True, blank=True)
     state = models.CharField(max_length=20, choices=STATUS, default='new', blank=True)
     editorial = models.TextField(null=True, blank=True)
     old = models.BooleanField(default="False")
@@ -131,7 +133,7 @@ class Violation(models.Model):
 class Comment(models.Model):
     submitter_email = models.EmailField()
     submitter_name = models.CharField(max_length=20)
-    consent = models.BooleanField( )
+    consent = models.BooleanField()
     comment = models.TextField()
     timestamp = models.DateTimeField()
     violation = models.ForeignKey(Violation)
@@ -142,10 +144,11 @@ class Comment(models.Model):
     def __unicode__(self):
         return _("Comment #%s") % (self.pk)
 
+
 class Attachment(models.Model):
     storage = models.FileField(upload_to='static')
-    name= models.CharField(max_length=512)
-    type= models.CharField(max_length=512)
+    name = models.CharField(max_length=512)
+    type = models.CharField(max_length=512)
     comment = models.ForeignKey(Comment)
 
     class Admin:
@@ -154,23 +157,28 @@ class Attachment(models.Model):
     def __unicode__(self):
         return self.name
 
+
 class Confirmation(models.Model):
-    key=models.CharField(max_length=64, blank=True)
-    email=models.EmailField()
+    key = models.CharField(max_length=64, blank=True)
+    email = models.EmailField()
     violation = models.ForeignKey(Violation)
 
     class Admin:
         pass
 
+
 class ViolationModerator(CommentModerator):
     email_notification = True
-    moderate_after        = 0
+    moderate_after = 0
+
     def moderate(self, comment, content_object, request):
         return True
 
+
 if Violation not in moderator._registry:
     moderator.register(Violation, ViolationModerator)
 
+
 class FeaturedCase(models.Model):
     case = models.OneToOneField(Violation)
 

bt/multifile.py

@@ -16,6 +16,7 @@ from django.utils.safestring import mark_safe
 
 FILE_INPUT_EMPTY_VALUE = object()
 
+
 class MultiFileInput(Input):
     """
     A widget to be used by the MultiFileField to allow the user to upload
@@ -57,6 +58,7 @@ class MultiFileInput(Input):
         return id_
     id_for_label = classmethod(id_for_label)
 
+
 class MultiFileField(Field):
     """
     A field allowing users to upload multiple files at once.

bt/search_indexes.py

 from haystack import indexes
 from models import Operator, Violation
 
+
 class ViolationIndexes(indexes.SearchIndex, indexes.Indexable):
     text = indexes.CharField(document=True, use_template=True)
     operator = indexes.CharField(model_attr="operator_ref")

bt/sheet.py

@@ -8,7 +8,8 @@ from bt.models import Violation
 from django.db.models import Count
 import odslib
 from django.utils.html import strip_tags
-import re, htmlentitydefs
+import re
+import htmlentitydefs
 ##
 # Removes HTML or XML character references and entities from a text string.
 #
@@ -16,8 +17,10 @@ import re, htmlentitydefs
 # @return The plain text, as a Unicode string, if necessary.
 # source: http://effbot.org/zone/re-sub.htm
 
+
 def unescape(text):
-    text=strip_tags(text)
+    text = strip_tags(text)
+
     def fixup(m):
         text = m.group(0)
         if text[:2] == "&#":
@@ -35,47 +38,49 @@ def unescape(text):
                 text = unichr(htmlentitydefs.name2codepoint[text[1:-1]])
             except KeyError:
                 pass
-        return text # leave as is
+        return text  # leave as is
     return re.sub("&#?\w+;", fixup, text)
 
+
 def save_ods():
     # Create your document
     doc = ooolib.Calc()
 
-    col=1
-    row=2
+    col = 1
+    row = 2
 
     doc.set_cell_property('bold', True)
     doc.set_row_property(row, 'height', '16.5pt')
     for heading, width in [('Country', '73pt'),
                            ('Operator', '77pt'),
-                           ('Type of measure*','355pt'),
-                           ('','355pt'),
+                           ('Type of measure*', '355pt'),
+                           ('', '355pt'),
                            ('Description of the measure', '148pt'),
-                           ('Objective',''),
-                           ('Method of implementation (if applicable)',''),
-                           ('Number of subscribers having a subscription where this measure is implemented',''),
-                           ('How is the user informed?','148pt'),
+                           ('Objective', ''),
+                           ('Method of implementation (if applicable)', ''),
+                           ('Number of subscribers having a subscription where this measure is implemented', ''),
+                           ('How is the user informed?', '148pt'),
                            ('Can the user activate/deactivate the measure? How?', '148pt'),
-                           ('Protection of business secret','239pt')]:
-        if width: doc.set_column_property(col, 'width', width)
+                           ('Protection of business secret', '239pt')]:
+        if width:
+            doc.set_column_property(col, 'width', width)
         doc.set_cell_value(col, row, "string", heading)
-        col+=1
+        col += 1
     doc.set_cell_property('bold', False)
 
-    row=3
+    row = 3
     for v in Violation.objects.filter(activationid='').exclude(state__in=['closed', 'ooscope', 'duplicate']).annotate(total=Count('confirmation')):
-        if v.total>0 or v.state=='verified':
+        if v.total > 0 or v.state == 'verified':
             doc.set_row_property(row, 'height', '16.5pt')
             doc.set_cell_property('wrap-option', 'wrap')
             doc.set_cell_value(1, row, "string", v.country)
             doc.set_cell_value(2, row, "string", v.operator)
             doc.set_cell_value(3, row, "string", "%s %s" % (v.type, v.resource_name))
-            doc.set_cell_value(5, row, "string", "%s\n\n%s" % ( v.editorial, unescape(v.comment_set.get().comment)))
+            doc.set_cell_value(5, row, "string", "%s\n\n%s" % (v.editorial, unescape(v.comment_set.get().comment)))
             doc.set_cell_value(9, row, "string", "%s %s" % ("Contractual" if v.contractual else "", unescape(v.contract_excerpt)))
             doc.set_cell_value(10, row, "string", "can update to a different dataplan" if v.loophole else "")
             doc.set_cell_value(12, row, "string", v.media)
-            row+=1
+            row += 1
             #(v.state, v.country, v.operator, v.contract, v.resource, v.resource_name, v.type, v.media, v.temporary, v.contractual, v.contract_excerpt, v.loophole, v.editorial,v.comment_set.get().comment)
 
     # Save the document to the file you want to create

bt/templatetags/bt.py

@@ -6,20 +6,28 @@ from ..models import COUNTRIES, STATUS, TYPES, MEDIA
 
 register = Library()
 
+
 @register.simple_tag
 def root_url():
     return settings.ROOT_URL
 
+
 @register.simple_tag
 def media_url():
     return settings.MEDIA_URL
 
-country_map=dict(COUNTRIES)
+
+country_map = dict(COUNTRIES)
+
+
 @register.filter(name='country')
 def country(code):
     return country_map[code]
 
-status_map=dict(STATUS)
+
+status_map = dict(STATUS)
+
+
 @register.filter(name='status')
 def status(code):
     try:
@@ -27,7 +35,10 @@ def status(code):
     except:
         return code
 
-type_map=dict(TYPES)
+
+type_map = dict(TYPES)
+
+
 @register.filter(name='type')
 def type(code):
     try:
@@ -35,7 +46,10 @@ def type(code):
     except:
         return code
 
-media_map=dict(MEDIA)
+
+media_map = dict(MEDIA)
+
+
 @register.filter(name='media')
 def media(code):
     try:

bt/templatetags/json_filters.py

@@ -6,6 +6,7 @@ import json
 
 register = Library()
 
+
 @register.filter(name='jsonify')
 def jsonify(object):
     if isinstance(object, QuerySet):

bt/views.py

@@ -20,7 +20,10 @@ from haystack.query import SearchQuerySet
 from models import Violation, Attachment, Comment, Confirmation, COUNTRIES, STATUS, Operator, FeaturedCase
 from tempfile import mkstemp
 from datetime import datetime
-import hashlib, os, re, json
+import hashlib
+import os
+import re
+import json
 from random import randint
 from email.mime.text import MIMEText
 from email.header import Header
@@ -29,13 +32,14 @@ from BeautifulSoup import BeautifulSoup, Comment as BComment
 from operator import itemgetter
 from itertools import groupby
 
+
 def sanitizeHtml(value, base_url=None):
     rjs = r'[\s]*(&#x.{1,7})?'.join(list('javascript:'))
     rvb = r'[\s]*(&#x.{1,7})?'.join(list('vbscript:'))
     re_scripts = re.compile('(%s)|(%s)' % (rjs, rvb), re.IGNORECASE)
     validTags = 'p i strong b u a h1 h2 h3 pre br img'.split()
     validAttrs = 'href src width height'.split()
-    urlAttrs = 'href src'.split() # Attributes which should have a URL
+    urlAttrs = 'href src'.split()  # Attributes which should have a URL
     soup = BeautifulSoup(value)
     for comment in soup.findAll(text=lambda text: isinstance(text, BComment)):
         # Get rid of comments
@@ -47,23 +51,24 @@ def sanitizeHtml(value, base_url=None):
         tag.attrs = []
         for attr, val in attrs:
             if attr in validAttrs:
-                val = re_scripts.sub('', val) # Remove scripts (vbs & js)
+                val = re_scripts.sub('', val)  # Remove scripts (vbs & js)
                 if attr in urlAttrs:
-                    val = urljoin(base_url, val) # Calculate the absolute url
+                    val = urljoin(base_url, val)  # Calculate the absolute url
                 tag.attrs.append((attr, val))
 
     return soup.renderContents().decode('utf8')
 
+
 def activate(request):
     try:
-        v=Violation.objects.get(activationid=request.GET.get('key','asdf'))
+        v = Violation.objects.get(activationid=request.GET.get('key', 'asdf'))
     except:
         messages.add_message(request, messages.INFO, unicode(_('Thank you, this key has been already activated')))
-        return HttpResponseRedirect('/') # Redirect after POST
+        return HttpResponseRedirect('/')  # Redirect after POST
     if v:
         actid = hashlib.sha1(''.join([chr(randint(32, 122)) for x in range(12)])).hexdigest()
-        to=[x.email for x in User.objects.filter(groups__name='moderator')]
-        details='\n'.join(["%s: %s" % (k.capitalize(), val) for k,val in v.__dict__.items() if not k.startswith('_') and val])
+        to = [x.email for x in User.objects.filter(groups__name='moderator')]
+        details = '\n'.join(["%s: %s" % (k.capitalize(), val) for k, val in v.__dict__.items() if not k.startswith('_') and val])
 
         msg = {'from': 'nnmon@respectmynet.eu',
                'to': to,
@@ -73,47 +78,50 @@ def activate(request):
                }
         send_mail(msg['subject'], msg['body'], msg['from'], msg['to'], fail_silently=False)
 
-        v.activationid=actid
+        v.activationid = actid
         v.save()
         messages.add_message(request, messages.INFO, _('Thank you for verifying your submission. It will be listed shortly, after we\'ve checked that the report is valid.').encode("Utf-8"))
     return HttpResponseRedirect('/') # Redirect after POST
 
 def moderate(request):
     try:
-        v=Violation.objects.get(activationid=request.GET.get('key','asdf'))
+        v = Violation.objects.get(activationid=request.GET.get('key', 'asdf'))
     except:
         messages.add_message(request, messages.INFO, unicode(_('Thank you, this key has been already activated')))
-        return HttpResponseRedirect('/') # Redirect after POST
+        return HttpResponseRedirect('/')  # Redirect after POST
     if not v:
         messages.add_message(request, messages.INFO, _('No such key'))
-        return HttpResponseRedirect('/') # Redirect after POST
-    if request.GET.get('action','')=='approve':
+        return HttpResponseRedirect('/')  # Redirect after POST
+    if request.GET.get('action', '') == 'approve':
         messages.add_message(request, messages.INFO, _('Thank you for approving the <a href="%s">submission</a>.' % v.get_absolute_url()))
 
         msg = {'from': 'nnmon@respectmynet.eu',
                'to': [v.comment_set.get().submitter_email],
                'subject': _('NNMon submission approved').encode("Utf-8"),
                'body': _("Your report has been approved.\nTo see it, please visit: %s/%s") %
-                      (settings.ROOT_URL or 'http://localhost:8001/', v.get_absolute_url())
+               (settings.ROOT_URL or 'http://localhost:8001/', v.get_absolute_url())
                }
         send_mail(msg['subject'], msg['body'], msg['from'], msg['to'], fail_silently=False)
 
         if settings.TWITTER_API:
             try:
-                settings.TWITTER_API.PostUpdate("New #NetNeutrality violation reported for %s (%s) %s %s/%s" % (v.operator, v.country, v.contract, settings.ROOT_URL or 'http://localhost:8001/', v.id))
+                settings.TWITTER_API.PostUpdate("New #NetNeutrality violation reported for %s (%s) %s %s/%s" %
+                                                (v.operator, v.country, v.contract, settings.ROOT_URL or 'http://localhost:8001/', v.id))
             except:
                 pass
-        v.activationid=''
+        v.activationid = ''
         v.save()
-        return redirect(v) # Redirect after POST to violation url
-    if request.GET.get('action','')=='delete':
+        return redirect(v)  # Redirect after POST to violation url
+    if request.GET.get('action', '') == 'delete':
         v.delete()
         messages.add_message(request, messages.INFO, _('Thank you for deleting the submission.'))
-        return HttpResponseRedirect('/') # Redirect after POST
-    return render_to_response('view.html', { 'v': v, 'key': request.GET.get('key') },context_instance=RequestContext(request))
+        return HttpResponseRedirect('/')  # Redirect after POST
+    return render_to_response('view.html', {'v': v, 'key': request.GET.get('key')}, context_instance=RequestContext(request))
+
 
 from django.db import transaction
 
+
 @transaction.atomic
 def confirm(request, id, name=None):
 
@@ -123,11 +131,11 @@ def confirm(request, id, name=None):
         violation.save()
 
     if name:
-        if Confirmation.objects.filter(email=name, violation=id).count()==0:
-            msg=_("Thank you for confirming a case. To finalize your confirmation please validate using your confirmation key.\nYour confirmation key is %s/%s%s")
-            actid=sendverifymail('confirm/',name, msg)
+        if Confirmation.objects.filter(email=name, violation=id).count() == 0:
+            msg = _("Thank you for confirming a case. To finalize your confirmation please validate using your confirmation key.\nYour confirmation key is %s/%s%s")
+            actid = sendverifymail('confirm/', name, msg)
             try:
-                c=Confirmation(key=actid, email=name, violation=violation)
+                c = Confirmation(key=actid, email=name, violation=violation)
             except:
                 # should except IntegrityError properly
                 return HttpResponse(unicode(_('Thank you, this has been already confirmed')))
@@ -137,13 +145,14 @@ def confirm(request, id, name=None):
         c = get_object_or_404(Confirmation, key=id)
     except:
         messages.add_message(request, messages.INFO, unicode(_("Thank you, this has been already confirmed")))
-        return HttpResponseRedirect('/') # Redirect after POST
-    c.key=''
+        return HttpResponseRedirect('/')  # Redirect after POST
+    c.key = ''
     c.save()
     messages.add_message(request, messages.INFO, unicode(_('Thank you for verifying your confirmation')))
-    return HttpResponseRedirect('/') # Redirect after POST
+    return HttpResponseRedirect('/')  # Redirect after POST
 
-def sendverifymail(service,to,body):
+
+def sendverifymail(service, to, body):
     actid = hashlib.sha1(''.join([chr(randint(32, 122)) for x in range(12)])).hexdigest()
     msg = {'from': 'nnmon@respectmynet.eu',
            'to': [to.encode("Utf-8")],
@@ -154,6 +163,7 @@ def sendverifymail(service,to,body):
 
     return actid
 
+
 class AddForm(FormView):
     template_name = 'index.html'
     form_class = AddViolation
@@ -164,23 +174,23 @@ class AddForm(FormView):
         #actid=sendverifymail('activate?key=',form.cleaned_data['email'], msg)
         actid = hashlib.sha1(''.join([chr(randint(32, 122)) for x in range(12)])).hexdigest()
         operator, created = Operator.objects.get_or_create(name=form.cleaned_data['operator'])
-        v=Violation(
-                country = form.cleaned_data['country'],
-                operator_ref = operator,
-                contract = form.cleaned_data['contract'],
-                resource = form.cleaned_data['resource'],
-                resource_name = form.cleaned_data['resource_name'],
-                type = form.cleaned_data['type'],
-                media = form.cleaned_data['media'],
-                temporary = form.cleaned_data['temporary'],
-                contractual = form.cleaned_data['contractual'],
-                contract_excerpt = sanitizeHtml(form.cleaned_data['contract_excerpt']),
-                loophole = form.cleaned_data['loophole'],
-                activationid = actid,
-                old = False
-                )
+        v = Violation(
+            country=form.cleaned_data['country'],
+            operator_ref=operator,
+            contract=form.cleaned_data['contract'],
+            resource=form.cleaned_data['resource'],
+            resource_name=form.cleaned_data['resource_name'],
+            type=form.cleaned_data['type'],
+            media=form.cleaned_data['media'],
+            temporary=form.cleaned_data['temporary'],
+            contractual=form.cleaned_data['contractual'],