flakes

Author: ask

Changelog

@@ -18,11 +18,12 @@
 
     Fix contributed by Brett Gibson.
 
-- celerycam: The cleanup phase now commits the transaction for every row
-  deleted.
+- No longer uses manual transaction management to be compatible with Django
+  1.6.
 
-    This is likely to make the cleanup considerably slower, but needs to work
-    with Django 1.6.
+    This will probably decrease performance considerably, e.g. for clean up
+    of celerycam events and for celerybeat which now needs to commit the
+    transaction for every operation.
 
 - The `celery` management command now performs validation checks (Issue #253).
 

djcelery/db.py

@@ -4,11 +4,11 @@
 from django.db import transaction
 
 try:
-    from django.db.transaction import atomic
+    from django.db.transaction import atomic  # noqa
 except ImportError:  # pragma: no cover
 
     try:
-        from django.db.transaction import Transaction
+        from django.db.transaction import Transaction  # noqa
     except ImportError:
         @contextmanager
         def commit_on_success(*args, **kwargs):
@@ -31,7 +31,7 @@ def commit_on_success(*args, **kwargs):
             finally:
                 transaction.leave_transaction_management(*args, **kwargs)
     else:  # pragma: no cover
-        from django.db.transaction import commit_on_success # noqa
+        from django.db.transaction import commit_on_success  # noqa
 
     commit_unless_managed = transaction.commit_unless_managed
     rollback_unless_managed = transaction.rollback_unless_managed
@@ -51,4 +51,3 @@ def commit_unless_managed(*args, **kwargs):  # noqa
 
     def rollback_unless_managed(*args, **kwargs):  # noqa
         pass
-

djcelery/managers.py

@@ -5,7 +5,7 @@
 from functools import wraps
 from itertools import count
 
-from django.db import transaction, connection
+from django.db import connection
 try:
     from django.db import connections, router
 except ImportError:  # pre-Django 1.2
@@ -17,9 +17,7 @@
 
 from celery.utils.timeutils import maybe_timedelta
 
-from .db import (
-    commit_on_success, commit_unless_managed, rollback_unless_managed,
-)
+from .db import commit_on_success, rollback_unless_managed
 from .utils import now
 
 
@@ -237,13 +235,10 @@ def expire_by_states(self, states, expires):
             return self.expired(states, expires).update(hidden=True)
 
     def purge(self):
-        meta = self.model._meta
-        cursor = self.connection_for_write().cursor()
-        cursor.execute(
-            'DELETE FROM {0.db_table} WHERE hidden=%s'.format(meta),
-            (True, ),
-        )
-        try:
-            commit_unless_managed()
-        except transaction.TransactionManagementError:
-            pass
+        with commit_on_success():
+            meta = self.model._meta
+            cursor = self.connection_for_write().cursor()
+            cursor.execute(
+                'DELETE FROM {0.db_table} WHERE hidden=%s'.format(meta),
+                (True, ),
+            )

djcelery/snapshot.py

@@ -12,7 +12,6 @@
 from celery.utils.log import get_logger
 from celery.utils.timeutils import maybe_iso8601
 
-from .db import commit_on_success
 from .models import WorkerState, TaskState
 from .utils import maybe_make_aware
 

djcelery/tests/test_snapshot.py

@@ -17,6 +17,7 @@
 _next_id = count(0).next
 _next_clock = count(1).next
 
+
 def Event(*args, **kwargs):
     kwargs.setdefault('clock', _next_clock())
     kwargs.setdefault('local_received', time())

djcelery/views.py

@@ -100,8 +100,12 @@ def add(request):
             y = int(request.GET['y'])
             return x + y
 
-        >>> response = add(request)
-        >>> response.content
+        def view(request):
+            response = add(request)
+            print(response.content)
+
+    Gives::
+
         "{'status': 'success', 'retval': 100}"
 
     """