Browse Source

celery.abstract -> celery.worker.abstract

Ask Solem 13 years ago
parent
commit
16d71d2244

+ 4 - 4
celery/abstract.py → celery/worker/abstract.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    celery.abstract
-    ~~~~~~~~~~~~~~~
+    celery.worker.abstract
+    ~~~~~~~~~~~~~~~~~~~~~~
 
     Implements components and boot-steps.
 
@@ -14,8 +14,8 @@ from __future__ import absolute_import
 from collections import defaultdict
 from importlib import import_module
 
-from .datastructures import DependencyGraph
-from .utils.imports import instantiate
+from ..datastructures import DependencyGraph
+from ..utils.imports import instantiate
 
 
 class Namespace(object):

+ 2 - 1
celery/worker/autoreload.py

@@ -17,9 +17,10 @@ import time
 
 from collections import defaultdict
 
-from ..abstract import StartStopComponent
 from ..utils.threads import bgThread, Event
 
+from .abstract import StartStopComponent
+
 try:
     import pyinotify
     _ProcessEvent = pyinotify.ProcessEvent

+ 3 - 2
celery/worker/autoscale.py

@@ -21,10 +21,11 @@ import threading
 
 from time import sleep, time
 
-from . import state
-from ..abstract import StartStopComponent
 from ..utils.threads import bgThread
 
+from . import state
+from .abstract import StartStopComponent
+
 
 class WorkerComponent(StartStopComponent):
     name = "worker.autoscaler"

+ 1 - 1
celery/worker/consumer.py

@@ -83,7 +83,6 @@ import warnings
 
 from kombu.utils.encoding import safe_repr
 
-from ..abstract import StartStopComponent
 from ..app import app_or_default
 from ..datastructures import AttributeDict
 from ..exceptions import InvalidTaskError
@@ -91,6 +90,7 @@ from ..utils import timer2
 from ..utils.functional import noop
 
 from . import state
+from .abstract import StartStopComponent
 from .control import Panel
 from .heartbeat import Heart
 

+ 2 - 1
celery/worker/mediator.py

@@ -22,10 +22,11 @@ import logging
 
 from Queue import Empty
 
-from ..abstract import StartStopComponent
 from ..app import app_or_default
 from ..utils.threads import bgThread
 
+from .abstract import StartStopComponent
+
 
 class WorkerComponent(StartStopComponent):
     name = "worker.mediator"

+ 0 - 0
docs/internals/reference/celery.routes.rst → docs/internals/reference/celery.app.routes.rst


+ 0 - 11
docs/internals/reference/celery.log.rst

@@ -1,11 +0,0 @@
-==========================
- celery.log
-==========================
-
-.. contents::
-    :local:
-.. currentmodule:: celery.log
-
-.. automodule:: celery.log
-    :members:
-    :undoc-members:

+ 0 - 0
docs/internals/reference/celery.abstract.rst → docs/internals/reference/celery.worker.abstract.rst


+ 2 - 2
docs/internals/reference/index.rst

@@ -8,7 +8,6 @@
 .. toctree::
     :maxdepth: 1
 
-    celery.abstract
     celery.worker
     celery.worker.consumer
     celery.worker.job
@@ -19,6 +18,7 @@
     celery.worker.strategy
     celery.worker.autoreload
     celery.worker.autoscale
+    celery.worker.abstract
     celery.concurrency
     celery.concurrency.solo
     celery.concurrency.processes
@@ -41,11 +41,11 @@
     celery.app.abstract
     celery.app.annotations
     celery.app.state
+    celery.app.routes
     celery.security.certificate
     celery.security.key
     celery.security.serialization
     celery.datastructures
-    celery.routes
     celery.log
     celery.events.snapshot
     celery.events.cursesmon

+ 0 - 11
docs/reference/celery.actors.rst

@@ -1,11 +0,0 @@
-=====================================================
- celery.actors
-=====================================================
-
-.. contents::
-    :local:
-.. currentmodule:: celery.actors
-
-.. automodule:: celery.actors
-    :members:
-    :undoc-members:

+ 0 - 11
docs/reference/celery.registry.rst

@@ -1,11 +0,0 @@
-================================
- celery.registry
-================================
-
-.. contents::
-    :local:
-.. currentmodule:: celery.registry
-
-.. automodule:: celery.registry
-    :members:
-    :undoc-members:

+ 0 - 2
docs/reference/index.rst

@@ -21,7 +21,6 @@
     celery.task.sets
     celery.task.chords
     celery.result
-    celery.actors
     celery.task.control
     celery.task.http
     celery.schedules
@@ -33,7 +32,6 @@
     celery.loaders.app
     celery.loaders.default
     celery.loaders.base
-    celery.registry
     celery.states
     celery.contrib.abortable
     celery.contrib.batches