c38f8724aeb994fd840fa4283a07e38c3c114d68 made stream.py not use class
decorator. So Stream.register need not to be decorator any more.
So simplify it.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Ben Pfaff <blp@nicira.com>
_SOCKET_METHODS = {}
@staticmethod
_SOCKET_METHODS = {}
@staticmethod
- def register_method(method):
- def _register_method(cls):
- Stream._SOCKET_METHODS[method + ":"] = cls
- return cls
- return _register_method
+ def register_method(method, cls):
+ Stream._SOCKET_METHODS[method + ":"] = cls
@staticmethod
def _find_method(name):
@staticmethod
def _find_method(name):
connect_path = suffix
return ovs.socket_util.make_unix_socket(socket.SOCK_STREAM,
True, None, connect_path)
connect_path = suffix
return ovs.socket_util.make_unix_socket(socket.SOCK_STREAM,
True, None, connect_path)
-UnixStream = Stream.register_method("unix")(UnixStream)
+Stream.register_method("unix", UnixStream)
if not error:
sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
return error, sock
if not error:
sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
return error, sock
-TCPStream = Stream.register_method("tcp")(TCPStream)
+Stream.register_method("tcp", TCPStream)