summaryrefslogtreecommitdiff
path: root/Lib/asyncio/windows_utils.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-01-15 00:04:21 +0100
committerVictor Stinner <victor.stinner@gmail.com>2015-01-15 00:04:21 +0100
commit29ad0111bd8c7edd049c964c66cfb9e9114c99d2 (patch)
tree9fee6570ed8b11b78e9159153a7d241e1c212e21 /Lib/asyncio/windows_utils.py
parentb92626df5ca72d25236404a0a62cf47279c4e503 (diff)
downloadcpython-git-29ad0111bd8c7edd049c964c66cfb9e9114c99d2.tar.gz
asyncio: sync with Tulip
* PipeHandle now uses None instead of -1 for a closed handle * Sort imports in windows_utils. * Fix test_events on Python older than 3.5. Skip SSL tests on the ProactorEventLoop if ssl.MemoryIO is missing * Fix BaseEventLoop._create_connection_transport(). Close the transport if the creation of the transport (if the waiter) gets an exception. * _ProactorBasePipeTransport now sets _sock to None when the transport is closed. * Fix BaseSubprocessTransport.close(). Ignore pipes for which the protocol is not set yet (still equal to None). * TestLoop.close() now calls the close() method of the parent class (BaseEventLoop). * Cleanup BaseSelectorEventLoop: create the protocol on a separated line for readability and ease debugging. * Fix BaseSubprocessTransport._kill_wait(). Set the _returncode attribute, so close() doesn't try to terminate the process. * Tests: explicitly close event loops and transports * UNIX pipe transports: add closed/closing in repr(). Add "closed" or "closing" state in the __repr__() method of _UnixReadPipeTransport and _UnixWritePipeTransport classes.
Diffstat (limited to 'Lib/asyncio/windows_utils.py')
-rw-r--r--Lib/asyncio/windows_utils.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/asyncio/windows_utils.py b/Lib/asyncio/windows_utils.py
index b47581235c..e6642960db 100644
--- a/Lib/asyncio/windows_utils.py
+++ b/Lib/asyncio/windows_utils.py
@@ -7,13 +7,13 @@ import sys
if sys.platform != 'win32': # pragma: no cover
raise ImportError('win32 only')
-import socket
+import _winapi
import itertools
import msvcrt
import os
+import socket
import subprocess
import tempfile
-import _winapi
__all__ = ['socketpair', 'pipe', 'Popen', 'PIPE', 'PipeHandle']
@@ -136,7 +136,7 @@ class PipeHandle:
self._handle = handle
def __repr__(self):
- if self._handle != -1:
+ if self._handle is not None:
handle = 'handle=%r' % self._handle
else:
handle = 'closed'
@@ -150,9 +150,9 @@ class PipeHandle:
return self._handle
def close(self, *, CloseHandle=_winapi.CloseHandle):
- if self._handle != -1:
+ if self._handle is not None:
CloseHandle(self._handle)
- self._handle = -1
+ self._handle = None
__del__ = close