X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=python%2Fovs%2Fjsonrpc.py;h=da7fa084bd37524993ae3d596bc1c40c2d6a6b47;hb=63b1a5213331cd962be05df57f1375db902216c5;hp=1cc36964d5a32c18da0f37e9b20390b694de9384;hpb=22bb61e9ee9576e77495c0c5c71fa2d243a98fb6;p=openvswitch diff --git a/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py index 1cc36964..da7fa084 100644 --- a/python/ovs/jsonrpc.py +++ b/python/ovs/jsonrpc.py @@ -174,7 +174,7 @@ class Message(object): class Connection(object): def __init__(self, stream): - self.name = stream.get_name() + self.name = stream.name self.stream = stream self.status = 0 self.input = "" @@ -249,7 +249,7 @@ class Connection(object): return self.status, None while True: - if len(self.input) == 0: + if not self.input: error, data = self.stream.recv(4096) if error: if error == errno.EAGAIN: @@ -260,7 +260,7 @@ class Connection(object): % (self.name, os.strerror(error))) self.error(error) return self.status, None - elif len(data) == 0: + elif not data: self.error(EOF) return EOF, None else: @@ -321,7 +321,7 @@ class Connection(object): return msg def recv_wait(self, poller): - if self.status or len(self.input) > 0: + if self.status or self.input: poller.immediate_wake() else: self.stream.recv_wait(poller)