Merge branch 'fross-feature/hotfix' into fross-feature/ordereddict

Author: Frederick Ross

splunklib/binding.py

@@ -36,7 +36,7 @@
 
 from xml.etree.ElementTree import XML
 
-from splunklib.data import record
+from data import record
 
 __all__ = [
     "AuthenticationError",

splunklib/client.py

@@ -67,9 +67,9 @@
 
 from time import sleep
 
-from splunklib.binding import Context, HTTPError, AuthenticationError, namespace, UrlEncoded
-import splunklib.data as data
-from splunklib.data import record
+from binding import Context, HTTPError, AuthenticationError, namespace, UrlEncoded
+from data import record
+import data
 
 __all__ = [
     "connect",