summaryrefslogtreecommitdiff
path: root/Lib/asyncio/unix_events.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-02-19 01:45:59 +0100
committerVictor Stinner <victor.stinner@gmail.com>2014-02-19 01:45:59 +0100
commit36a3fb53438266f3d66af03324bb181de9fcc12a (patch)
treebf07ef12b5486f0d2792a94b2f32dcb6c7b74022 /Lib/asyncio/unix_events.py
parent064925c4d627c4a0400f4b8a2075b4102f3f17e5 (diff)
downloadcpython-36a3fb53438266f3d66af03324bb181de9fcc12a.tar.gz
asyncio, Tulip issue 143: UNIX domain methods, fix ResourceWarning and
DeprecationWarning warnings. create_unix_server() closes the socket on any error, not only on OSError.
Diffstat (limited to 'Lib/asyncio/unix_events.py')
-rw-r--r--Lib/asyncio/unix_events.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
index 3a2fd18b2d..faf4c60d5b 100644
--- a/Lib/asyncio/unix_events.py
+++ b/Lib/asyncio/unix_events.py
@@ -183,13 +183,12 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop):
raise ValueError(
'path and sock can not be specified at the same time')
+ sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM, 0)
try:
- sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM, 0)
sock.setblocking(False)
yield from self.sock_connect(sock, path)
- except OSError:
- if sock is not None:
- sock.close()
+ except:
+ sock.close()
raise
else:
@@ -213,6 +212,7 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop):
try:
sock.bind(path)
except OSError as exc:
+ sock.close()
if exc.errno == errno.EADDRINUSE:
# Let's improve the error message by adding
# with what exact address it occurs.