2
0
mirror of https://github.com/openvswitch/ovs synced 2025-09-04 16:25:17 +00:00

ovs.jsonrpc: Fix static method Message.__validate_arg reference to 'self'.

This method needs to be an instance method because it refers to 'self'.

Found by pychecker.
This commit is contained in:
Ben Pfaff
2011-08-24 17:06:11 -07:00
parent 6732237bee
commit b2a5856fef

View File

@@ -72,8 +72,7 @@ class Message(object):
def type_to_string(type_): def type_to_string(type_):
return Message.__types[type_] return Message.__types[type_]
@staticmethod def __validate_arg(self, value, name, must_have):
def __validate_arg(value, name, must_have):
if (value is not None) == (must_have != 0): if (value is not None) == (must_have != 0):
return None return None
else: else:
@@ -96,11 +95,11 @@ class Message(object):
return "invalid JSON-RPC message type %s" % self.type return "invalid JSON-RPC message type %s" % self.type
return ( return (
Message.__validate_arg(self.method, "method", pattern & 0x10000) or self.__validate_arg(self.method, "method", pattern & 0x10000) or
Message.__validate_arg(self.params, "params", pattern & 0x1000) or self.__validate_arg(self.params, "params", pattern & 0x1000) or
Message.__validate_arg(self.result, "result", pattern & 0x100) or self.__validate_arg(self.result, "result", pattern & 0x100) or
Message.__validate_arg(self.error, "error", pattern & 0x10) or self.__validate_arg(self.error, "error", pattern & 0x10) or
Message.__validate_arg(self.id, "id", pattern & 0x1)) self.__validate_arg(self.id, "id", pattern & 0x1))
@staticmethod @staticmethod
def from_json(json): def from_json(json):