[Python-checkins] bpo-34622: Extract asyncio exceptions into a separate module (GH-9141)
Andrew Svetlov
webhook-mailer at python.org
Tue Sep 11 13:13:08 EDT 2018
https://github.com/python/cpython/commit/0baa72f4b2e7185298d09cf64c7b591efcd22af0
commit: 0baa72f4b2e7185298d09cf64c7b591efcd22af0
branch: master
author: Andrew Svetlov <andrew.svetlov at gmail.com>
committer: GitHub <noreply at github.com>
date: 2018-09-11T10:13:04-07:00
summary:
bpo-34622: Extract asyncio exceptions into a separate module (GH-9141)
files:
A Lib/asyncio/exceptions.py
A Misc/NEWS.d/next/Library/2018-09-10-13-04-40.bpo-34622.tpv_rN.rst
M Lib/asyncio/__init__.py
M Lib/asyncio/base_events.py
M Lib/asyncio/base_futures.py
M Lib/asyncio/events.py
M Lib/asyncio/futures.py
M Lib/asyncio/locks.py
M Lib/asyncio/proactor_events.py
M Lib/asyncio/streams.py
M Lib/asyncio/tasks.py
M Lib/asyncio/unix_events.py
M Lib/asyncio/windows_events.py
M Lib/test/test_asyncio/test_base_events.py
M Lib/test/test_asyncio/test_events.py
M Lib/test/test_asyncio/test_proactor_events.py
M Lib/test/test_asyncio/test_unix_events.py
M Modules/_asynciomodule.c
diff --git a/Lib/asyncio/__init__.py b/Lib/asyncio/__init__.py
index 26859024300e..28c2e2c429f3 100644
--- a/Lib/asyncio/__init__.py
+++ b/Lib/asyncio/__init__.py
@@ -8,6 +8,7 @@
from .base_events import *
from .coroutines import *
from .events import *
+from .exceptions import *
from .futures import *
from .locks import *
from .protocols import *
@@ -25,6 +26,7 @@
__all__ = (base_events.__all__ +
coroutines.__all__ +
events.__all__ +
+ exceptions.__all__ +
futures.__all__ +
locks.__all__ +
protocols.__all__ +
diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py
index ee13d1a78028..046743864fdd 100644
--- a/Lib/asyncio/base_events.py
+++ b/Lib/asyncio/base_events.py
@@ -37,6 +37,7 @@
from . import constants
from . import coroutines
from . import events
+from . import exceptions
from . import futures
from . import protocols
from . import sslproto
@@ -327,7 +328,7 @@ def close(self):
try:
await self._serving_forever_fut
- except futures.CancelledError:
+ except exceptions.CancelledError:
try:
self.close()
await self.wait_closed()
@@ -800,7 +801,7 @@ def _getaddrinfo_debug(self, host, port, family, type, proto, flags):
try:
return await self._sock_sendfile_native(sock, file,
offset, count)
- except events.SendfileNotAvailableError as exc:
+ except exceptions.SendfileNotAvailableError as exc:
if not fallback:
raise
return await self._sock_sendfile_fallback(sock, file,
@@ -809,7 +810,7 @@ def _getaddrinfo_debug(self, host, port, family, type, proto, flags):
async def _sock_sendfile_native(self, sock, file, offset, count):
# NB: sendfile syscall is not supported for SSL sockets and
# non-mmap files even if sendfile is supported by OS
- raise events.SendfileNotAvailableError(
+ raise exceptions.SendfileNotAvailableError(
f"syscall sendfile is not available for socket {sock!r} "
"and file {file!r} combination")
@@ -1053,7 +1054,7 @@ def _check_sendfile_params(self, sock, file, offset, count):
try:
return await self._sendfile_native(transport, file,
offset, count)
- except events.SendfileNotAvailableError as exc:
+ except exceptions.SendfileNotAvailableError as exc:
if not fallback:
raise
@@ -1066,7 +1067,7 @@ def _check_sendfile_params(self, sock, file, offset, count):
offset, count)
async def _sendfile_native(self, transp, file, offset, count):
- raise events.SendfileNotAvailableError(
+ raise exceptions.SendfileNotAvailableError(
"sendfile syscall is not supported")
async def _sendfile_fallback(self, transp, file, offset, count):
diff --git a/Lib/asyncio/base_futures.py b/Lib/asyncio/base_futures.py
index bd65beec553c..22f298069c50 100644
--- a/Lib/asyncio/base_futures.py
+++ b/Lib/asyncio/base_futures.py
@@ -1,15 +1,9 @@
__all__ = ()
-import concurrent.futures
import reprlib
from . import format_helpers
-CancelledError = concurrent.futures.CancelledError
-TimeoutError = concurrent.futures.TimeoutError
-InvalidStateError = concurrent.futures.InvalidStateError
-
-
# States for Future.
_PENDING = 'PENDING'
_CANCELLED = 'CANCELLED'
diff --git a/Lib/asyncio/events.py b/Lib/asyncio/events.py
index 58a60a0b16a0..163b868afeee 100644
--- a/Lib/asyncio/events.py
+++ b/Lib/asyncio/events.py
@@ -3,7 +3,7 @@
__all__ = (
'AbstractEventLoopPolicy',
'AbstractEventLoop', 'AbstractServer',
- 'Handle', 'TimerHandle', 'SendfileNotAvailableError',
+ 'Handle', 'TimerHandle',
'get_event_loop_policy', 'set_event_loop_policy',
'get_event_loop', 'set_event_loop', 'new_event_loop',
'get_child_watcher', 'set_child_watcher',
@@ -19,14 +19,7 @@
import threading
from . import format_helpers
-
-
-class SendfileNotAvailableError(RuntimeError):
- """Sendfile syscall is not available.
-
- Raised if OS does not support sendfile syscall for given socket or
- file type.
- """
+from . import exceptions
class Handle:
diff --git a/Lib/asyncio/exceptions.py b/Lib/asyncio/exceptions.py
new file mode 100644
index 000000000000..cac31a54d253
--- /dev/null
+++ b/Lib/asyncio/exceptions.py
@@ -0,0 +1,60 @@
+"""asyncio exceptions."""
+
+
+__all__ = ('CancelledError', 'InvalidStateError', 'TimeoutError',
+ 'IncompleteReadError', 'LimitOverrunError',
+ 'SendfileNotAvailableError')
+
+import concurrent.futures
+from . import base_futures
+
+
+class CancelledError(concurrent.futures.CancelledError):
+ """The Future or Task was cancelled."""
+
+
+class TimeoutError(concurrent.futures.TimeoutError):
+ """The operation exceeded the given deadline."""
+
+
+class InvalidStateError(concurrent.futures.InvalidStateError):
+ """The operation is not allowed in this state."""
+
+
+class SendfileNotAvailableError(RuntimeError):
+ """Sendfile syscall is not available.
+
+ Raised if OS does not support sendfile syscall for given socket or
+ file type.
+ """
+
+
+class IncompleteReadError(EOFError):
+ """
+ Incomplete read error. Attributes:
+
+ - partial: read bytes string before the end of stream was reached
+ - expected: total number of expected bytes (or None if unknown)
+ """
+ def __init__(self, partial, expected):
+ super().__init__(f'{len(partial)} bytes read on a total of '
+ f'{expected!r} expected bytes')
+ self.partial = partial
+ self.expected = expected
+
+ def __reduce__(self):
+ return type(self), (self.partial, self.expected)
+
+
+class LimitOverrunError(Exception):
+ """Reached the buffer limit while looking for a separator.
+
+ Attributes:
+ - consumed: total number of to be consumed bytes.
+ """
+ def __init__(self, message, consumed):
+ super().__init__(message)
+ self.consumed = consumed
+
+ def __reduce__(self):
+ return type(self), (self.args[0], self.consumed)
diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py
index 0e0e696a2535..98a5308ed061 100644
--- a/Lib/asyncio/futures.py
+++ b/Lib/asyncio/futures.py
@@ -1,7 +1,6 @@
"""A Future class similar to the one in PEP 3148."""
__all__ = (
- 'CancelledError', 'TimeoutError', 'InvalidStateError',
'Future', 'wrap_future', 'isfuture',
)
@@ -12,12 +11,10 @@
from . import base_futures
from . import events
+from . import exceptions
from . import format_helpers
-CancelledError = base_futures.CancelledError
-InvalidStateError = base_futures.InvalidStateError
-TimeoutError = base_futures.TimeoutError
isfuture = base_futures.isfuture
@@ -170,9 +167,9 @@ def result(self):
the future is done and has an exception set, this exception is raised.
"""
if self._state == _CANCELLED:
- raise CancelledError
+ raise exceptions.CancelledError
if self._state != _FINISHED:
- raise InvalidStateError('Result is not ready.')
+ raise exceptions.InvalidStateError('Result is not ready.')
self.__log_traceback = False
if self._exception is not None:
raise self._exception
@@ -187,9 +184,9 @@ def exception(self):
InvalidStateError.
"""
if self._state == _CANCELLED:
- raise CancelledError
+ raise exceptions.CancelledError
if self._state != _FINISHED:
- raise InvalidStateError('Exception is not set.')
+ raise exceptions.InvalidStateError('Exception is not set.')
self.__log_traceback = False
return self._exception
@@ -231,7 +228,7 @@ def set_result(self, result):
InvalidStateError.
"""
if self._state != _PENDING:
- raise InvalidStateError('{}: {!r}'.format(self._state, self))
+ raise exceptions.InvalidStateError(f'{self._state}: {self!r}')
self._result = result
self._state = _FINISHED
self.__schedule_callbacks()
@@ -243,7 +240,7 @@ def set_exception(self, exception):
InvalidStateError.
"""
if self._state != _PENDING:
- raise InvalidStateError('{}: {!r}'.format(self._state, self))
+ raise exceptions.InvalidStateError(f'{self._state}: {self!r}')
if isinstance(exception, type):
exception = exception()
if type(exception) is StopIteration:
@@ -288,6 +285,18 @@ def _set_result_unless_cancelled(fut, result):
fut.set_result(result)
+def _convert_future_exc(exc):
+ exc_class = type(exc)
+ if exc_class is concurrent.futures.CancelledError:
+ return exceptions.CancelledError(*exc.args)
+ elif exc_class is concurrent.futures.TimeoutError:
+ return exceptions.TimeoutError(*exc.args)
+ elif exc_class is concurrent.futures.InvalidStateError:
+ return exceptions.InvalidStateError(*exc.args)
+ else:
+ return exc
+
+
def _set_concurrent_future_state(concurrent, source):
"""Copy state from a future to a concurrent.futures.Future."""
assert source.done()
@@ -297,7 +306,7 @@ def _set_concurrent_future_state(concurrent, source):
return
exception = source.exception()
if exception is not None:
- concurrent.set_exception(exception)
+ concurrent.set_exception(_convert_future_exc(exception))
else:
result = source.result()
concurrent.set_result(result)
@@ -317,7 +326,7 @@ def _copy_future_state(source, dest):
else:
exception = source.exception()
if exception is not None:
- dest.set_exception(exception)
+ dest.set_exception(_convert_future_exc(exception))
else:
result = source.result()
dest.set_result(result)
diff --git a/Lib/asyncio/locks.py b/Lib/asyncio/locks.py
index 91f7a01de8ad..639bd11bd068 100644
--- a/Lib/asyncio/locks.py
+++ b/Lib/asyncio/locks.py
@@ -7,6 +7,7 @@
from . import events
from . import futures
+from . import exceptions
from .coroutines import coroutine
@@ -192,7 +193,7 @@ def locked(self):
await fut
finally:
self._waiters.remove(fut)
- except futures.CancelledError:
+ except exceptions.CancelledError:
if not self._locked:
self._wake_up_first()
raise
@@ -363,11 +364,11 @@ def __repr__(self):
try:
await self.acquire()
break
- except futures.CancelledError:
+ except exceptions.CancelledError:
cancelled = True
if cancelled:
- raise futures.CancelledError
+ raise exceptions.CancelledError
async def wait_for(self, predicate):
"""Wait until a predicate becomes true.
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py
index 66bfb0ab11ee..ad23918802fa 100644
--- a/Lib/asyncio/proactor_events.py
+++ b/Lib/asyncio/proactor_events.py
@@ -15,6 +15,7 @@
from . import constants
from . import events
from . import futures
+from . import exceptions
from . import protocols
from . import sslproto
from . import transports
@@ -282,7 +283,7 @@ def _loop_reading(self, fut=None):
self._force_close(exc)
except OSError as exc:
self._fatal_error(exc, 'Fatal read error on pipe transport')
- except futures.CancelledError:
+ except exceptions.CancelledError:
if not self._closing:
raise
else:
@@ -555,11 +556,11 @@ def close(self):
try:
fileno = file.fileno()
except (AttributeError, io.UnsupportedOperation) as err:
- raise events.SendfileNotAvailableError("not a regular file")
+ raise exceptions.SendfileNotAvailableError("not a regular file")
try:
fsize = os.fstat(fileno).st_size
except OSError as err:
- raise events.SendfileNotAvailableError("not a regular file")
+ raise exceptions.SendfileNotAvailableError("not a regular file")
blocksize = count if count else fsize
if not blocksize:
return 0 # empty file
@@ -615,7 +616,7 @@ def _loop_self_reading(self, f=None):
if f is not None:
f.result() # may raise
f = self._proactor.recv(self._ssock, 4096)
- except futures.CancelledError:
+ except exceptions.CancelledError:
# _close_self_pipe() has been called, stop waiting for data
return
except Exception as exc:
@@ -666,7 +667,7 @@ def loop(f=None):
elif self._debug:
logger.debug("Accept failed on socket %r",
sock, exc_info=True)
- except futures.CancelledError:
+ except exceptions.CancelledError:
sock.close()
else:
self._accept_futures[sock.fileno()] = f
diff --git a/Lib/asyncio/streams.py b/Lib/asyncio/streams.py
index d6531f88a74d..9dab49b35e46 100644
--- a/Lib/asyncio/streams.py
+++ b/Lib/asyncio/streams.py
@@ -1,8 +1,6 @@
__all__ = (
'StreamReader', 'StreamWriter', 'StreamReaderProtocol',
- 'open_connection', 'start_server',
- 'IncompleteReadError', 'LimitOverrunError',
-)
+ 'open_connection', 'start_server')
import socket
@@ -11,6 +9,7 @@
from . import coroutines
from . import events
+from . import exceptions
from . import protocols
from .log import logger
from .tasks import sleep
@@ -19,37 +18,6 @@
_DEFAULT_LIMIT = 2 ** 16 # 64 KiB
-class IncompleteReadError(EOFError):
- """
- Incomplete read error. Attributes:
-
- - partial: read bytes string before the end of stream was reached
- - expected: total number of expected bytes (or None if unknown)
- """
- def __init__(self, partial, expected):
- super().__init__(f'{len(partial)} bytes read on a total of '
- f'{expected!r} expected bytes')
- self.partial = partial
- self.expected = expected
-
- def __reduce__(self):
- return type(self), (self.partial, self.expected)
-
-
-class LimitOverrunError(Exception):
- """Reached the buffer limit while looking for a separator.
-
- Attributes:
- - consumed: total number of to be consumed bytes.
- """
- def __init__(self, message, consumed):
- super().__init__(message)
- self.consumed = consumed
-
- def __reduce__(self):
- return type(self), (self.args[0], self.consumed)
-
-
async def open_connection(host=None, port=None, *,
loop=None, limit=_DEFAULT_LIMIT, **kwds):
"""A wrapper for create_connection() returning a (reader, writer) pair.
@@ -494,9 +462,9 @@ def feed_data(self, data):
seplen = len(sep)
try:
line = await self.readuntil(sep)
- except IncompleteReadError as e:
+ except exceptions.IncompleteReadError as e:
return e.partial
- except LimitOverrunError as e:
+ except exceptions.LimitOverrunError as e:
if self._buffer.startswith(sep, e.consumed):
del self._buffer[:e.consumed + seplen]
else:
@@ -571,7 +539,7 @@ def feed_data(self, data):
# see upper comment for explanation.
offset = buflen + 1 - seplen
if offset > self._limit:
- raise LimitOverrunError(
+ raise exceptions.LimitOverrunError(
'Separator is not found, and chunk exceed the limit',
offset)
@@ -582,13 +550,13 @@ def feed_data(self, data):
if self._eof:
chunk = bytes(self._buffer)
self._buffer.clear()
- raise IncompleteReadError(chunk, None)
+ raise exceptions.IncompleteReadError(chunk, None)
# _wait_for_data() will resume reading if stream was paused.
await self._wait_for_data('readuntil')
if isep > self._limit:
- raise LimitOverrunError(
+ raise exceptions.LimitOverrunError(
'Separator is found, but chunk is longer than limit', isep)
chunk = self._buffer[:isep + seplen]
@@ -674,7 +642,7 @@ def feed_data(self, data):
if self._eof:
incomplete = bytes(self._buffer)
self._buffer.clear()
- raise IncompleteReadError(incomplete, n)
+ raise exceptions.IncompleteReadError(incomplete, n)
await self._wait_for_data('readexactly')
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index 03d71d37f01a..7121aa65da0e 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -21,6 +21,7 @@
from . import base_tasks
from . import coroutines
from . import events
+from . import exceptions
from . import futures
from .coroutines import coroutine
@@ -228,11 +229,11 @@ def cancel(self):
def __step(self, exc=None):
if self.done():
- raise futures.InvalidStateError(
+ raise exceptions.InvalidStateError(
f'_step(): already done: {self!r}, {exc!r}')
if self._must_cancel:
- if not isinstance(exc, futures.CancelledError):
- exc = futures.CancelledError()
+ if not isinstance(exc, exceptions.CancelledError):
+ exc = exceptions.CancelledError()
self._must_cancel = False
coro = self._coro
self._fut_waiter = None
@@ -250,10 +251,10 @@ def __step(self, exc=None):
if self._must_cancel:
# Task is cancelled right before coro stops.
self._must_cancel = False
- super().set_exception(futures.CancelledError())
+ super().set_exception(exceptions.CancelledError())
else:
super().set_result(exc.value)
- except futures.CancelledError:
+ except exceptions.CancelledError:
super().cancel() # I.e., Future.cancel(self).
except Exception as exc:
super().set_exception(exc)
@@ -419,7 +420,7 @@ def _release_waiter(waiter, *args):
return fut.result()
fut.cancel()
- raise futures.TimeoutError()
+ raise exceptions.TimeoutError()
waiter = loop.create_future()
timeout_handle = loop.call_later(timeout, _release_waiter, waiter)
@@ -432,7 +433,7 @@ def _release_waiter(waiter, *args):
# wait until the future completes or the timeout
try:
await waiter
- except futures.CancelledError:
+ except exceptions.CancelledError:
fut.remove_done_callback(cb)
fut.cancel()
raise
@@ -445,7 +446,7 @@ def _release_waiter(waiter, *args):
# after wait_for() returns.
# See https://bugs.python.org/issue32751
await _cancel_and_wait(fut, loop=loop)
- raise futures.TimeoutError()
+ raise exceptions.TimeoutError()
finally:
timeout_handle.cancel()
@@ -554,7 +555,7 @@ def _on_completion(f):
f = await done.get()
if f is None:
# Dummy value from _on_timeout().
- raise futures.TimeoutError
+ raise exceptions.TimeoutError
return f.result() # May raise f.exception().
for f in todo:
@@ -701,7 +702,7 @@ def _done_callback(fut):
# Check if 'fut' is cancelled first, as
# 'fut.exception()' will *raise* a CancelledError
# instead of returning it.
- exc = futures.CancelledError()
+ exc = exceptions.CancelledError()
outer.set_exception(exc)
return
else:
@@ -720,7 +721,7 @@ def _done_callback(fut):
# Check if 'fut' is cancelled first, as
# 'fut.exception()' will *raise* a CancelledError
# instead of returning it.
- res = futures.CancelledError()
+ res = exceptions.CancelledError()
else:
res = fut.exception()
if res is None:
@@ -731,7 +732,7 @@ def _done_callback(fut):
# If gather is being cancelled we must propagate the
# cancellation regardless of *return_exceptions* argument.
# See issue 32684.
- outer.set_exception(futures.CancelledError())
+ outer.set_exception(exceptions.CancelledError())
else:
outer.set_result(results)
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
index 7cad7e3637a1..1a62db4f59bc 100644
--- a/Lib/asyncio/unix_events.py
+++ b/Lib/asyncio/unix_events.py
@@ -18,6 +18,7 @@
from . import constants
from . import coroutines
from . import events
+from . import exceptions
from . import futures
from . import selector_events
from . import tasks
@@ -319,16 +320,16 @@ def _child_watcher_callback(self, pid, returncode, transp):
try:
os.sendfile
except AttributeError as exc:
- raise events.SendfileNotAvailableError(
+ raise exceptions.SendfileNotAvailableError(
"os.sendfile() is not available")
try:
fileno = file.fileno()
except (AttributeError, io.UnsupportedOperation) as err:
- raise events.SendfileNotAvailableError("not a regular file")
+ raise exceptions.SendfileNotAvailableError("not a regular file")
try:
fsize = os.fstat(fileno).st_size
except OSError as err:
- raise events.SendfileNotAvailableError("not a regular file")
+ raise exceptions.SendfileNotAvailableError("not a regular file")
blocksize = count if count else fsize
if not blocksize:
return 0 # empty file
@@ -382,7 +383,7 @@ def _sock_sendfile_native_impl(self, fut, registered_fd, sock, fileno,
# one being 'file' is not a regular mmap(2)-like
# file, in which case we'll fall back on using
# plain send().
- err = events.SendfileNotAvailableError(
+ err = exceptions.SendfileNotAvailableError(
"os.sendfile call failed")
self._sock_sendfile_update_filepos(fileno, offset, total_sent)
fut.set_exception(err)
diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py
index 2ec542764375..fdde8e9e0bf4 100644
--- a/Lib/asyncio/windows_events.py
+++ b/Lib/asyncio/windows_events.py
@@ -12,6 +12,7 @@
from . import events
from . import base_subprocess
from . import futures
+from . import exceptions
from . import proactor_events
from . import selector_events
from . import tasks
@@ -351,7 +352,7 @@ def loop_accept_pipe(f=None):
elif self._debug:
logger.warning("Accept pipe failed on pipe %r",
pipe, exc_info=True)
- except futures.CancelledError:
+ except exceptions.CancelledError:
if pipe:
pipe.close()
else:
@@ -497,7 +498,7 @@ def finish_accept(trans, key, ov):
# Coroutine closing the accept socket if the future is cancelled
try:
await future
- except futures.CancelledError:
+ except exceptions.CancelledError:
conn.close()
raise
diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py
index e10863795335..fe3c38371d0c 100644
--- a/Lib/test/test_asyncio/test_base_events.py
+++ b/Lib/test/test_asyncio/test_base_events.py
@@ -1946,7 +1946,7 @@ def cleanup():
def test__sock_sendfile_native_failure(self):
sock, proto = self.prepare()
- with self.assertRaisesRegex(events.SendfileNotAvailableError,
+ with self.assertRaisesRegex(asyncio.SendfileNotAvailableError,
"sendfile is not available"):
self.run_loop(self.loop._sock_sendfile_native(sock, self.file,
0, None))
@@ -1957,7 +1957,7 @@ def test__sock_sendfile_native_failure(self):
def test_sock_sendfile_no_fallback(self):
sock, proto = self.prepare()
- with self.assertRaisesRegex(events.SendfileNotAvailableError,
+ with self.assertRaisesRegex(asyncio.SendfileNotAvailableError,
"sendfile is not available"):
self.run_loop(self.loop.sock_sendfile(sock, self.file,
fallback=False))
diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index 11cd950df1ce..01f616ab5b19 100644
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -2393,7 +2393,7 @@ def sendfile_native(transp, file, offset, count):
self.loop._sendfile_native = sendfile_native
- with self.assertRaisesRegex(events.SendfileNotAvailableError,
+ with self.assertRaisesRegex(asyncio.SendfileNotAvailableError,
"not supported"):
self.run_loop(
self.loop.sendfile(cli_proto.transport, self.file,
diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py
index dddbe3b2a107..afc4c19a96b0 100644
--- a/Lib/test/test_asyncio/test_proactor_events.py
+++ b/Lib/test/test_asyncio/test_proactor_events.py
@@ -951,7 +951,7 @@ def cleanup():
def test_sock_sendfile_not_a_file(self):
sock, proto = self.prepare()
f = object()
- with self.assertRaisesRegex(events.SendfileNotAvailableError,
+ with self.assertRaisesRegex(asyncio.SendfileNotAvailableError,
"not a regular file"):
self.run_loop(self.loop._sock_sendfile_native(sock, f,
0, None))
@@ -960,7 +960,7 @@ def test_sock_sendfile_not_a_file(self):
def test_sock_sendfile_iobuffer(self):
sock, proto = self.prepare()
f = io.BytesIO()
- with self.assertRaisesRegex(events.SendfileNotAvailableError,
+ with self.assertRaisesRegex(asyncio.SendfileNotAvailableError,
"not a regular file"):
self.run_loop(self.loop._sock_sendfile_native(sock, f,
0, None))
@@ -970,7 +970,7 @@ def test_sock_sendfile_not_regular_file(self):
sock, proto = self.prepare()
f = mock.Mock()
f.fileno.return_value = -1
- with self.assertRaisesRegex(events.SendfileNotAvailableError,
+ with self.assertRaisesRegex(asyncio.SendfileNotAvailableError,
"not a regular file"):
self.run_loop(self.loop._sock_sendfile_native(sock, f,
0, None))
diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py
index 29b345b142e8..62545c0f98c3 100644
--- a/Lib/test/test_asyncio/test_unix_events.py
+++ b/Lib/test/test_asyncio/test_unix_events.py
@@ -521,7 +521,7 @@ def cleanup():
def test_sock_sendfile_not_available(self):
sock, proto = self.prepare()
with mock.patch('asyncio.unix_events.os', spec=[]):
- with self.assertRaisesRegex(events.SendfileNotAvailableError,
+ with self.assertRaisesRegex(asyncio.SendfileNotAvailableError,
"os[.]sendfile[(][)] is not available"):
self.run_loop(self.loop._sock_sendfile_native(sock, self.file,
0, None))
@@ -530,7 +530,7 @@ def test_sock_sendfile_not_available(self):
def test_sock_sendfile_not_a_file(self):
sock, proto = self.prepare()
f = object()
- with self.assertRaisesRegex(events.SendfileNotAvailableError,
+ with self.assertRaisesRegex(asyncio.SendfileNotAvailableError,
"not a regular file"):
self.run_loop(self.loop._sock_sendfile_native(sock, f,
0, None))
@@ -539,7 +539,7 @@ def test_sock_sendfile_not_a_file(self):
def test_sock_sendfile_iobuffer(self):
sock, proto = self.prepare()
f = io.BytesIO()
- with self.assertRaisesRegex(events.SendfileNotAvailableError,
+ with self.assertRaisesRegex(asyncio.SendfileNotAvailableError,
"not a regular file"):
self.run_loop(self.loop._sock_sendfile_native(sock, f,
0, None))
@@ -549,7 +549,7 @@ def test_sock_sendfile_not_regular_file(self):
sock, proto = self.prepare()
f = mock.Mock()
f.fileno.return_value = -1
- with self.assertRaisesRegex(events.SendfileNotAvailableError,
+ with self.assertRaisesRegex(asyncio.SendfileNotAvailableError,
"not a regular file"):
self.run_loop(self.loop._sock_sendfile_native(sock, f,
0, None))
@@ -605,7 +605,7 @@ def test_sock_sendfile_os_error_first_call(self):
with self.assertRaises(KeyError):
self.loop._selector.get_key(sock)
exc = fut.exception()
- self.assertIsInstance(exc, events.SendfileNotAvailableError)
+ self.assertIsInstance(exc, asyncio.SendfileNotAvailableError)
self.assertEqual(0, self.file.tell())
def test_sock_sendfile_os_error_next_call(self):
@@ -630,7 +630,7 @@ def test_sock_sendfile_exception(self):
fileno = self.file.fileno()
fut = self.loop.create_future()
- err = events.SendfileNotAvailableError()
+ err = asyncio.SendfileNotAvailableError()
with mock.patch('os.sendfile', side_effect=err):
self.loop._sock_sendfile_native_impl(fut, sock.fileno(),
sock, fileno,
diff --git a/Misc/NEWS.d/next/Library/2018-09-10-13-04-40.bpo-34622.tpv_rN.rst b/Misc/NEWS.d/next/Library/2018-09-10-13-04-40.bpo-34622.tpv_rN.rst
new file mode 100644
index 000000000000..493d6abd910b
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-09-10-13-04-40.bpo-34622.tpv_rN.rst
@@ -0,0 +1,4 @@
+Create a dedicated ``asyncio.CancelledError``, ``asyncio.InvalidStateError``
+and ``asyncio.TimeoutError`` exception classes. Inherit them from
+corresponding exceptions from ``concurrent.futures`` package. Extract
+``asyncio`` exceptions into a separate file.
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
index 3d7ce01a680c..2ed033cacd85 100644
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -3306,6 +3306,8 @@ module_init(void)
WITH_MOD("asyncio.base_futures")
GET_MOD_ATTR(asyncio_future_repr_info_func, "_future_repr_info")
+
+ WITH_MOD("asyncio.exceptions")
GET_MOD_ATTR(asyncio_InvalidStateError, "InvalidStateError")
GET_MOD_ATTR(asyncio_CancelledError, "CancelledError")
More information about the Python-checkins
mailing list