Merge pull request #34 from Koed00/dev

Updated to future 0.15.0

django_q/admin.py

@@ -1,3 +1,4 @@
+"""Admin module for Django."""
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
 
@@ -6,6 +7,9 @@ from .models import Success, Failure, Schedule
 
 
 class TaskAdmin(admin.ModelAdmin):
+
+    """model admin for success tasks."""
+
     list_display = (
         u'name',
         'func',
@@ -16,11 +20,11 @@ class TaskAdmin(admin.ModelAdmin):
     )
 
     def has_add_permission(self, request, obj=None):
-        """Don't allow adds"""
+        """Don't allow adds."""
         return False
 
     def get_queryset(self, request):
-        """Only show successes"""
+        """Only show successes."""
         qs = super(TaskAdmin, self).get_queryset(request)
         return qs.filter(success=True)
 
@@ -29,11 +33,13 @@ class TaskAdmin(admin.ModelAdmin):
     list_filter = ('group',)
 
     def get_readonly_fields(self, request, obj=None):
-        return list(self.readonly_fields) + \
-               [field.name for field in obj._meta.fields]
+        """Set all fields readonly."""
+        return list(self.readonly_fields) +\
+            [field.name for field in obj._meta.fields]
 
 
 def retry_failed(FailAdmin, request, queryset):
+    """Submit selected tasks back to the queue."""
     for task in queryset:
         async(task.func, *task.args or (), hook=task.hook, **task.kwargs or {})
         task.delete()
@@ -43,6 +49,9 @@ retry_failed.short_description = _("Resubmit selected tasks to queue")
 
 
 class FailAdmin(admin.ModelAdmin):
+
+    """model admin for failed tasks."""
+
     list_display = (
         'name',
         'func',
@@ -52,7 +61,7 @@ class FailAdmin(admin.ModelAdmin):
     )
 
     def has_add_permission(self, request, obj=None):
-        """Don't allow adds"""
+        """Don't allow adds."""
         return False
 
     actions = [retry_failed]
@@ -61,11 +70,15 @@ class FailAdmin(admin.ModelAdmin):
     readonly_fields = []
 
     def get_readonly_fields(self, request, obj=None):
+        """Set all fields readonly."""
         return list(self.readonly_fields) + \
-               [field.name for field in obj._meta.fields]
+            [field.name for field in obj._meta.fields]
 
 
 class ScheduleAdmin(admin.ModelAdmin):
+
+    """ model admin for schedules """
+
     list_display = (
         'id',
         'name',

requirements.txt

@@ -8,7 +8,7 @@ arrow==0.6.0
 blessed==1.9.5
 django-picklefield==0.3.1
 django-redis==4.2.0
-future==0.14.3
+future==0.15.0
 hiredis==0.2.0
 msgpack-python==0.4.6     # via django-redis
 psutil==3.1.1