Merge pull request #8 from splunk/feature/new-style-classes

blovering · blovering · commit aaf9d0d7e6bc · 2011-11-01T17:17:06.000-07:00
new style classes
diff --git a/splunk/binding.py b/splunk/binding.py
@@ -42,7 +42,7 @@ def prefix(**kwargs):
     port = kwargs.get("port", DEFAULT_PORT)
     return "%s://%s:%s" % (scheme, host, port)
 
-class Context:
+class Context(object):
     # kwargs: scheme, host, port, username, password, namespace
     def __init__(self, handler=None, **kwargs):
         self.http = HttpLib(handler)
@@ -229,7 +229,7 @@ def request(self, url, headers=None, **kwargs):
         return response
 
 # Converts an httplib response into a file-like object.
-class ResponseReader:
+class ResponseReader(object):
     def __init__(self, response):
         self._response = response
 
diff --git a/splunk/client.py b/splunk/client.py
@@ -187,7 +187,7 @@ def users(self):
                 service.post(PATH_USERS, name=name, **kwargs),
             dtor=lambda service, name: service.delete(PATH_USERS + name))
 
-class Endpoint:
+class Endpoint(object):
     """The base class for all client layer endpoints."""
     def __init__(self, service, path):
         self.service = service
diff --git a/splunk/results.py b/splunk/results.py
@@ -22,7 +22,7 @@
 ]
 
 # Splices a list of strings and file-like objects into a single stream
-class ListStream:
+class ListStream(object):
     def __init__(self, *args):
         count = len(args)
         if count == 0:
@@ -57,7 +57,7 @@ def _next(self):
 # A file-like interface that will convert a stream of XML fragments, into
 # a well-formed XML document by injecting a root element into the stream.
 # This is basically an annoying hack and I'd love a better idea.
-class XMLStream:
+class XMLStream(object):
     def __init__(self, file_):
         self.file = XMLStream.prepare(file_)
 
@@ -104,7 +104,7 @@ def read(self, size):
 TAG = "TAG"         # kind, name, attrs
 END = "END"         # kind, name
 VAL = "VAL"         # kind, value
-class XMLReader:
+class XMLReader(object):
     def __init__(self, stream):
         self._items = pulldom.parse(XMLStream(stream), bufsize = 256)
         self._item = None   # The current item
@@ -225,7 +225,7 @@ def read(self):
 MESSAGE = "MESSAGE"
 RESULT = "RESULT"
 RESULTS = "RESULTS"
-class ResultsReader:
+class ResultsReader(object):
     """A forward-only, streaming search results reader."""
     def __init__(self, stream):
         self._reader = XMLReader(stream)
