Skip to content

Commit

Permalink
Use ' instead of "
Browse files Browse the repository at this point in the history
  • Loading branch information
@ask
ask committed Jun 14, 2012
1 parent cc1ae88 commit 566c4da
Show file tree
Hide file tree
Showing 107 changed files with 2,270 additions and 2,263 deletions.
8 changes: 8 additions & 0 deletions LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,14 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.

Documentation License
=====================

The documentation portion of Celery (the rendered contents of the
"docs" directory of a software distribution or checkout) is supplied
under the Creative Commons Attribution-Noncommercial-Share Alike 3.0
United States License as described by
http://creativecommons.org/licenses/by-nc-sa/3.0/us/

Footnotes
=========
Expand Down
70 changes: 35 additions & 35 deletions celery/__compat__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
The module %s is deprecated and will be removed in a future version.
"""

DEFAULT_ATTRS = set(["__file__", "__path__", "__doc__", "__all__"])
DEFAULT_ATTRS = set(['__file__', '__path__', '__doc__', '__all__'])

# im_func is no longer available in Py3.
# instead the unbound method itself can be used.
Expand All @@ -37,61 +37,61 @@ def fun_of_method(method): # noqa

def getappattr(path):
"""Gets attribute from the current_app recursively,
e.g. getappattr("amqp.get_task_consumer")``."""
e.g. getappattr('amqp.get_task_consumer')``."""
from celery import current_app
return current_app._rgetattr(path)


def _compat_task_decorator(*args, **kwargs):
from celery import current_app
kwargs.setdefault("accept_magic_kwargs", True)
kwargs.setdefault('accept_magic_kwargs', True)
return current_app.task(*args, **kwargs)


def _compat_periodic_task_decorator(*args, **kwargs):
from celery.task import periodic_task
kwargs.setdefault("accept_magic_kwargs", True)
kwargs.setdefault('accept_magic_kwargs', True)
return periodic_task(*args, **kwargs)


