jgaunt/pykmip
2
0
Fork 0
mirror of https://github.com/openkmip/pykmip synced 2025-12-21 10:43:15 +00:00
Code Issues Releases Wiki Activity

Fixing infinite recursion bug with object inheritance

Browse Source 
This change removes all references to self.__class__. In object
hierarchies with multiple levels of inheritance, using self.__class__
can cause an infinite loop when resolving references to parent classes.
This commit is contained in:
Peter Hamilton
2015-06-02 11:16:42 -04:00
parent f57273fcc5
commit ab3298c6d1
14 changed files with 219 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
kmip/core/messages/messages.py
View File

@@ -38,7 +38,7 @@ class RequestHeader(Struct):
batch_order_option=None,
time_stamp=None,
batch_count=None):
super(self.__class__, self).__init__(tag=Tags.REQUEST_HEADER)
super(RequestHeader, self).__init__(tag=Tags.REQUEST_HEADER)
self.protocol_version = protocol_version
self.maximum_response_size = maximum_response_size
self.asynchronous_indicator = asynchronous_indicator
@@ -49,7 +49,7 @@ class RequestHeader(Struct):
self.batch_count = batch_count
def read(self, istream):
super(self.__class__, self).read(istream)
super(RequestHeader, self).read(istream)
tstream = BytearrayStream(istream.read(self.length))
self.protocol_version = contents.ProtocolVersion()
@@ -111,7 +111,7 @@ class RequestHeader(Struct):
# Write the length and value of the request header
self.length = tstream.length()
super(self.__class__, self).write(ostream)
super(RequestHeader, self).write(ostream)
ostream.write(tstream.buffer)
@@ -121,14 +121,14 @@ class ResponseHeader(Struct):
protocol_version=None,
time_stamp=None,
batch_count=None):
super(self.__class__, self).__init__(tag=Tags.RESPONSE_HEADER)
super(ResponseHeader, self).__init__(tag=Tags.RESPONSE_HEADER)
self.protocol_version = protocol_version
self.time_stamp = time_stamp
self.batch_count = batch_count
self.validate()
def read(self, istream):
super(self.__class__, self).read(istream)
super(ResponseHeader, self).read(istream)
tstream = BytearrayStream(istream.read(self.length))
self.protocol_version = contents.ProtocolVersion()
@@ -153,7 +153,7 @@ class ResponseHeader(Struct):
# Write the length and value of the request header
self.length = tstream.length()
super(self.__class__, self).write(ostream)
super(ResponseHeader, self).write(ostream)
ostream.write(tstream.buffer)
def validate(self):
@@ -175,7 +175,7 @@ class RequestBatchItem(Struct):
unique_batch_item_id=None,
request_payload=None,
message_extension=None):
super(self.__class__, self).__init__(tag=Tags.REQUEST_BATCH_ITEM)
super(RequestBatchItem, self).__init__(tag=Tags.REQUEST_BATCH_ITEM)
self.payload_factory = RequestPayloadFactory()
@@ -185,7 +185,7 @@ class RequestBatchItem(Struct):
self.message_extension = message_extension
def read(self, istream):
super(self.__class__, self).read(istream)
super(RequestBatchItem, self).read(istream)
tstream = BytearrayStream(istream.read(self.length))
# Read the batch item operation
@@ -226,7 +226,7 @@ class RequestBatchItem(Struct):
# Write the length and value of the batch item
self.length = tstream.length()
super(self.__class__, self).write(ostream)
super(RequestBatchItem, self).write(ostream)
ostream.write(tstream.buffer)
@@ -241,7 +241,7 @@ class ResponseBatchItem(Struct):
async_correlation_value=None,
response_payload=None,
message_extension=None):
super(self.__class__, self).__init__(tag=Tags.RESPONSE_BATCH_ITEM)
super(ResponseBatchItem, self).__init__(tag=Tags.RESPONSE_BATCH_ITEM)
self.payload_factory = ResponsePayloadFactory()
@@ -256,7 +256,7 @@ class ResponseBatchItem(Struct):
self.validate()
def read(self, istream):
super(self.__class__, self).read(istream)
super(ResponseBatchItem, self).read(istream)
tstream = BytearrayStream(istream.read(self.length))
# Read the batch item operation if it is present
@@ -327,7 +327,7 @@ class ResponseBatchItem(Struct):
# Write the length and value of the batch item
self.length = tstream.length()
super(self.__class__, self).write(ostream)
super(ResponseBatchItem, self).write(ostream)
ostream.write(tstream.buffer)
def validate(self):
@@ -337,12 +337,12 @@ class ResponseBatchItem(Struct):
class RequestMessage(Struct):
def __init__(self, request_header=None, batch_items=None,):
super(self.__class__, self).__init__(tag=Tags.REQUEST_MESSAGE)
super(RequestMessage, self).__init__(tag=Tags.REQUEST_MESSAGE)
self.request_header = request_header
self.batch_items = batch_items
def read(self, istream):
super(self.__class__, self).read(istream)
super(RequestMessage, self).read(istream)
self.request_header = RequestHeader()
self.request_header.read(istream)
@@ -363,20 +363,20 @@ class RequestMessage(Struct):
# Write the TTLV encoding of the request message
self.length = tstream.length()
super(self.__class__, self).write(ostream)
super(RequestMessage, self).write(ostream)
ostream.write(tstream.buffer)
class ResponseMessage(Struct):
def __init__(self, response_header=None, batch_items=None,):
super(self.__class__, self).__init__(tag=Tags.RESPONSE_MESSAGE)
super(ResponseMessage, self).__init__(tag=Tags.RESPONSE_MESSAGE)
self.response_header = response_header
self.batch_items = batch_items
self.validate()
def read(self, istream):
super(self.__class__, self).read(istream)
super(ResponseMessage, self).read(istream)
self.response_header = ResponseHeader()
self.response_header.read(istream)
@@ -398,7 +398,7 @@ class ResponseMessage(Struct):
# Write the TTLV encoding of the request message
self.length = tstream.length()
super(self.__class__, self).write(ostream)
super(ResponseMessage, self).write(ostream)
ostream.write(tstream.buffer)
def validate(self):