Tests passing

celery/concurrency/processes.py

@@ -17,7 +17,7 @@ import select
 import socket
 import struct
 
-from collections import Counter, deque, namedtuple
+from collections import deque, namedtuple
 from pickle import HIGHEST_PROTOCOL
 from time import sleep, time
 
@@ -37,7 +37,7 @@ from celery import platforms
 from celery import signals
 from celery._state import set_default_app
 from celery.concurrency.base import BasePool
-from celery.five import items, values
+from celery.five import Counter, items, values
 from celery.task import trace
 from celery.utils.log import get_logger
 from celery.worker.hub import READ, WRITE, ERR

celery/five.py

@@ -10,6 +10,14 @@
 """
 from __future__ import absolute_import
 
+try:
+    from collections import Counter
+except ImportError:
+    from collections import defaultdict
+
+    def Counter():
+        return defaultdict(int)
+
 ############## py3k #########################################################
 import sys
 PY3 = sys.version_info[0] == 3

celery/tests/concurrency/test_processes.py

@@ -166,7 +166,7 @@ class test_TaskPool(Case):
                             soft_timeout=5)
         info = pool.info
         self.assertEqual(info['max-concurrency'], pool.limit)
-        self.assertIsNone(info['max-tasks-per-child'])
+        self.assertEqual(info['max-tasks-per-child'], 'N/A')
         self.assertEqual(info['timeouts'], (5, 10))
 
     def test_num_processes(self):

celery/worker/state.py

@@ -16,13 +16,12 @@ import sys
 import platform
 import shelve
 
-from collections import Counter
-
 from kombu.serialization import pickle_protocol
 from kombu.utils import cached_property
 
 from celery import __version__
 from celery.exceptions import SystemTerminate
+from celery.five import Counter
 from celery.datastructures import LimitedSet
 
 #: Worker software/platform information.