Merge pull request #312 from davidfischer-ch/master

Fix some deprecations

Author: ask

djcelery/admin.py

@@ -200,8 +200,8 @@ def get_actions(self, request):
         actions.pop('delete_selected', None)
         return actions
 
-    def queryset(self, request):
-        qs = super(TaskMonitor, self).queryset(request)
+    def get_queryset(self, request):
+        qs = super(TaskMonitor, self).get_queryset(request)
         return qs.select_related('worker')
 
 
@@ -261,6 +261,7 @@ class PeriodicTaskForm(forms.ModelForm):
 
         class Meta:
             model = PeriodicTask
+            exclude = ()
 
         def clean(self):
             data = super(PeriodicTaskForm, self).clean()
@@ -326,8 +327,8 @@ def changelist_view(self, request, extra_context=None):
         return super(PeriodicTaskAdmin, self).changelist_view(request,
                                                               extra_context)
 
-    def queryset(self, request):
-        qs = super(PeriodicTaskAdmin, self).queryset(request)
+    def get_queryset(self, request):
+        qs = super(PeriodicTaskAdmin, self).get_queryset(request)
         return qs.select_related('interval', 'crontab')