Permalink
Browse files

Merge branch '2.5'

  • Loading branch information...
2 parents 817a122 + 3835ea9 commit 39f87249610e0737e3cbfd1f557d8ab09af34079 @ask committed May 1, 2012
Showing with 20 additions and 6 deletions.
  1. +8 −0 Changelog
  2. +1 −1 README.rst
  3. +1 −1 djcelery/__init__.py
  4. +8 −3 djcelery/admin_utils.py
  5. +1 −0 djcelery/loaders.py
  6. +1 −1 docs/introduction.rst
View
@@ -5,6 +5,14 @@
.. contents::
:local:
+.. _version-2.5.5:
+
+2.5.5
+=====
+:release-date: 2012-04-19 01:46 P.M BST
+
+* Fixed bug where task modules were not imported.
+
.. _version-2.5.4:
2.5.4
View
@@ -4,7 +4,7 @@
.. image:: http://cloud.github.com/downloads/ask/celery/celery_128.png
-:Version: 2.5.4
+:Version: 2.5.5
:Web: http://celeryproject.org/
:Download: http://pypi.python.org/pypi/django-celery/
:Source: http://github.com/ask/django-celery/
@@ -5,7 +5,7 @@
import os
-VERSION = (2, 5, 4)
+VERSION = (2, 5, 5)
__version__ = ".".join(map(str, VERSION[0:3])) + "".join(VERSION[3:])
__author__ = "Ask Solem"
__contact__ = "ask@celeryproject.org"
@@ -4,6 +4,11 @@
from django.utils.html import escape
+FIXEDWIDTH_STYLE = '''\
+<span title="%s", style="font-size: %spt; \
+font-family: Menlo, Courier; ">%s</span> \
+'''
+
def attrs(**kwargs):
def _inner(fun):
@@ -38,7 +43,7 @@ def f(task):
if len(shortval) > maxlen:
shortval = shortval[:maxlen] + "..."
- return """<span title="%s", style="font-size: %spt;\
- font-family: Menlo, Courier; ">%s</span>""" % (
- escape(val[:255]), pt, escape(shortval)).replace("|br/|", "<br/>")
+ styled = FIXEDWIDTH_STYLE % (escape(val[:255]), pt,
+ escape(shortval))
+ return styled.replace("|br/|", "<br/>")
return f
View
@@ -107,6 +107,7 @@ def on_worker_init(self):
if settings.DEBUG:
warnings.warn("Using settings.DEBUG leads to a memory leak, never "
"use this setting in production environments!")
+ self.import_default_modules()
self.close_database()
self.close_cache()
@@ -4,7 +4,7 @@
.. image:: http://cloud.github.com/downloads/ask/celery/celery_128.png
-:Version: 2.5.4
+:Version: 2.5.5
:Web: http://celeryproject.org/
:Download: http://pypi.python.org/pypi/django-celery/
:Source: http://github.com/ask/django-celery/

0 comments on commit 39f8724

Please sign in to comment.