Thanks Justin! Signed-off-by: Reid Price <[email protected]>
On Tue, Oct 16, 2012 at 5:29 PM, Justin Pettit <[email protected]> wrote: > 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 <[email protected]> > --- > python/ovs/stream.py | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/python/ovs/stream.py b/python/ovs/stream.py > index 8cc8202..6bd0ccb 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) > > > [email protected]_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) > > > [email protected]_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) > -- > 1.7.5.4 > > _______________________________________________ > dev mailing list > [email protected] > http://openvswitch.org/mailman/listinfo/dev _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
