Moves .utils.lpmerge to .utils.collections.lpmerge

celery/app/routes.py

@@ -18,7 +18,7 @@ from kombu import Queue
 
 from celery.exceptions import QueueNotFound
 from celery.five import items, string_t
-from celery.utils import lpmerge
+from celery.utils.collections import lpmerge
 from celery.utils.functional import firstmethod, fun_takes_argument, mlazy
 from celery.utils.imports import instantiate
 

celery/utils/__init__.py

@@ -20,7 +20,7 @@ from .functional import memoize  # noqa
 
 from .nodenames import worker_direct, nodename, nodesplit
 
-__all__ = ['worker_direct', 'lpmerge',
+__all__ = ['worker_direct',
            'is_iterable', 'maybe_reraise', 'strtobool',
            'jsonify', 'gen_task_name', 'nodename', 'nodesplit',
            'cached_property']
@@ -28,15 +28,6 @@ __all__ = ['worker_direct', 'lpmerge',
 PY3 = sys.version_info[0] == 3
 
 
-def lpmerge(L, R):
-    """In place left precedent dictionary merge.
-
-    Keeps values from `L`, if the value in `R` is :const:`None`."""
-    setitem = L.__setitem__
-    [setitem(k, v) for k, v in items(R) if v is not None]
-    return L
-
-
 def is_iterable(obj):
     try:
         iter(obj)

celery/utils/collections.py

@@ -39,7 +39,8 @@ except ImportError:
 __all__ = [
     'AttributeDictMixin', 'AttributeDict', 'BufferMap', 'ChainMap',
     'ConfigurationView', 'DictAttribute', 'Evictable',
-    'LimitedSet', 'Messagebuffer', 'OrderedDict', 'force_mapping',
+    'LimitedSet', 'Messagebuffer', 'OrderedDict',
+    'force_mapping', 'lpmerge',
 ]
 
 PY3 = sys.version_info[0] >= 3
@@ -55,6 +56,15 @@ def force_mapping(m):
     return DictAttribute(m) if not isinstance(m, Mapping) else m
 
 
+def lpmerge(L, R):
+    """In place left precedent dictionary merge.
+
+    Keeps values from `L`, if the value in `R` is :const:`None`."""
+    setitem = L.__setitem__
+    [setitem(k, v) for k, v in items(R) if v is not None]
+    return L
+
+
 class OrderedDict(_OrderedDict):
 
     if PY3:  # pragma: no cover