Merge commit 'f533dad6b42ee5a5eb07cda26604a99f44241949' into develop

Conflicts:
	splunklib/client.py

Author: Frederick Ross

splunklib/client.py

@@ -301,8 +301,19 @@ def connect(**kwargs):
     """
     return Service(**kwargs).login()
 
-class Service(Context):
-    """This class represents a binding to a Splunk instance on an
+# In preparation for adding Storm support, we added an
+# intermediary class between Service and Context. Storm's
+# API is not going to be the same as enterprise Splunk's
+# API, so we will derive both Service (for enterprise Splunk)
+# and StormService for (Splunk Storm) from _BaseService, and
+# put any shared behavior on it.
+class _BaseService(Context):
+    pass
+
+class Service(_BaseService):
+    """A Pythonic binding to Splunk instances.
+
+    A :class:`Service` represents a binding to a Splunk instane on an
     HTTP or HTTPS port. It handles the details of authentication, wire
     formats, and wraps the REST API endpoints into something more
     Pythonic. All of the low-level operations on the instance from
@@ -348,7 +359,7 @@ class Service(Context):
         s = client.Service(token="atg232342aa34324a")
     """
     def __init__(self, **kwargs):
-        Context.__init__(self, **kwargs)
+        super(Service, self).__init__(self, **kwargs)
         self._splunk_version = None
 
     @property