python/ovs/socket_util: Fix error path in set_nonblocking.

[openvswitch] / python / ovs / socket_util.py

diff --git a/python/ovs/socket_util.py b/python/ovs/socket_util.py
index 845511e3b209a556ca353b27b43fb308e730ba6d..f54b9040ae051da61d6382d8fdda29152075ef6e 100644 (file)
--- a/python/ovs/socket_util.py
+++ b/python/ovs/socket_util.py
@@ -77,7 +77,7 @@ def make_unix_socket(style, nonblock, bind_path, connect_path):
 
 def check_connection_completion(sock):
     p = ovs.poller.SelectPoll()
-    p.register(sock, select.POLLOUT)
+    p.register(sock, ovs.poller.POLLOUT)
     if len(p.poll(0)) == 1:
         return get_socket_error(sock)
     else:
@@ -88,13 +88,13 @@ def inet_parse_active(target, default_port):
     address = target.split(":")
     host_name = address[0]
     if not host_name:
-        raise Exception("%s: bad peer name format" % target)
+        raise ValueError("%s: bad peer name format" % target)
     if len(address) >= 2:
         port = int(address[1])
     elif default_port:
         port = default_port
     else:
-        raise Exception("%s: port number must be specified" % target)
+        raise ValueError("%s: port number must be specified" % target)
     return (host_name, port)
 
 
@@ -182,11 +182,11 @@ def set_nonblocking(sock):
         sock.setblocking(0)
     except socket.error, e:
         vlog.err("could not set nonblocking mode on socket: %s"
-                 % os.strerror(get_socket_error(e)))
+                 % os.strerror(get_exception_errno(e)))
 
 
 def set_dscp(sock, dscp):
     if dscp > 63:
-        raise Exception("Invalid dscp %d" % dscp)
+        raise ValueError("Invalid dscp %d" % dscp)
     val = dscp << 2
     sock.setsockopt(socket.IPPROTO_IP, socket.IP_TOS, val)