Lint codebase using flake8 plugins and add it to CI.

Author: charettes

.travis.yml

@@ -3,6 +3,7 @@ sudo: no
 language: python
 
 env:
+  - TOXENV=flake8
   - TOXENV=py27-1.4
   - TOXENV=py27-1.5
   - TOXENV=py27-1.6

drip/admin.py

@@ -1,12 +1,14 @@
-import base64
 import json
 
 from django import forms
+from django.conf.urls import url
 from django.contrib import admin
+from django.http import HttpResponse
+from django.shortcuts import get_object_or_404, render
 
-from drip.models import Drip, SentDrip, QuerySetRule
 from drip.drips import configured_message_classes, message_class_for
-from drip.utils import get_user_model
+from drip.models import Drip, QuerySetRule, SentDrip
+from drip.utils import get_simple_fields, get_user_model
 
 
 class QuerySetRuleInline(admin.TabularInline):
@@ -15,8 +17,9 @@ class QuerySetRuleInline(admin.TabularInline):
 
 class DripForm(forms.ModelForm):
     message_class = forms.ChoiceField(
-        choices=((k, '%s (%s)' % (k, v)) for k, v in configured_message_classes().items())
+        choices=((k, '%s (%s)' % (k, v)) for k, v in configured_message_classes().items()),
     )
+
     class Meta:
         model = Drip
         exclude = []
@@ -29,13 +32,13 @@ class DripAdmin(admin.ModelAdmin):
     ]
     form = DripForm
 
-    av = lambda self, view: self.admin_site.admin_view(view)
+    def av(self, view):
+        return self.admin_site.admin_view(view)
+
     def timeline(self, request, drip_id, into_past, into_future):
         """
         Return a list of people who should get emails.
         """
-        from django.shortcuts import render, get_object_or_404
-
         drip = get_object_or_404(Drip, id=drip_id)
 
         shifted_drips = []
@@ -44,15 +47,13 @@ def timeline(self, request, drip_id, into_past, into_future):
             shifted_drip.prune()
             shifted_drips.append({
                 'drip': shifted_drip,
-                'qs': shifted_drip.get_queryset().exclude(id__in=seen_users)
+                'qs': shifted_drip.get_queryset().exclude(id__in=seen_users),
             })
             seen_users.update(shifted_drip.get_queryset().values_list('id', flat=True))
 
         return render(request, 'drip/timeline.html', locals())
 
     def view_drip_email(self, request, drip_id, into_past, into_future, user_id):
-        from django.shortcuts import render, get_object_or_404
-        from django.http import HttpResponse
         drip = get_object_or_404(Drip, id=drip_id)
         User = get_user_model()
         user = get_object_or_404(User, id=user_id)
@@ -72,7 +73,6 @@ def view_drip_email(self, request, drip_id, into_past, into_future, user_id):
         return HttpResponse(html, content_type=mime)
 
     def build_extra_context(self, extra_context):
-        from drip.utils import get_simple_fields
         extra_context = extra_context or {}
         User = get_user_model()
         extra_context['field_data'] = json.dumps(get_simple_fields(User))
@@ -87,25 +87,28 @@ def change_view(self, request, object_id, extra_context=None):
             request, object_id, extra_context=self.build_extra_context(extra_context))
 
     def get_urls(self):
-        from django.conf.urls import patterns, url
         urls = super(DripAdmin, self).get_urls()
-        my_urls = patterns('',
+        my_urls = [
             url(
                 r'^(?P<drip_id>[\d]+)/timeline/(?P<into_past>[\d]+)/(?P<into_future>[\d]+)/$',
                 self.av(self.timeline),
-                name='drip_timeline'
+                name='drip_timeline',
             ),
             url(
                 r'^(?P<drip_id>[\d]+)/timeline/(?P<into_past>[\d]+)/(?P<into_future>[\d]+)/(?P<user_id>[\d]+)/$',
                 self.av(self.view_drip_email),
-                name='view_drip_email'
-            )
-        )
+                name='view_drip_email',
+            ),
+        ]
         return my_urls + urls
