ofproto: Remove dummy 'in_port' variable.

[openvswitch] / python / ovs / jsonrpc.py

diff --git a/python/ovs/jsonrpc.py b/python/ovs/jsonrpc.py
index 1cc36964d5a32c18da0f37e9b20390b694de9384..5117944137e7ac15661c1ff4789f27c07c2c5cd3 100644 (file)
--- a/python/ovs/jsonrpc.py
+++ b/python/ovs/jsonrpc.py
@@ -72,8 +72,7 @@ class Message(object):
     def type_to_string(type_):
         return Message.__types[type_]
 
-    @staticmethod
-    def __validate_arg(value, name, must_have):
+    def __validate_arg(self, value, name, must_have):
         if (value is not None) == (must_have != 0):
             return None
         else:
@@ -96,11 +95,11 @@ class Message(object):
             return "invalid JSON-RPC message type %s" % self.type
 
         return (
-            Message.__validate_arg(self.method, "method", pattern & 0x10000) or
-            Message.__validate_arg(self.params, "params", pattern & 0x1000) or
-            Message.__validate_arg(self.result, "result", pattern & 0x100) or
-            Message.__validate_arg(self.error, "error", pattern & 0x10) or
-            Message.__validate_arg(self.id, "id", pattern & 0x1))
+            self.__validate_arg(self.method, "method", pattern & 0x10000) or
+            self.__validate_arg(self.params, "params", pattern & 0x1000) or
+            self.__validate_arg(self.result, "result", pattern & 0x100) or
+            self.__validate_arg(self.error, "error", pattern & 0x10) or
+            self.__validate_arg(self.id, "id", pattern & 0x1))
 
     @staticmethod
     def from_json(json):
@@ -174,7 +173,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 +248,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 +259,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 +320,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)
@@ -360,7 +359,7 @@ class Session(object):
         reconnect.enable(ovs.timeval.msec())
 
         if ovs.stream.PassiveStream.is_valid_name(name):
-            self.reconnect.set_passive(True, ovs.timeval.msec())
+            reconnect.set_passive(True, ovs.timeval.msec())
 
         return Session(reconnect, None)