ordereddict and all its reference removed

Author: vmalaviya-splunk

examples/twitted/twitted/bin/tophashtags.py

@@ -19,10 +19,7 @@
 import os
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir, os.pardir)))
-try:
-    from collections import OrderedDict  # must be python 2.7
-except ImportError:
-    from splunklib.ordereddict import OrderedDict
+from collections import OrderedDict
 
 from splunklib import six
 from splunklib.six.moves import zip

splunklib/ordereddict.py

@@ -42,10 +42,7 @@
 except:
     import xml.etree.ElementTree as et
 
-try:
-    from collections import OrderedDict  # must be python 2.7
-except ImportError:
-    from .ordereddict import OrderedDict
+from collections import OrderedDict
 
 try:
     from splunklib.six.moves import cStringIO as StringIO

splunklib/results.py

@@ -17,10 +17,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 from splunklib import six
 
-try:
-    from collections import OrderedDict  # must be python 2.7
-except ImportError:
-    from ..ordereddict import OrderedDict
+from collections import OrderedDict  # must be python 2.7
 
 from inspect import getmembers, isclass, isfunction
 from splunklib.six.moves import map as imap

splunklib/searchcommands/decorators.py

@@ -19,10 +19,7 @@
 from io import TextIOWrapper
 from collections import deque, namedtuple
 from splunklib import six
-try:
-    from collections import OrderedDict  # must be python 2.7
-except ImportError:
-    from ..ordereddict import OrderedDict
+from collections import OrderedDict
 from splunklib.six.moves import StringIO
 from itertools import chain
 from splunklib.six.moves import map as imap

splunklib/searchcommands/internals.py

@@ -22,10 +22,7 @@
 
 import io
 
-try:
-    from collections import OrderedDict  # must be python 2.7
-except ImportError:
-    from ..ordereddict import OrderedDict
+from collections import OrderedDict
 from copy import deepcopy
 from splunklib.six.moves import StringIO
 from itertools import chain, islice

splunklib/searchcommands/search_command.py

@@ -21,10 +21,7 @@
 from splunklib.searchcommands import SearchMetric
 from splunklib import six
 from splunklib.six.moves import range
-try:
-    from collections import OrderedDict  # must be python 2.7
-except ImportError:
-    from splunklib.ordereddict import OrderedDict
+from collections import OrderedDict
 from collections import namedtuple, deque
 from splunklib.six import BytesIO as BytesIO
 from functools import wraps

tests/searchcommands/test_internals_v2.py

@@ -389,10 +389,7 @@ def test_results_reader(self):
             N_results = 0
             N_messages = 0
             for r in reader:
-                try:
-                    from collections import OrderedDict
-                except:
-                    from splunklib.ordereddict import OrderedDict
+                from collections import OrderedDict
                 self.assertTrue(isinstance(r, OrderedDict)
                                 or isinstance(r, results.Message))
                 if isinstance(r, OrderedDict):
@@ -411,10 +408,7 @@ def test_results_reader_with_streaming_results(self):
             N_results = 0
             N_messages = 0
             for r in reader:
-                try:
-                    from collections import OrderedDict
-                except:
-                    from splunklib.ordereddict import OrderedDict
+                from collections import OrderedDict
                 self.assertTrue(isinstance(r, OrderedDict)
                                 or isinstance(r, results.Message))
                 if isinstance(r, OrderedDict):