ovs.stream: Drop Stream.get_name() since clients can use 'name' directly.

[openvswitch] / python / ovs / jsonrpc.py

diff --git a/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py
index 66c260fa13ea7b834935a1e505f323b318a2c8eb..da7fa084bd37524993ae3d596bc1c40c2d6a6b47 100644 (file)
--- 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 = ""
@@ -215,9 +215,6 @@ class Connection(object):
         else:
             return len(self.output)
 
-    def get_name(self):
-        return self.name
-
     def __log_msg(self, title, msg):
         logging.debug("%s: %s %s" % (self.name, title, msg))
 
@@ -252,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:
@@ -263,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:
@@ -324,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)
@@ -371,7 +368,7 @@ class Session(object):
     def open_unreliably(jsonrpc):
         reconnect = ovs.reconnect.Reconnect(ovs.timeval.msec())
         reconnect.set_quiet(True)
-        reconnect.set_name(jsonrpc.get_name())
+        reconnect.set_name(jsonrpc.name)
         reconnect.set_max_tries(0)
         reconnect.connected(ovs.timeval.msec())
         return Session(reconnect, jsonrpc)