Fix odict deprecation warnings by using collections.OrderedDict and salt.utils.datastructures Resolves QubesOS/qubes-issues#10742

Author: therohityadav

_modules/topd.py

@@ -21,7 +21,8 @@
 import salt.version
 
 from salt.exceptions import SaltRenderError
-from salt.utils.odict import (OrderedDict, DefaultOrderedDict)
+from collections import OrderedDict
+from salt.utils.datastructures import DefaultOrderedDict
 
 # Import custom libs
 from toputils import TopUtils  # pylint: disable=E0401

_utils/fileinfo.py

@@ -21,7 +21,7 @@
 from itertools import (chain, compress, )  # pylint: disable=E0598
 
 # Import salt libs
-from salt.utils.odict import OrderedDict
+from collections import OrderedDict
 
 # Import custom libs
 import matcher

_utils/matcher.py

@@ -20,7 +20,7 @@
 from itertools import (chain, compress, )  # pylint: disable=E0598
 
 # Import salt libs
-from salt.utils.odict import OrderedDict
+from collections import OrderedDict
 
 # Enable logging
 log = logging.getLogger(__name__)

_utils/pathinfo.py

@@ -16,7 +16,7 @@
 import os
 
 # Import salt libs
-from salt.utils.odict import OrderedDict
+from collections import OrderedDict
 
 # Import custom libs
 import matcher

_utils/pathutils.py

@@ -60,7 +60,8 @@
 import salt.fileclient
 
 from salt.exceptions import SaltRenderError
-from salt.utils.odict import (OrderedDict, DefaultOrderedDict)
+from collections import OrderedDict
+from salt.utils.datastructures import DefaultOrderedDict
 from salt.utils.url import urlparse
 
 # Import custom libs

_utils/toputils.py

@@ -40,7 +40,8 @@
 
 # Import salt libs
 from salt.exceptions import SaltRenderError
-from salt.utils.odict import (OrderedDict, DefaultOrderedDict)
+from collections import OrderedDict
+from salt.utils.datastructures import DefaultOrderedDict
 from salt.utils.jinja import PrintableDict
 
 # Import custom libs