+
+
 admin.site.register(Drip, DripAdmin)
 
 
 class SentDripAdmin(admin.ModelAdmin):
     list_display = [f.name for f in SentDrip._meta.fields]
     ordering = ['-id']
+
+
 admin.site.register(SentDrip, SentDripAdmin)

drip/drips.py

@@ -1,12 +1,13 @@
-import operator
 import functools
+import logging
+import operator
 
 from django.conf import settings
+from django.core.mail import EmailMultiAlternatives
 from django.db.models import Q
 from django.template import Context, Template
-from django.utils.importlib import import_module
-from django.core.mail import EmailMultiAlternatives
 from django.utils.html import strip_tags
+from django.utils.importlib import import_module
 
 from drip.models import SentDrip
 from drip.utils import get_user_model
@@ -18,9 +19,6 @@
     conditional_now = datetime.now
 
 
-import logging
-
-
 def configured_message_classes():
     conf_dict = getattr(settings, 'DRIP_MESSAGE_CLASSES', {})
     if 'default' not in conf_dict:
@@ -124,11 +122,6 @@ def __init__(self, drip_model, *args, **kwargs):
 
         self.now_shift_kwargs = kwargs.get('now_shift_kwargs', {})
 
-
-    #########################
-    ### DATE MANIPULATION ###
-    #########################
-
     def now(self):
         """
         This allows us to override what we consider "now", making it easy
@@ -147,13 +140,13 @@ def walk(self, into_past=0, into_future=0):
         """
         Walk over a date range and create new instances of self with new ranges.
         """
-        walked_range = []
-        for shift in range(-into_past, into_future):
-            kwargs = dict(drip_model=self.drip_model,
-                          name=self.name,
-                          now_shift_kwargs={'days': shift})
-            walked_range.append(self.__class__(**kwargs))
-        return walked_range
+        return [
+            self.__class__(
+                drip_model=self.drip_model,
+                name=self.name,
+                now_shift_kwargs={'days': shift},
+            ) for shift in range(-into_past, into_future)
+        ]
 
     def apply_queryset_rules(self, qs):
         """
@@ -179,10 +172,6 @@ def apply_queryset_rules(self, qs):
 
         return qs
 
-    ##################
-    ### MANAGEMENT ###
-    ##################
-
     def get_queryset(self):
         try:
             return self._queryset
@@ -239,19 +228,14 @@ def send(self):
                         from_email=self.from_email,
                         from_email_name=self.from_email_name,
                         subject=message_instance.subject,
-                        body=message_instance.body
+                        body=message_instance.body,
                     )
                     count += 1
             except Exception as e:
                 logging.error("Failed to send drip %s to user %s: %s" % (self.drip_model.id, user, e))
 
         return count
 
