summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/selector_events.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-03-05 23:52:53 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-03-05 23:52:53 (GMT)
commiteeeebcd816c9c4e42de80475aec67d3066985397 (patch)
tree0f7bcb58ca0b2841d990216da9b6587d925351ca /Lib/asyncio/selector_events.py
parentc5cc5011ac33f96a8bf28e3ba088980fd5e71d7a (diff)
downloadcpython-eeeebcd816c9c4e42de80475aec67d3066985397.zip
cpython-eeeebcd816c9c4e42de80475aec67d3066985397.tar.gz
cpython-eeeebcd816c9c4e42de80475aec67d3066985397.tar.bz2
asyncio: Synchronize with Tulip
* Issue #159: Fix windows_utils.socketpair() - Use "127.0.0.1" (IPv4) or "::1" (IPv6) host instead of "localhost", because "localhost" may be a different IP address - Reject also invalid arguments: only AF_INET/AF_INET6 with SOCK_STREAM (and proto=0) are supported * Reject add/remove reader/writer when event loop is closed. * Fix ResourceWarning warnings
Diffstat (limited to 'Lib/asyncio/selector_events.py')
-rw-r--r--Lib/asyncio/selector_events.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
index 70d8a95..367c5fb 100644
--- a/Lib/asyncio/selector_events.py
+++ b/Lib/asyncio/selector_events.py
@@ -136,6 +136,8 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop):
def add_reader(self, fd, callback, *args):
"""Add a reader callback."""
+ if self._selector is None:
+ raise RuntimeError('Event loop is closed')
handle = events.Handle(callback, args, self)
try:
key = self._selector.get_key(fd)
@@ -151,6 +153,8 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop):
def remove_reader(self, fd):
"""Remove a reader callback."""
+ if self._selector is None:
+ return False
try:
key = self._selector.get_key(fd)
except KeyError:
@@ -171,6 +175,8 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop):
def add_writer(self, fd, callback, *args):
"""Add a writer callback.."""
+ if self._selector is None:
+ raise RuntimeError('Event loop is closed')
handle = events.Handle(callback, args, self)
try:
key = self._selector.get_key(fd)
@@ -186,6 +192,8 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop):
def remove_writer(self, fd):
"""Remove a writer callback."""
+ if self._selector is None:
+ return False
try:
key = self._selector.get_key(fd)
except KeyError: