Ensured that OrderedDict is imported on python 2.6/2.7

The server is OK without this, but we need it for local unit tests

Author: David Noble

splunklib/searchcommands/decorators.py

@@ -14,9 +14,13 @@
 
 from inspect import getmembers, isclass, isfunction
 from types import FunctionType, MethodType
-from collections import OrderedDict
 from json import JSONEncoder
 
+try:
+    from collections import OrderedDict  # must be python 2.7
+except ImportError:
+    from ordereddict import OrderedDict  # must be python 2.6
+
 from .search_command_internals import ConfigurationSettingsType
 from .validators import OptionName
 

splunklib/searchcommands/search_command.py

@@ -15,12 +15,18 @@
 from __future__ import absolute_import
 
 # Absolute imports
-from collections import OrderedDict
+
+try:
+    from collections import OrderedDict # python 2.7
+except ImportError:
+    from ordereddict import OrderedDict # python 2.6
+
 from inspect import getmembers
 from os import path
 from sys import argv, stdin, stdout
 
 # Relative imports
+
 from . import csv, logging
 from . decorators import Option
 from . validators import Boolean, Fieldname