-
-    ####################
-    ### USER DEFINED ###
-    ####################
-
     def queryset(self):
         """
         Returns a queryset of auth.User who meet the

drip/management/commands/send_drips.py

@@ -1,9 +1,9 @@
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
+
+from drip.models import Drip
 
 
 class Command(BaseCommand):
     def handle(self, *args, **options):
-        from drip.models import Drip
-
         for drip in Drip.objects.filter(enabled=True):
             drip.drip.run()

drip/migrations/0001_initial.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 import datetime
+
+from django.db import models
+
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):

drip/migrations/0002_auto__add_field_drip_from_email__add_field_drip_from_email_name__add_f.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 import datetime
+
+from django.db import models
+
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):
@@ -116,4 +118,4 @@ def backwards(self, orm):
         }
     }
 
-    complete_apps = ['drip']
+    complete_apps = ['drip']

drip/migrations/0003_auto__add_field_drip_message_class.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 import datetime
+
+from django.db import models
+
 from south.db import db
 from south.v2 import SchemaMigration
-from django.db import models
 
 
 class Migration(SchemaMigration):
@@ -91,4 +93,4 @@ def backwards(self, orm):
         }
     }
 
-    complete_apps = ['drip']
+    complete_apps = ['drip']

drip/models.py

@@ -1,14 +1,13 @@
-from datetime import datetime, timedelta
-
-from django.db import models
-from django.core.exceptions import ValidationError
-from django.conf import settings
-
-from drip.utils import get_user_model
+from datetime import datetime
 
 # just using this to parse, but totally insane package naming...
 # https://bitbucket.org/schinckel/django-timedelta-field/
 import timedelta as djangotimedelta
+from django.conf import settings
+from django.core.exceptions import ValidationError
+from django.db import models
+
+from drip.utils import get_user_model
 
 
 class Drip(models.Model):
@@ -23,26 +22,30 @@ class Drip(models.Model):
 
     enabled = models.BooleanField(default=False)
 
-    from_email = models.EmailField(null=True, blank=True,
-        help_text='Set a custom from email.')
-    from_email_name = models.CharField(max_length=150, null=True, blank=True,
-        help_text="Set a name for a custom from email.")
+    from_email = models.EmailField(
+        null=True, blank=True, help_text='Set a custom from email.',
+    )
+    from_email_name = models.CharField(
+        max_length=150, null=True, blank=True, help_text="Set a name for a custom from email.",
+    )
     subject_template = models.TextField(null=True, blank=True)
-    body_html_template = models.TextField(null=True, blank=True,
-        help_text='You will have settings and user in the context.')
+    body_html_template = models.TextField(
+        null=True, blank=True, help_text='You will have settings and user in the context.',
+    )
     message_class = models.CharField(max_length=120, blank=True, default='default')
 
     @property
     def drip(self):
         from drip.drips import DripBase
 
-        drip = DripBase(drip_model=self,
-                        name=self.name,
-                        from_email=self.from_email if self.from_email else None,
-                        from_email_name=self.from_email_name if self.from_email_name else None,
-                        subject_template=self.subject_template if self.subject_template else None,
-                        body_template=self.body_html_template if self.body_html_template else None)
-        return drip
+        return DripBase(
+            drip_model=self,
+            name=self.name,
+            from_email=self.from_email if self.from_email else None,
+            from_email_name=self.from_email_name if self.from_email_name else None,
+            subject_template=self.subject_template if self.subject_template else None,
+            body_template=self.body_html_template if self.body_html_template else None,
+        )
 
     def __unicode__(self):
         return self.name
@@ -60,14 +63,13 @@ class SentDrip(models.Model):
     subject = models.TextField()
     body = models.TextField()
     from_email = models.EmailField(
-        null=True, default=None # For south so that it can migrate existing rows.
+        null=True, default=None,  # For south so that it can migrate existing rows.
     )
-    from_email_name = models.CharField(max_length=150,
-        null=True, default=None # For south so that it can migrate existing rows.
+    from_email_name = models.CharField(
+        max_length=150, null=True, default=None,  # For south so that it can migrate existing rows.
     )
 
 
-
 METHOD_TYPES = (
     ('filter', 'Filter'),
     ('exclude', 'Exclude'),
@@ -90,6 +92,7 @@ class SentDrip(models.Model):
     ('iendswith', 'ends with (case insensitive)'),
 )
 
+
 class QuerySetRule(models.Model):
     date = models.DateTimeField(auto_now_add=True)
     lastchanged = models.DateTimeField(auto_now=True)
@@ -100,9 +103,9 @@ class QuerySetRule(models.Model):
     field_name = models.CharField(max_length=128, verbose_name='Field name of User')
     lookup_type = models.CharField(max_length=12, default='exact', choices=LOOKUP_TYPES)
 
-    field_value = models.CharField(max_length=255,
-        help_text=('Can be anything from a number, to a string. Or, do ' +
-                   '`now-7 days` or `today+3 days` for fancy timedelta.'))
+    field_value = models.CharField(max_length=255, help_text=(
+        'Can be anything from a number, to a string. Or, do `now-7 days` or `today+3 days` for fancy timedelta.'
+    ))
 
     def clean(self):
         User = get_user_model()