Now depends on Python 2.6

Author: ask

bin/djcelerymon

@@ -1,23 +1,23 @@
 """Django Celery Integration."""
 # :copyright: (c) 2009 - 2012 by Ask Solem.
 # :license:   BSD, see LICENSE for more details.
-from __future__ import absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import os
 
 VERSION = (3, 0, 11)
-__version__ = ".".join(map(str, VERSION[0:3])) + "".join(VERSION[3:])
-__author__ = "Ask Solem"
-__contact__ = "ask@celeryproject.org"
-__homepage__ = "http://celeryproject.org"
-__docformat__ = "restructuredtext"
-__license__ = "BSD (3 clause)"
+__version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:])
+__author__ = 'Ask Solem'
+__contact__ = 'ask@celeryproject.org'
+__homepage__ = 'http://celeryproject.org'
+__docformat__ = 'restructuredtext'
+__license__ = 'BSD (3 clause)'
 
 # -eof meta-
 
 
 def setup_loader():
-    os.environ.setdefault("CELERY_LOADER", "djcelery.loaders.DjangoLoader")
+    os.environ.setdefault('CELERY_LOADER', 'djcelery.loaders.DjangoLoader')
 
 # Importing this module enables the Celery Django loader.
 setup_loader()

djcelery/__init__.py

@@ -1,5 +1,4 @@
-from __future__ import absolute_import
-from __future__ import with_statement
+from __future__ import absolute_import, unicode_literals
 
 from django import forms
 from django.conf import settings
@@ -18,19 +17,21 @@
 from celery.utils.text import abbrtask
 
 from .admin_utils import action, display_field, fixedwidth
-from .models import (TaskState, WorkerState,
-                     PeriodicTask, IntervalSchedule, CrontabSchedule)
+from .models import (
+    TaskState, WorkerState,
+    PeriodicTask, IntervalSchedule, CrontabSchedule,
+)
 from .humanize import naturaldate
 
 
-TASK_STATE_COLORS = {states.SUCCESS: "green",
-                     states.FAILURE: "red",
-                     states.REVOKED: "magenta",
-                     states.STARTED: "yellow",
-                     states.RETRY: "orange",
-                     "RECEIVED": "blue"}
-NODE_STATE_COLORS = {"ONLINE": "green",
-                     "OFFLINE": "gray"}
+TASK_STATE_COLORS = {states.SUCCESS: 'green',
+                     states.FAILURE: 'red',
+                     states.REVOKED: 'magenta',
+                     states.STARTED: 'yellow',
+                     states.RETRY: 'orange',
+                     'RECEIVED': 'blue'}
+NODE_STATE_COLORS = {'ONLINE': 'green',
+                     'OFFLINE': 'gray'}
 
 
 class MonitorList(main_views.ChangeList):
@@ -40,38 +41,40 @@ def __init__(self, *args, **kwargs):
         self.title = self.model_admin.list_page_title
 
 
-@display_field(_("state"), "state")
+@display_field(_('state'), 'state')
 def colored_state(task):
     state = escape(task.state)
-    color = TASK_STATE_COLORS.get(task.state, "black")
-    return """<b><span style="color: %s;">%s</span></b>""" % (color, state)
+    color = TASK_STATE_COLORS.get(task.state, 'black')
+    return '<b><span style="color: {0};">{1}</span></b>'.format(color, state)
 
 
-@display_field(_("state"), "last_heartbeat")
+@display_field(_('state'), 'last_heartbeat')
 def node_state(node):
-    state = node.is_alive() and "ONLINE" or "OFFLINE"
+    state = node.is_alive() and 'ONLINE' or 'OFFLINE'
     color = NODE_STATE_COLORS[state]
-    return """<b><span style="color: %s;">%s</span></b>""" % (color, state)
+    return '<b><span style="color: {0};">{1}</span></b>'.format(color, state)
 
 
-@display_field(_("ETA"), "eta")
+@display_field(_('ETA'), 'eta')
 def eta(task):
     if not task.eta:
-        return """<span style="color: gray;">none</span>"""
+        return '<span style="color: gray;">none</span>'
     return escape(task.eta)
 
 
-@display_field(_("when"), "tstamp")
+@display_field(_('when'), 'tstamp')
 def tstamp(task):
-    return """<div title="%s">%s</div>""" % (escape(str(task.tstamp)),
-                                             escape(naturaldate(task.tstamp)))
+    return '<div title="{0}">{1}</div>'.format(
+        escape(str(task.tstamp)), escape(naturaldate(task.tstamp)),
+    )
 
 
-@display_field(_("name"), "name")
+@display_field(_('name'), 'name')
 def name(task):
     short_name = abbrtask(task.name, 16)
-    return """<div title="%s"><b>%s</b></div>""" % (escape(task.name),
-                                                    escape(short_name))
+    return '<div title="{0}"><b>{1}</b></div>'.format(
+        escape(task.name), escape(short_name),
+    )
 
 
 class ModelMonitor(admin.ModelAdmin):
@@ -83,7 +86,7 @@ def get_changelist(self, request, **kwargs):
 
     def change_view(self, request, object_id, extra_context=None):
         extra_context = extra_context or {}
