From c38f8724aeb994fd840fa4283a07e38c3c114d68 Mon Sep 17 00:00:00 2001
From: Reid Price <reid@nicira.com>
Date: Tue, 16 Oct 2012 17:23:26 -0700
Subject: [PATCH] stream.py: Don't use class decorators.
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>
---
python/ovs/stream.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python/ovs/stream.py b/python/ovs/stream.py
index 8cc820282..6bd0ccbe8 100644
--- a/python/ovs/stream.py
+++ b/python/ovs/stream.py
@@ -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)
--
2.47.0