Issue #143: UNIX domain methods, fix ResourceWarning and DeprecationWarning

vstinner · vstinner · commit 81f1d9965ad1 · 2014-02-19T01:44:23.000+01:00
warnings. create_unix_server() closes the socket on any error, not only on
OSError.
diff --git a/asyncio/unix_events.py b/asyncio/unix_events.py
@@ -183,13 +183,12 @@ def create_unix_connection(self, protocol_factory, path, *,
                 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 @@ def create_unix_server(self, protocol_factory, path=None, *,
             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.
diff --git a/tests/test_unix_events.py b/tests/test_unix_events.py
@@ -221,17 +221,17 @@ def test_create_unix_server_existing_path_sock(self):
         with test_utils.unix_socket_path() as path:
             sock = socket.socket(socket.AF_UNIX)
             sock.bind(path)
-
-            coro = self.loop.create_unix_server(lambda: None, path)
-            with self.assertRaisesRegexp(OSError,
-                                         'Address.*is already in use'):
-                self.loop.run_until_complete(coro)
+            with sock:
+                coro = self.loop.create_unix_server(lambda: None, path)
+                with self.assertRaisesRegex(OSError,
+                                            'Address.*is already in use'):
+                    self.loop.run_until_complete(coro)
 
     def test_create_unix_server_existing_path_nonsock(self):
         with tempfile.NamedTemporaryFile() as file:
             coro = self.loop.create_unix_server(lambda: None, file.name)
-            with self.assertRaisesRegexp(OSError,
-                                         'Address.*is already in use'):
+            with self.assertRaisesRegex(OSError,
+                                        'Address.*is already in use'):
                 self.loop.run_until_complete(coro)
 
     def test_create_unix_server_ssl_bool(self):
@@ -248,11 +248,13 @@ def test_create_unix_server_nopath_nosock(self):
             self.loop.run_until_complete(coro)
 
     def test_create_unix_server_path_inetsock(self):
-        coro = self.loop.create_unix_server(lambda: None, path=None,
-                                            sock=socket.socket())
-        with self.assertRaisesRegex(ValueError,
-                                    'A UNIX Domain Socket was expected'):
-            self.loop.run_until_complete(coro)
+        sock = socket.socket()
+        with sock:
+            coro = self.loop.create_unix_server(lambda: None, path=None,
+                                                sock=sock)
+            with self.assertRaisesRegex(ValueError,
+                                        'A UNIX Domain Socket was expected'):
+                self.loop.run_until_complete(coro)
 
     def test_create_unix_connection_path_sock(self):
         coro = self.loop.create_unix_connection(
@@ -278,7 +280,7 @@ def test_create_unix_connection_ssl_noserverhost(self):
         coro = self.loop.create_unix_connection(
             lambda: None, '/dev/null', ssl=True)
 
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
             ValueError, 'you have to pass server_hostname when using ssl'):
 
             self.loop.run_until_complete(coro)