-        extra_context.setdefault("title", self.detail_title)
+        extra_context.setdefault('title', self.detail_title)
         return super(ModelMonitor, self).change_view(request, object_id,
                                                      extra_context)
 
@@ -99,85 +102,85 @@ def has_add_permission(self, request):
 
 
 class TaskMonitor(ModelMonitor):
-    detail_title = _("Task detail")
-    list_page_title = _("Tasks")
-    rate_limit_confirmation_template = "djcelery/confirm_rate_limit.html"
-    date_hierarchy = "tstamp"
+    detail_title = _('Task detail')
+    list_page_title = _('Tasks')
+    rate_limit_confirmation_template = 'djcelery/confirm_rate_limit.html'
+    date_hierarchy = 'tstamp'
     fieldsets = (
             (None, {
-                "fields": ("state", "task_id", "name", "args", "kwargs",
-                           "eta", "runtime", "worker", "tstamp"),
-                "classes": ("extrapretty", ),
+                'fields': ('state', 'task_id', 'name', 'args', 'kwargs',
+                           'eta', 'runtime', 'worker', 'tstamp'),
+                'classes': ('extrapretty', ),
             }),
-            ("Details", {
-                "classes": ("collapse", "extrapretty"),
-                "fields": ("result", "traceback", "expires"),
+            ('Details', {
+                'classes': ('collapse', 'extrapretty'),
+                'fields': ('result', 'traceback', 'expires'),
             }),
     )
-    list_display = (fixedwidth("task_id", name=_("UUID"), pt=8),
+    list_display = (fixedwidth('task_id', name=_('UUID'), pt=8),
                     colored_state,
                     name,
-                    fixedwidth("args", pretty=True),
-                    fixedwidth("kwargs", pretty=True),
+                    fixedwidth('args', pretty=True),
+                    fixedwidth('kwargs', pretty=True),
                     eta,
                     tstamp,
-                    "worker")
-    readonly_fields = ("state", "task_id", "name", "args", "kwargs",
-                       "eta", "runtime", "worker", "result", "traceback",
-                       "expires", "tstamp")
-    list_filter = ("state", "name", "tstamp", "eta", "worker")
-    search_fields = ("name", "task_id", "args", "kwargs", "worker__hostname")
-    actions = ["revoke_tasks",
-               "terminate_tasks",
-               "kill_tasks",
-               "rate_limit_tasks"]
-
-    @action(_("Revoke selected tasks"))
+                    'worker')
+    readonly_fields = ('state', 'task_id', 'name', 'args', 'kwargs',
+                       'eta', 'runtime', 'worker', 'result', 'traceback',
+                       'expires', 'tstamp')
+    list_filter = ('state', 'name', 'tstamp', 'eta', 'worker')
+    search_fields = ('name', 'task_id', 'args', 'kwargs', 'worker__hostname')
+    actions = ['revoke_tasks',
+               'terminate_tasks',
+               'kill_tasks',
+               'rate_limit_tasks']
+
+    @action(_('Revoke selected tasks'))
     def revoke_tasks(self, request, queryset):
         with current_app.default_connection() as connection:
             for state in queryset:
                 revoke(state.task_id, connection=connection)
 
-    @action(_("Terminate selected tasks"))
+    @action(_('Terminate selected tasks'))
     def terminate_tasks(self, request, queryset):
         with current_app.default_connection() as connection:
             for state in queryset:
                 revoke(state.task_id, connection=connection, terminate=True)
 
-    @action(_("Kill selected tasks"))
+    @action(_('Kill selected tasks'))
     def kill_tasks(self, request, queryset):
         with current_app.default_connection() as connection:
             for state in queryset:
                 revoke(state.task_id, connection=connection,
-                       terminate=True, signal="KILL")
+                       terminate=True, signal='KILL')
 
-    @action(_("Rate limit selected tasks"))
+    @action(_('Rate limit selected tasks'))
     def rate_limit_tasks(self, request, queryset):
         tasks = set([task.name for task in queryset])
         opts = self.model._meta
         app_label = opts.app_label
-        if request.POST.get("post"):
-            rate = request.POST["rate_limit"]
+        if request.POST.get('post'):
+            rate = request.POST['rate_limit']
             with current_app.default_connection() as connection:
                 for task_name in tasks:
                     rate_limit(task_name, rate, connection=connection)
             return None
 
         context = {
-            "title": _("Rate limit selection"),
-            "queryset": queryset,
-            "object_name": force_unicode(opts.verbose_name),
-            "action_checkbox_name": helpers.ACTION_CHECKBOX_NAME,
-            "opts": opts,
-            "app_label": app_label,
+            'title': _('Rate limit selection'),
+            'queryset': queryset,
+            'object_name': force_unicode(opts.verbose_name),
+            'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
+            'opts': opts,
+            'app_label': app_label,
         }
 
         return render_to_response(self.rate_limit_confirmation_template,
                 context, context_instance=RequestContext(request))
 
     def get_actions(self, request):
         actions = super(TaskMonitor, self).get_actions(request)
-        actions.pop("delete_selected", None)
+        actions.pop('delete_selected', None)
         return actions
 
     def queryset(self, request):
@@ -187,31 +190,31 @@ def queryset(self, request):
 
 class WorkerMonitor(ModelMonitor):
     can_add = True
-    detail_title = _("Node detail")
-    list_page_title = _("Worker Nodes")
-    list_display = ("hostname", node_state)
-    readonly_fields = ("last_heartbeat", )
-    actions = ["shutdown_nodes",
-               "enable_events",
-               "disable_events"]
-
-    @action(_("Shutdown selected worker nodes"))
+    detail_title = _('Node detail')
+    list_page_title = _('Worker Nodes')
+    list_display = ('hostname', node_state)
+    readonly_fields = ('last_heartbeat', )
+    actions = ['shutdown_nodes',
+               'enable_events',
+               'disable_events']
+
+    @action(_('Shutdown selected worker nodes'))
     def shutdown_nodes(self, request, queryset):
-        broadcast("shutdown", destination=[n.hostname for n in queryset])
+        broadcast('shutdown', destination=[n.hostname for n in queryset])
 
-    @action(_("Enable event mode for selected nodes."))
+    @action(_('Enable event mode for selected nodes.'))
     def enable_events(self, request, queryset):
-        broadcast("enable_events",
+        broadcast('enable_events',
                   destination=[n.hostname for n in queryset])
 
-    @action(_("Disable event mode for selected nodes."))
+    @action(_('Disable event mode for selected nodes.'))
     def disable_events(self, request, queryset):
-        broadcast("disable_events",
+        broadcast('disable_events',
                   destination=[n.hostname for n in queryset])
 
     def get_actions(self, request):
         actions = super(WorkerMonitor, self).get_actions(request)
-        actions.pop("delete_selected", None)
+        actions.pop('delete_selected', None)
         return actions
 
 admin.site.register(TaskState, TaskMonitor)
@@ -231,25 +234,25 @@ def periodic_task_form():
     current_app.loader.import_default_modules()
     tasks = list(sorted(name for name in current_app.tasks
                             if not name.startswith('celery.')))
-    choices = (("", ""), ) + tuple(zip(tasks, tasks))
+    choices = (('', ''), ) + tuple(zip(tasks, tasks))
 
     class PeriodicTaskForm(forms.ModelForm):
-        regtask = LaxChoiceField(label=_(u"Task (registered)"),
+        regtask = LaxChoiceField(label=_('Task (registered)'),
                                  choices=choices, required=False)
-        task = forms.CharField(label=_("Task (custom)"), required=False,
+        task = forms.CharField(label=_('Task (custom)'), required=False,
                                max_length=200)
 
         class Meta:
             model = PeriodicTask
 
         def clean(self):
             data = super(PeriodicTaskForm, self).clean()
-            regtask = data.get("regtask")
+            regtask = data.get('regtask')
             if regtask:
-                data["task"] = regtask
-            if not data["task"]:
-                exc = forms.ValidationError(_(u"Need name of task"))
-                self._errors["task"] = self.error_class(exc.messages)
+                data['task'] = regtask
+            if not data['task']:
+                exc = forms.ValidationError(_('Need name of task'))
+                self._errors['task'] = self.error_class(exc.messages)
                 raise exc
             return data
 
@@ -262,20 +265,20 @@ class PeriodicTaskAdmin(admin.ModelAdmin):
     list_display = ('__unicode__', 'enabled')
     fieldsets = (
             (None, {
-                "fields": ("name", "regtask", "task", "enabled"),
-                "classes": ("extrapretty", "wide"),
+                'fields': ('name', 'regtask', 'task', 'enabled'),
+                'classes': ('extrapretty', 'wide'),
             }),
-            ("Schedule", {
-                "fields": ("interval", "crontab"),
-                "classes": ("extrapretty", "wide", ),
+            ('Schedule', {
+                'fields': ('interval', 'crontab'),
+                'classes': ('extrapretty', 'wide', ),
             }),
-            ("Arguments", {
-                "fields": ("args", "kwargs"),
-                "classes": ("extrapretty", "wide", "collapse"),
+            ('Arguments', {
+                'fields': ('args', 'kwargs'),
+                'classes': ('extrapretty', 'wide', 'collapse'),
             }),
-            ("Execution Options", {
-                "fields": ("expires", "queue", "exchange", "routing_key"),
-                "classes": ("extrapretty", "wide", "collapse"),
+            ('Execution Options', {
+                'fields': ('expires', 'queue', 'exchange', 'routing_key'),
+                'classes': ('extrapretty', 'wide', 'collapse'),
             }),
     )
 
@@ -285,7 +288,7 @@ def __init__(self, *args, **kwargs):
 
     def changelist_view(self, request, extra_context=None):
         extra_context = extra_context or {}
-        scheduler = getattr(settings, "CELERYBEAT_SCHEDULER", None)
+        scheduler = getattr(settings, 'CELERYBEAT_SCHEDULER', None)
         if scheduler != 'djcelery.schedulers.DatabaseScheduler':
             extra_context['wrong_scheduler'] = True
         return super(PeriodicTaskAdmin, self).changelist_view(request,