COMPAT_MODULES = {
"celery": {
"execute": {
"send_task": "send_task",
'celery': {
'execute': {
'send_task': 'send_task',
},
"decorators": {
"task": _compat_task_decorator,
"periodic_task": _compat_periodic_task_decorator,
'decorators': {
'task': _compat_task_decorator,
'periodic_task': _compat_periodic_task_decorator,
},
"log": {
"get_default_logger": "log.get_default_logger",
"setup_logger": "log.setup_logger",
"setup_loggig_subsystem": "log.setup_logging_subsystem",
"redirect_stdouts_to_logger": "log.redirect_stdouts_to_logger",
'log': {
'get_default_logger': 'log.get_default_logger',
'setup_logger': 'log.setup_logger',
'setup_loggig_subsystem': 'log.setup_logging_subsystem',
'redirect_stdouts_to_logger': 'log.redirect_stdouts_to_logger',
},
"messaging": {
"TaskPublisher": "amqp.TaskPublisher",
"TaskConsumer": "amqp.TaskConsumer",
"establish_connection": "broker_connection",
"with_connection": "with_default_connection",
"get_consumer_set": "amqp.TaskConsumer",
'messaging': {
'TaskPublisher': 'amqp.TaskPublisher',
'TaskConsumer': 'amqp.TaskConsumer',
'establish_connection': 'broker_connection',
'with_connection': 'with_default_connection',
'get_consumer_set': 'amqp.TaskConsumer',
},
"registry": {
"tasks": "tasks",
'registry': {
'tasks': 'tasks',
},
},
"celery.task": {
"control": {
"broadcast": "control.broadcast",
"rate_limit": "control.rate_limit",
"time_limit": "control.time_limit",
"ping": "control.ping",
"revoke": "control.revoke",
"discard_all": "control.purge",
"inspect": "control.inspect",
'celery.task': {
'control': {
'broadcast': 'control.broadcast',
'rate_limit': 'control.rate_limit',
'time_limit': 'control.time_limit',
'ping': 'control.ping',
'revoke': 'control.revoke',
'discard_all': 'control.purge',
'inspect': 'control.inspect',
},
"schedules": "celery.schedules",
"chords": "celery.canvas",
'schedules': 'celery.schedules',
'chords': 'celery.canvas',
}
}

Expand Down Expand Up @@ -187,7 +187,7 @@ def prepare(attr):
fqdn = '.'.join([pkg.__name__, name])
module = sys.modules[fqdn] = import_module(attrs)
return module
attrs["__all__"] = attrs.keys()
attrs['__all__'] = attrs.keys()
return create_module(name, dict(attrs), pkg=pkg, prepare_attr=prepare)


Expand Down
40 changes: 17 additions & 23 deletions celery/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

from __future__ import absolute_import

VERSION = (2, 6, 0, "rc4")
__version__ = ".".join(map(str, VERSION[0:3])) + "".join(VERSION[3:])
__author__ = "Ask Solem"
__contact__ = "[email protected]"
__homepage__ = "http://celeryproject.org"
__docformat__ = "restructuredtext"
VERSION = (2, 6, 0, 'rc4')
__version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:])
__author__ = 'Ask Solem'
__contact__ = '[email protected]'
__homepage__ = 'http://celeryproject.org'
__docformat__ = 'restructuredtext'

# -eof meta-

Expand All @@ -21,22 +21,16 @@

old_module, new_module = recreate_module(__name__, # pragma: no cover
by_module={
"celery.app": ["Celery", "bugreport"],
"celery.app.task": ["Task"],
"celery.state": ["current_app", "current_task"],
"celery.canvas": ["chain", "chord", "chunks",
"group", "subtask", "xmap", "xstarmap"],
"celery.utils": ["uuid"],
'celery.app': ['Celery', 'bugreport'],
'celery.app.task': ['Task'],
'celery.state': ['current_app', 'current_task'],
'celery.canvas': ['chain', 'chord', 'chunks',
'group', 'subtask', 'xmap', 'xstarmap'],
'celery.utils': ['uuid'],
},
direct={"task": "celery.task"},
__package__="celery",
__file__=__file__,
__path__=__path__,
__doc__=__doc__,
__version__=__version__,
__author__=__author__,
__contact__=__contact__,
__homepage__=__homepage__,
__docformat__=__docformat__,
VERSION=VERSION,
direct={'task': 'celery.task'},
__package__='celery', __file__=__file__,
__path__=__path__, __doc__=__doc__, __version__=__version__,
__author__=__author__, __contact__=__contact__,
__homepage__=__homepage__, __docformat__=__docformat__, VERSION=VERSION,
)
18 changes: 9 additions & 9 deletions celery/app/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
#: is no active app.
app_or_default = None

#: The "default" loader is the default loader used by old applications.
default_loader = os.environ.get("CELERY_LOADER") or "default"
#: The 'default' loader is the default loader used by old applications.
default_loader = os.environ.get('CELERY_LOADER') or 'default'

#: Global fallback app instance.
set_default_app(Celery("default", loader=default_loader,
set_default_app(Celery('default', loader=default_loader,
set_as_current=False,
accept_magic_kwargs=True))

Expand All @@ -53,13 +53,13 @@ def _app_or_default_trace(app=None): # pragma: no cover
from traceback import print_stack
from billiard import current_process
if app is None:
if getattr(state._tls, "current_app", None):
print("-- RETURNING TO CURRENT APP --") # noqa+
if getattr(state._tls, 'current_app', None):
print('-- RETURNING TO CURRENT APP --') # noqa+
print_stack()
return state._tls.current_app
if current_process()._name == "MainProcess":
raise Exception("DEFAULT APP")
print("-- RETURNING TO DEFAULT APP --") # noqa+
if current_process()._name == 'MainProcess':
raise Exception('DEFAULT APP')
print('-- RETURNING TO DEFAULT APP --') # noqa+
print_stack()
return state.default_app
return app
Expand All @@ -74,7 +74,7 @@ def disable_trace():
global app_or_default
app_or_default = _app_or_default

if os.environ.get("CELERY_TRACE_APP"): # pragma: no cover
if os.environ.get('CELERY_TRACE_APP'): # pragma: no cover
enable_trace()
else:
disable_trace()
Expand Down
10 changes: 5 additions & 5 deletions celery/app/abstract.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ def get_key(self, attr):
class _configurated(type):

def __new__(cls, name, bases, attrs):
attrs["__confopts__"] = dict((attr, spec.get_key(attr))
attrs['__confopts__'] = dict((attr, spec.get_key(attr))
for attr, spec in attrs.iteritems()
if isinstance(spec, from_config))
inherit_from = attrs.get("inherit_confopts", ())
inherit_from = attrs.get('inherit_confopts', ())
for subcls in bases:
try:
attrs["__confopts__"].update(subcls.__confopts__)
attrs['__confopts__'].update(subcls.__confopts__)
except AttributeError:
pass
for subcls in inherit_from:
attrs["__confopts__"].update(subcls.__confopts__)
attrs['__confopts__'].update(subcls.__confopts__)
attrs = dict((k, v if not isinstance(v, from_config) else None)
for k, v in attrs.iteritems())
return super(_configurated, cls).__new__(cls, name, bases, attrs)
Expand All @@ -41,7 +41,7 @@ def __new__(cls, name, bases, attrs):
class configurated(object):
__metaclass__ = _configurated

def setup_defaults(self, kwargs, namespace="celery"):
def setup_defaults(self, kwargs, namespace='celery'):
confopts = self.__confopts__
app, find = self.app, self.app.conf.find_value_for_key

Expand Down
64 changes: 32 additions & 32 deletions celery/app/amqp.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,24 +90,24 @@ def add(self, queue, **kwargs):

def add_compat(self, name, **options):
# docs used to use binding_key as routing key
options.setdefault("routing_key", options.get("binding_key"))
options.setdefault('routing_key', options.get('binding_key'))
q = self[name] = entry_to_queue(name, **options)
return q

def format(self, indent=0, indent_first=True):
"""Format routing table into string for log dumps."""
active = self.consume_from
if not active:
return ""
return ''
info = [QUEUE_FORMAT.strip() % {
"name": (name + ":").ljust(12),
"exchange": q.exchange.name,
"exchange_type": q.exchange.type,
"routing_key": q.routing_key}
'name': (name + ':').ljust(12),
'exchange': q.exchange.name,
'exchange_type': q.exchange.type,
'routing_key': q.routing_key}
for name, q in sorted(active.iteritems())]
if indent_first:
return textindent("\n".join(info), indent)
return info[0] + "\n" + textindent("\n".join(info[1:]), indent)
return textindent('\n'.join(info), indent)
return info[0] + '\n' + textindent('\n'.join(info[1:]), indent)

def select_subset(self, wanted):
"""Sets :attr:`consume_from` by selecting a subset of the
Expand Down Expand Up @@ -141,8 +141,8 @@ class TaskProducer(Producer):
retry_policy = None

def __init__(self, channel=None, exchange=None, *args, **kwargs):
self.retry = kwargs.pop("retry", self.retry)
self.retry_policy = kwargs.pop("retry_policy",
self.retry = kwargs.pop('retry', self.retry)
self.retry_policy = kwargs.pop('retry_policy',
self.retry_policy or {})
exchange = exchange or self.exchange
self.queues = self.app.amqp.queues # shortcut
Expand All @@ -165,9 +165,9 @@ def delay_task(self, task_name, task_args=None, task_kwargs=None,
task_args = task_args or []
task_kwargs = task_kwargs or {}
if not isinstance(task_args, (list, tuple)):
raise ValueError("task args must be a list or tuple")
raise ValueError('task args must be a list or tuple')
if not isinstance(task_kwargs, dict):
raise ValueError("task kwargs must be a dictionary")
raise ValueError('task kwargs must be a dictionary')
if countdown: # Convert countdown to ETA.
now = now or self.app.now()
eta = now + timedelta(seconds=countdown)
Expand All @@ -177,21 +177,21 @@ def delay_task(self, task_name, task_args=None, task_kwargs=None,
eta = eta and eta.isoformat()
expires = expires and expires.isoformat()

body = {"task": task_name,
"id": task_id,
"args": task_args,
"kwargs": task_kwargs,
"retries": retries or 0,
"eta": eta,
"expires": expires,
"utc": self.utc,
"callbacks": callbacks,
"errbacks": errbacks}
body = {'task': task_name,
'id': task_id,
'args': task_args,
'kwargs': task_kwargs,
'retries': retries or 0,
'eta': eta,
'expires': expires,
'utc': self.utc,
'callbacks': callbacks,
'errbacks': errbacks}
group_id = group_id or taskset_id
if group_id:
body["taskset"] = group_id
body['taskset'] = group_id
if chord:
body["chord"] = chord
body['chord'] = chord

self.publish(body, exchange=exchange, mandatory=mandatory,
immediate=immediate, routing_key=routing_key,
Expand All @@ -203,7 +203,7 @@ def delay_task(self, task_name, task_args=None, task_kwargs=None,

signals.task_sent.send(sender=task_name, **body)
if event_dispatcher:
event_dispatcher.send("task-sent", uuid=task_id,
event_dispatcher.send('task-sent', uuid=task_id,
name=task_name,
args=repr(task_args),
kwargs=repr(task_kwargs),
Expand All @@ -218,14 +218,14 @@ class TaskPublisher(TaskProducer):
"""Deprecated version of :class:`TaskProducer`."""

def __init__(self, channel=None, exchange=None, *args, **kwargs):
self.app = app_or_default(kwargs.pop("app", self.app))
self.retry = kwargs.pop("retry", self.retry)
self.retry_policy = kwargs.pop("retry_policy",
self.app = app_or_default(kwargs.pop('app', self.app))
self.retry = kwargs.pop('retry', self.retry)
self.retry_policy = kwargs.pop('retry_policy',
self.retry_policy or {})
exchange = exchange or self.exchange
if not isinstance(exchange, Exchange):
exchange = Exchange(exchange,
kwargs.pop("exchange_type", "direct"))
kwargs.pop('exchange_type', 'direct'))
self.queues = self.app.amqp.queues # shortcut
super(TaskPublisher, self).__init__(channel, exchange, *args, **kwargs)

Expand Down Expand Up @@ -267,15 +267,15 @@ def Queues(self, queues, create_missing=None):
def Router(self, queues=None, create_missing=None):
"""Returns the current task router."""
return _routes.Router(self.routes, queues or self.queues,
self.app.either("CELERY_CREATE_MISSING_QUEUES",
self.app.either('CELERY_CREATE_MISSING_QUEUES',
create_missing), app=self.app)

@cached_property
def TaskConsumer(self):
"""Return consumer configured to consume from the queues
we are configured for (``app.amqp.queues.consume_from``)."""
return self.app.subclass_with_self(TaskConsumer,
reverse="amqp.TaskConsumer")
reverse='amqp.TaskConsumer')
get_task_consumer = TaskConsumer # XXX compat

@cached_property
Expand All @@ -287,7 +287,7 @@ def TaskProducer(self):
"""
conf = self.app.conf
return self.app.subclass_with_self(TaskProducer,
reverse="amqp.TaskProducer",
reverse='amqp.TaskProducer',
exchange=self.default_exchange,
routing_key=conf.CELERY_DEFAULT_ROUTING_KEY,
serializer=conf.CELERY_TASK_SERIALIZER,
Expand Down
Loading

0 comments on commit 566c4da

Please sign in to comment.