Explorar el Código

Remove __all__, it's just stupid anyway.

Ask Solem hace 16 años
padre
commit
01417c7ab5
Se han modificado 12 ficheros con 6 adiciones y 25 borrados
  1. 1 5
      celery/__init__.py
  2. 1 0
      celery/conf.py
  3. 0 2
      celery/discovery.py
  4. 0 2
      celery/log.py
  5. 0 2
      celery/managers.py
  6. 0 2
      celery/messaging.py
  7. 0 2
      celery/models.py
  8. 0 1
      celery/platform.py
  9. 0 2
      celery/process.py
  10. 0 3
      celery/task.py
  11. 1 0
      celery/urls.py
  12. 3 4
      celery/views.py

+ 1 - 5
celery/__init__.py

@@ -1,11 +1,7 @@
 """Distributed Task Queue for Django"""
-VERSION = (0, 1, 6)
+VERSION = (0, 1, 7)
 __version__ = ".".join(map(str, VERSION))
 __author__ = "Ask Solem"
 __contact__ = "askh@opera.com"
 __homepage__ = "http://github.com/ask/celery/"
 __docformat__ = "restructuredtext"
-
-__all__ = ["bin", "conf", "discovery", "log", "managers",
-           "messaging", "models", "platform", "process",
-           "registry", "task", "urls", "views", "worker"]

+ 1 - 0
celery/conf.py

@@ -47,6 +47,7 @@ LOG_LEVELS = {
     "FATAL": logging.FATAL,
 }
 
+
 TASK_META_USE_DB = getattr(settings, "CELERY_TASK_META_USE_DB",
                             DEFAULT_TASK_META_USE_DB)
 LOG_FORMAT = getattr(settings, "CELERYD_DAEMON_LOG_FORMAT",

+ 0 - 2
celery/discovery.py

@@ -1,7 +1,5 @@
 from django.conf import settings
 
-__all__ = ["autodiscover", "find_related_module"]
-
 
 def autodiscover():
     """Include tasks for all applications in settings.INSTALLED_APPS."""

+ 0 - 2
celery/log.py

@@ -4,8 +4,6 @@ import time
 import logging
 from celery.conf import LOG_FORMAT, DAEMON_LOG_LEVEL
 
-__all__ = ["setup_logger", "emergency_error"]
-
 
 def setup_logger(loglevel=DAEMON_LOG_LEVEL, logfile=None, format=LOG_FORMAT,
         **kwargs):

+ 0 - 2
celery/managers.py

@@ -2,8 +2,6 @@ from django.db import models
 from celery.registry import tasks
 from datetime import datetime, timedelta
 
-__all__ = ["TaskManager", "PeriodicTaskManager"]
-
 
 class TaskManager(models.Manager):
     

+ 0 - 2
celery/messaging.py

@@ -2,8 +2,6 @@ from carrot.messaging import Publisher, Consumer
 from celery import conf
 import uuid
 
-__all__ = ["NoProcessConsumer", "TaskPublisher", "TaskConsumer"]
-
 
 class NoProcessConsumer(Consumer):
     

+ 0 - 2
celery/models.py

@@ -3,8 +3,6 @@ from celery.registry import tasks
 from celery.managers import TaskManager, PeriodicTaskManager
 from django.utils.translation import ugettext_lazy as _
 
-__all__ = ["TaskMeta", "PeriodicTaskMeta"]
-
 
 class TaskMeta(models.Model):
     task_id = models.CharField(_(u"task id"), max_length=255, unique=True)

+ 0 - 1
celery/platform.py

@@ -3,7 +3,6 @@ import sys
 import errno
 import resource
 
-__all__ = ["PIDFile", "remove_pidfile", "daemonize"]
 
 # File mode creation mask of the daemon.
 # No point in changing this, as we don't really create any files.

+ 0 - 2
celery/process.py

@@ -1,8 +1,6 @@
 from UserList import UserList
 from celery.task import mark_as_done
 
-__all__ = ["ProcessQueue"]
-
 
 class ProcessQueue(UserList):
     """Queue of running child processes, which starts waiting for the

+ 0 - 3
celery/task.py

@@ -9,9 +9,6 @@ from datetime import timedelta
 import uuid
 import traceback
 
-__all__ = ["delay_task", "discard_all", "gen_task_done_cache_key",
-           "mark_as_done", "is_done", "Task", "PeriodicTask", "TestTask"]
-
 
 def delay_task(task_name, **kwargs):
     if task_name not in tasks:

+ 1 - 0
celery/urls.py

@@ -1,6 +1,7 @@
 from django.conf.urls.defaults import patterns, url
 from celery import views
 
+
 urlpatterns = patterns("",
     url(r'^(?P<task_id>[\w\d\-]+)/done/?$', views.is_task_done,
         name="celery-is_task_done"),

+ 3 - 4
celery/views.py

@@ -1,9 +1,8 @@
 from django.http import Http404, HttpResponse
 from celery.task import is_done
-
-JSON_TASK_STATUS = """{"task": {"id": "%s", "executed": %s}}"""
+import simplejson
 
 
 def is_task_done(request, task_id):
-    return HttpResponse(JSON_TASK_STATUS % (
-        task_id, is_done(task_id) and "true" or "false"))
+    response_data = {"task": {"id": task_id, "executed": is_done(task_id)}}
+    return HttpResponse(simplejson.dumps(response_data))