Utils: Renames BufferMapping -> BufferMap

celery/backends/base.py

@@ -30,7 +30,7 @@ from kombu.utils.url import maybe_sanitize_url
 from celery import states
 from celery import current_app, group, maybe_signature
 from celery.app import current_task
-from celery.datastructures import BufferMapping
+from celery.datastructures import BufferMap
 from celery.exceptions import ChordError, TimeoutError, TaskRevokedError
 from celery.five import items
 from celery.result import (
@@ -114,7 +114,7 @@ class Backend(object):
         )
         self._pending_results = {}
         self._weak_pending_results = WeakValueDictionary()
-        self._pending_messages = BufferMapping(MESSAGE_BUFFER_MAX)
+        self._pending_messages = BufferMap(MESSAGE_BUFFER_MAX)
         self.url = url
 
     def as_uri(self, include_password=False):

celery/datastructures.py

@@ -938,7 +938,7 @@ Sequence.register(Messagebuffer)
 
 
 @python_2_unicode_compatible
-class BufferMapping(OrderedDict, Evictable):
+class BufferMap(OrderedDict, Evictable):
 
     Buffer = Messagebuffer
     Empty = Empty
@@ -948,7 +948,7 @@ class BufferMapping(OrderedDict, Evictable):
     bufmaxsize = None
 
     def __init__(self, maxsize, iterable=None, bufmaxsize=1000):
-        super(BufferMapping, self).__init__()
+        super(BufferMap, self).__init__()
         self.maxsize = maxsize
         self.bufmaxsize = 1000
         if iterable:
@@ -984,7 +984,7 @@ class BufferMapping(OrderedDict, Evictable):
             return buf
 
     def discard(self, key, *default):
-        super(BufferMapping, self).pop(key, *default)
+        super(BufferMap, self).pop(key, *default)
 
     def _LRUpop(self, *default):
         return self[self._LRUkey()].pop(*default)

celery/tests/utils/test_datastructures.py

@@ -10,7 +10,7 @@ from time import time
 
 from celery.datastructures import (
     AttributeDict,
-    BufferMapping,
+    BufferMap,
     ConfigurationView,
     DependencyGraph,
     DictAttribute,
@@ -494,10 +494,10 @@ class test_Messagebuffer(Case):
             self.assertEqual(b[i], i)
 
 
-class test_BufferMapping(Case):
+class test_BufferMap(Case):
 
     def test_append_limited(self):
-        b = BufferMapping(10)
+        b = BufferMap(10)
         for i in range(20):
             b.append(i, i)
         self.assert_size_and_first(b, 10, 10)
@@ -507,28 +507,28 @@ class test_BufferMapping(Case):
         self.assertEqual(buf._LRUpop(), expected_first_item)
 
     def test_append_unlimited(self):
-        b = BufferMapping(None)
+        b = BufferMap(None)
         for i in range(20):
             b.append(i, i)
         self.assert_size_and_first(b, 20, 0)
 
     def test_extend_limited(self):
-        b = BufferMapping(10)
+        b = BufferMap(10)
         b.extend(1, list(range(20)))
         self.assert_size_and_first(b, 10, 10)
 
     def test_extend_unlimited(self):
-        b = BufferMapping(None)
+        b = BufferMap(None)
         b.extend(1, list(range(20)))
         self.assert_size_and_first(b, 20, 0)
 
     def test_pop_empty_with_default(self):
-        b = BufferMapping(10)
+        b = BufferMap(10)
         sentinel = object()
         self.assertIs(b.pop(1, sentinel), sentinel)
 
     def test_pop_empty_no_default(self):
-        b = BufferMapping(10)
+        b = BufferMap(10)
         with self.assertRaises(b.Empty):
             b.pop(1)