Use US spelling of cancelled -> canceled

celery/concurrency/asynpool.py

@@ -804,7 +804,7 @@ class AsynPool(_pool.Pool):
             # writes job to the worker process.
             # Operation must complete if more than one byte of data
             # was written.  If the broker connection is lost
-            # and no data was written the operation shall be cancelled.
+            # and no data was written the operation shall be canceled.
             header, body, body_size = job._payload
             errors = 0
             try:

celery/concurrency/eventlet.py

@@ -60,7 +60,7 @@ class Schedule(timer2.Schedule):
         g.entry = entry
         g.eta = eta
         g.priority = priority
-        g.cancelled = False
+        g.canceled = False
         return g
 
     def _entry_exit(self, g, entry):
@@ -69,7 +69,7 @@ class Schedule(timer2.Schedule):
                 g.wait()
             except self.GreenletExit:
                 entry.cancel()
-                g.cancelled = True
+                g.canceled = True
         finally:
             self._queue.discard(g)
 

celery/concurrency/gevent.py

@@ -56,7 +56,7 @@ class Schedule(timer2.Schedule):
         g.entry = entry
         g.eta = eta
         g.priority = priority
-        g.cancelled = False
+        g.canceled = False
         return g
 
     def _entry_exit(self, g):

celery/contrib/batches.py

@@ -225,7 +225,7 @@ class Batches(Task):
                 logger.debug('Batches: Buffer complete: %s', len(requests))
                 self.flush(requests)
         if not requests:
-            logger.debug('Batches: Cancelling timer: Nothing in buffer.')
+            logger.debug('Batches: Canceling timer: Nothing in buffer.')
             if self._tref:
                 self._tref.cancel()  # cancel timer.
             self._tref = None

celery/tests/utils/test_timer2.py

@@ -25,7 +25,7 @@ class test_Entry(Case):
     def test_cancel(self):
         tref = timer2.Entry(lambda x: x, (1, ), {})
         tref.cancel()
-        self.assertTrue(tref.cancelled)
+        self.assertTrue(tref.canceled)
 
     def test_repr(self):
         tref = timer2.Entry(lambda x: x(1, ), {})
@@ -118,7 +118,7 @@ class test_Timer(Case):
             args2, _ = t.schedule.enter_after.call_args_list[1]
             sec2, tref2, _ = args2
             self.assertEqual(sec2, 0.03)
-            tref2.cancelled = True
+            tref2.canceled = True
             tref2()
 
             self.assertEqual(t.schedule.enter_after.call_count, 2)

celery/tests/worker/test_control.py

@@ -309,7 +309,7 @@ class test_ControlPanel(AppCase):
 
         class MockConsumer(object):
             queues = []
-            cancelled = []
+            canceled = []
             consuming = False
 
             def add_queue(self, queue):
@@ -319,7 +319,7 @@ class test_ControlPanel(AppCase):
                 self.consuming = True
 
             def cancel_by_queue(self, queue):
-                self.cancelled.append(queue)
+                self.canceled.append(queue)
 
             def consuming_from(self, queue):
                 return queue in self.queues
@@ -333,7 +333,7 @@ class test_ControlPanel(AppCase):
         self.assertTrue(consumer.task_consumer.consuming)
         panel.handle('add_consumer', {'queue': 'MyQueue'})
         panel.handle('cancel_consumer', {'queue': 'MyQueue'})
-        self.assertIn('MyQueue', consumer.task_consumer.cancelled)
+        self.assertIn('MyQueue', consumer.task_consumer.canceled)
 
     def test_revoked(self):
         worker_state.revoked.clear()

celery/tests/worker/test_heartbeat.py

@@ -34,10 +34,10 @@ class MockTimer(object):
     def call_repeatedly(self, secs, fun, args=(), kwargs={}):
 
         class entry(tuple):
-            cancelled = False
+            canceled = False
 
             def cancel(self):
-                self.cancelled = True
+                self.canceled = True
 
         return entry((secs, fun, args, kwargs))
 

celery/worker/consumer.py

@@ -402,7 +402,7 @@ class Consumer(object):
             info('Started consuming from %s', queue)
 
     def cancel_task_queue(self, queue):
-        info('Cancelling queue %s', queue)
+        info('Canceling queue %s', queue)
         self.app.amqp.queues.deselect(queue)
         self.task_consumer.cancel_by_queue(queue)
 
@@ -618,7 +618,7 @@ class Tasks(bootsteps.StartStopStep):
 
     def stop(self, c):
         if c.task_consumer:
-            debug('Cancelling task consumer...')
+            debug('Canceling task consumer...')
             ignore_errors(c, c.task_consumer.cancel)
 
     def shutdown(self, c):

celery/worker/pidbox.py

@@ -66,7 +66,7 @@ class Pidbox(object):
     def shutdown(self, c):
         self.on_stop()
         if self.consumer:
-            debug('Cancelling broadcast consumer...')
+            debug('Canceling broadcast consumer...')
             ignore_errors(c, self.consumer.cancel)
         self.stop(self.c)
 

docs/userguide/workers.rst

@@ -628,8 +628,8 @@ even other options::
 
 .. control:: cancel_consumer
 
-Queues: Cancelling consumers
-----------------------------
+Queues: Canceling consumers
+---------------------------
 
 You can cancel a consumer by queue name using the :control:`cancel_consumer`
 control command.