Skip to content

new style classes #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blovering merged 1 commit into from
Nov 2, 2011
Merged

new style classes #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions splunk/binding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion splunk/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions splunk/results.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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_)

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down