From: Michal 'vorner' Vaner Date: Thu, 5 Jan 2012 18:53:39 +0000 (+0100) Subject: [805] Python accept returns tuple X-Git-Tag: trac2351_base~304^2~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3cdb00878c3a0dd3d31fd2a8a64b47a376b87d37;p=thirdparty%2Fkea.git [805] Python accept returns tuple The socket and an address. We don't care about the address, but we still need to unpack the socket out. --- diff --git a/src/bin/bind10/bind10_src.py.in b/src/bin/bind10/bind10_src.py.in index 00858d8f94..140d2c2b23 100755 --- a/src/bin/bind10/bind10_src.py.in +++ b/src/bin/bind10/bind10_src.py.in @@ -914,7 +914,7 @@ class BoB: Accept a socket from the unix domain socket server and put it to the others we care about. """ - socket = self._srv_socket.accept() + (socket, conn) = self._srv_socket.accept() self._unix_sockets[socket.fileno()] = (socket, b'') def _socket_data(self, socket_fileno): diff --git a/src/bin/bind10/tests/bind10_test.py.in b/src/bin/bind10/tests/bind10_test.py.in index f9537fde9e..ce583ca71b 100644 --- a/src/bin/bind10/tests/bind10_test.py.in +++ b/src/bin/bind10/tests/bind10_test.py.in @@ -1235,7 +1235,7 @@ class SocketSrvTest(unittest.TestCase): return self.__fileno def accept(self): - return self.__class__(self.__owner, 13) + return (self.__class__(self.__owner, 13), "/path/to/socket") def recv(self, bufsize, flags=0): self.__owner.assertEqual(1, bufsize)