diff options
| -rw-r--r-- | Lib/asyncore.py | 8 | ||||
| -rw-r--r-- | Lib/test/test_asyncore.py | 11 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
4 files changed, 22 insertions, 0 deletions
diff --git a/Lib/asyncore.py b/Lib/asyncore.py index ee0a049..d3301b0 100644 --- a/Lib/asyncore.py +++ b/Lib/asyncore.py @@ -594,6 +594,14 @@ if os.name == 'posix': def send(self, *args): return os.write(self.fd, *args) + def getsockopt(self, level, optname, buflen=None): + if (level == socket.SOL_SOCKET and + optname == socket.SO_ERROR and + not buflen): + return 0 + raise NotImplementedError("Only asyncore specific behaviour " + "implemented.") + read = recv write = send diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py index ebc2adb..56f1939 100644 --- a/Lib/test/test_asyncore.py +++ b/Lib/test/test_asyncore.py @@ -412,6 +412,17 @@ if hasattr(asyncore, 'file_wrapper'): w.close() self.assertEqual(file(TESTFN).read(), self.d + d1 + d2) + def test_dispatcher(self): + fd = os.open(TESTFN, os.O_RDONLY) + data = [] + class FileDispatcher(asyncore.file_dispatcher): + def handle_read(self): + data.append(self.recv(29)) + s = FileDispatcher(fd) + os.close(fd) + asyncore.loop(timeout=0.01, use_poll=True, count=2) + self.assertEqual("".join(data), self.d) + def test_main(): tests = [HelperFunctionTests, DispatcherTests, DispatcherWithSendTests, @@ -407,6 +407,7 @@ Ivan Krstić Andrew Kuchling Vladimir Kushnir Cameron Laird +Łukasz Langa Tino Lange Andrew Langmead Detlef Lannert @@ -35,6 +35,8 @@ Core and Builtins when turned into an exception: in this case the exception simply gets ignored. +- Issue #9354: Provide getsockopt() in asyncore's file_wrapper. + - In the unicode/str.format(), raise a ValueError when indexes to arguments are too large. |