Ask Solem 12 years ago
parent
commit
f219b6960f
5 changed files with 16 additions and 12 deletions
  1. 1 1
      celery/app/utils.py
  2. 4 3
      celery/contrib/migrate.py
  3. 10 6
      celery/result.py
  4. 0 1
      celery/tests/__init__.py
  5. 1 1
      pavement.py

+ 1 - 1
celery/app/utils.py

@@ -145,7 +145,7 @@ def bugreport(app):
         billiard_v=billiard.__version__,
         py_v=_platform.python_version(),
         driver_v=driver_v,
-        transport= app.conf.BROKER_TRANSPORT or 'amqp',
+        transport=app.conf.BROKER_TRANSPORT or 'amqp',
         results=app.conf.CELERY_RESULT_BACKEND or 'disabled',
         human_settings=app.conf.humanize(),
         loader=qualname(app.loader.__class__),

+ 4 - 3
celery/contrib/migrate.py

@@ -350,10 +350,11 @@ def move_by_taskmap(map, **kwargs):
     return move(task_name_in_map, **kwargs)
 
 
+def filter_status(state, body, message, **kwargs):
+    print(MOVING_PROGRESS_FMT.format(state=state, body=body, **kwargs))
+
+
 move_direct = partial(move, transform=worker_direct)
 move_direct_by_id = partial(move_task_by_id, transform=worker_direct)
 move_direct_by_idmap = partial(move_by_idmap, transform=worker_direct)
 move_direct_by_taskmap = partial(move_by_taskmap, transform=worker_direct)
-
-def filter_status(state, body, message, **kwargs):
-    print(MOVING_PROGRESS_FMT.format(state=state, body=body, **kwargs))

+ 10 - 6
celery/result.py

@@ -276,12 +276,14 @@ class AsyncResult(ResultBase):
         return self.backend.get_status(self.id)
     status = state
 
-    def _get_task_id(self):
+    @property
+    def task_id(self):
+        """compat alias to :attr:`id`"""
         return self.id
 
-    def _set_task_id(self, id):
+    @task_id.setter  # noqa
+    def task_id(self, id):
         self.id = id
-    task_id = property(_get_task_id, _set_task_id)
 BaseAsyncResult = AsyncResult  # for backwards compatibility.
 
 
@@ -629,12 +631,14 @@ class TaskSetResult(GroupResult):
         """Deprecated: Use ``len(r)``."""
         return len(self)
 
-    def _get_taskset_id(self):
+    @property
+    def taskset_id(self):
+        """compat alias to :attr:`self.id`"""
         return self.id
 
-    def _set_taskset_id(self, id):
+    @taskset_id.setter  # noqa
+    def taskset_id(self, id):
         self.id = id
-    taskset_id = property(_get_taskset_id, _set_taskset_id)
 
 
 class EagerResult(AsyncResult):

+ 0 - 1
celery/tests/__init__.py

@@ -79,7 +79,6 @@ def import_all_modules(name=__name__, file=__file__,
 
 
 if os.environ.get('COVER_ALL_MODULES') or '--with-coverage3' in sys.argv:
-    import warnings
     with warnings.catch_warnings(record=True):
         import_all_modules()
     warnings.resetwarnings()

+ 1 - 1
pavement.py

@@ -87,7 +87,7 @@ def flake8(options):
     sh("""flake8 celery | perl -mstrict -mwarnings -nle'
         my $ignore = m/too complex \((\d+)\)/ && $1 le {0};
         if (! $ignore) {{ print STDERR; our $FOUND_FLAKE = 1 }}
-    }{exit $FOUND_FLAKE;
+    }}{{exit $FOUND_FLAKE;
         '""".format(complexity), ignore_error=noerror)