Now imports OrderedDict directly from collections

celery/bin/multi.py

@@ -103,13 +103,12 @@ import signal
 import socket
 import sys
 
-from collections import defaultdict, namedtuple
+from collections import OrderedDict, defaultdict, namedtuple
 from functools import partial
 from subprocess import Popen
 from time import sleep
 
 from kombu.utils import cached_property
-from kombu.utils.compat import OrderedDict
 from kombu.utils.encoding import from_utf8
 
 from celery import VERSION_BANNER

celery/five.py

@@ -14,9 +14,8 @@ __all__ = ['Counter', 'reload', 'UserList', 'UserDict', 'Queue', 'Empty',
            'zip_longest', 'map', 'string', 'string_t',
            'long_t', 'text_t', 'range', 'int_types', 'items', 'keys', 'values',
            'nextfun', 'reraise', 'WhateverIO', 'with_metaclass',
-           'OrderedDict', 'THREAD_TIMEOUT_MAX', 'format_d',
-           'class_property', 'reclassmethod', 'create_module',
-           'recreate_module', 'monotonic']
+           'THREAD_TIMEOUT_MAX', 'format_d', 'class_property', 'reclassmethod',
+           'create_module', 'recreate_module', 'monotonic']
 
 import io
 
@@ -152,10 +151,6 @@ def with_metaclass(Type, skip_attrs={'__dict__', '__weakref__'}):
     return _clone_with_metaclass
 
 
-############## collections.OrderedDict ######################################
-# was moved to kombu
-from kombu.utils.compat import OrderedDict  # noqa
-
 ############## threading.TIMEOUT_MAX #######################################
 try:
     from threading import TIMEOUT_MAX as THREAD_TIMEOUT_MAX

celery/result.py

@@ -11,12 +11,11 @@ from __future__ import absolute_import
 import time
 import warnings
 
-from collections import deque
+from collections import OrderedDict, deque
 from contextlib import contextmanager
 from copy import copy
 
 from kombu.utils import cached_property
-from kombu.utils.compat import OrderedDict
 
 from . import current_app
 from . import states

celery/utils/functional.py

@@ -11,12 +11,12 @@ from __future__ import absolute_import
 import sys
 import threading
 
+from collections import OrderedDict
 from functools import wraps
 from itertools import islice
 
 from kombu.utils import cached_property
 from kombu.utils.functional import lazy, maybe_evaluate, is_list, maybe_list
-from kombu.utils.compat import OrderedDict
 
 from celery.five import UserDict, UserList, items, keys
 

funtests/stress/stress/suite.py

@@ -6,12 +6,10 @@ import random
 import socket
 import sys
 
-from collections import defaultdict, namedtuple
+from collections import OrderedDict, defaultdict, namedtuple
 from itertools import count
 from time import sleep
 
-from kombu.utils.compat import OrderedDict
-
 from celery import group, VERSION_BANNER
 from celery.exceptions import TimeoutError
 from celery.five import items, monotonic, range, values