mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-05 08:45:23 +00:00
Code Issues Releases Wiki Activity

stream.py: Don't use class decorators.

Browse Source 
Commit 8cc820 (python/ovs/stream: teach stream.py tcp socket) made a
change that used class decorators.  Unfortunately, they were not
introduced until Python 2.6.  XenServer uses Python 2.4, so the change
caused some Python-based daemons not to start.  This commit uses an
alternate syntax suggested by Reid Price.

Bug #13580

Signed-off-by: Justin Pettit <jpettit@nicira.com>
Signed-off-by: Reid Price <reid@nicira.com>
This commit is contained in:
Reid Price
2012-10-16 17:23:26 -07:00
committed by Justin Pettit
parent f606c7e994
commit c38f8724ae
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/ovs/stream.py
View File

@@ -344,16 +344,15 @@ Passive %s connection methods:
punix:FILE Listen on Unix domain socket FILE""" % (name, name)
@Stream.register_method("unix")
class UnixStream(Stream):
@staticmethod
def _open(suffix, dscp):
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("tcp")
class TCPStream(Stream):
@staticmethod
def _open(suffix, dscp):
@@ -362,3 +361,4 @@ class TCPStream(Stream):
if not error:
sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
return error, sock
TCPStream = Stream.register_method("tcp")(TCPStream)