From 15cc678d8971f5ee1a7ea5e88bcd22413601f033 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 9 Jan 2015 00:09:10 +0100 Subject: [PATCH] asyncio: Truncate to 80 columns --- Lib/asyncio/base_events.py | 4 ++-- Lib/asyncio/coroutines.py | 12 ++++++++---- Lib/asyncio/selector_events.py | 7 ++++--- Lib/asyncio/tasks.py | 2 +- Lib/asyncio/unix_events.py | 3 ++- Lib/asyncio/windows_events.py | 3 ++- Lib/asyncio/windows_utils.py | 7 ++++--- Lib/test/test_asyncio/test_base_events.py | 9 ++++++--- Lib/test/test_asyncio/test_futures.py | 24 +++++++++++++++-------- Lib/test/test_asyncio/test_streams.py | 6 ++++-- Lib/test/test_asyncio/test_subprocess.py | 4 +++- Lib/test/test_asyncio/test_tasks.py | 12 ++++++++---- 12 files changed, 60 insertions(+), 33 deletions(-) diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index ac885a8e9ac..35c8d742c1a 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -201,8 +201,8 @@ class BaseEventLoop(events.AbstractEventLoop): """Create socket transport.""" raise NotImplementedError - def _make_ssl_transport(self, rawsock, protocol, sslcontext, waiter=None, *, - server_side=False, server_hostname=None, + def _make_ssl_transport(self, rawsock, protocol, sslcontext, waiter=None, + *, server_side=False, server_hostname=None, extra=None, server=None): """Create SSL transport.""" raise NotImplementedError diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py index c28de95a46b..a1b28751f70 100644 --- a/Lib/asyncio/coroutines.py +++ b/Lib/asyncio/coroutines.py @@ -182,14 +182,18 @@ def _format_coroutine(coro): and not inspect.isgeneratorfunction(coro.func)): filename, lineno = events._get_function_source(coro.func) if coro.gi_frame is None: - coro_repr = '%s() done, defined at %s:%s' % (coro_name, filename, lineno) + coro_repr = ('%s() done, defined at %s:%s' + % (coro_name, filename, lineno)) else: - coro_repr = '%s() running, defined at %s:%s' % (coro_name, filename, lineno) + coro_repr = ('%s() running, defined at %s:%s' + % (coro_name, filename, lineno)) elif coro.gi_frame is not None: lineno = coro.gi_frame.f_lineno - coro_repr = '%s() running at %s:%s' % (coro_name, filename, lineno) + coro_repr = ('%s() running at %s:%s' + % (coro_name, filename, lineno)) else: lineno = coro.gi_code.co_firstlineno - coro_repr = '%s() done, defined at %s:%s' % (coro_name, filename, lineno) + coro_repr = ('%s() done, defined at %s:%s' + % (coro_name, filename, lineno)) return coro_repr diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index 2e7364b8c80..69b649ceeae 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -55,8 +55,8 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): return _SelectorSocketTransport(self, sock, protocol, waiter, extra, server) - def _make_ssl_transport(self, rawsock, protocol, sslcontext, waiter=None, *, - server_side=False, server_hostname=None, + def _make_ssl_transport(self, rawsock, protocol, sslcontext, waiter=None, + *, server_side=False, server_hostname=None, extra=None, server=None): return _SelectorSslTransport( self, rawsock, protocol, sslcontext, waiter, @@ -484,7 +484,8 @@ class _SelectorTransport(transports._FlowControlMixin, info.append('read=idle') polling = _test_selector_event(self._loop._selector, - self._sock_fd, selectors.EVENT_WRITE) + self._sock_fd, + selectors.EVENT_WRITE) if polling: state = 'polling' else: diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index 9aebffdaba3..8fc5beacf97 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -68,7 +68,7 @@ class Task(futures.Future): return {t for t in cls._all_tasks if t._loop is loop} def __init__(self, coro, *, loop=None): - assert coroutines.iscoroutine(coro), repr(coro) # Not a coroutine function! + assert coroutines.iscoroutine(coro), repr(coro) super().__init__(loop=loop) if self._source_traceback: del self._source_traceback[-1] diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py index d1461fd0248..91e43cfc97c 100644 --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -69,7 +69,8 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop): """ if (coroutines.iscoroutine(callback) or coroutines.iscoroutinefunction(callback)): - raise TypeError("coroutines cannot be used with add_signal_handler()") + raise TypeError("coroutines cannot be used " + "with add_signal_handler()") self._check_signal(sig) self._check_closed() try: diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py index d7feb1aec83..9d496f2f47a 100644 --- a/Lib/asyncio/windows_events.py +++ b/Lib/asyncio/windows_events.py @@ -424,7 +424,8 @@ class IocpProactor: else: return windows_utils.PipeHandle(handle) - return self._register(ov, None, finish_connect_pipe, wait_for_post=True) + return self._register(ov, None, finish_connect_pipe, + wait_for_post=True) def wait_for_handle(self, handle, timeout=None): """Wait for a handle. diff --git a/Lib/asyncio/windows_utils.py b/Lib/asyncio/windows_utils.py index c6e4bc9e46b..b47581235cb 100644 --- a/Lib/asyncio/windows_utils.py +++ b/Lib/asyncio/windows_utils.py @@ -36,15 +36,16 @@ else: def socketpair(family=socket.AF_INET, type=socket.SOCK_STREAM, proto=0): """A socket pair usable as a self-pipe, for Windows. - Origin: https://gist.github.com/4325783, by Geert Jansen. Public domain. + Origin: https://gist.github.com/4325783, by Geert Jansen. + Public domain. """ if family == socket.AF_INET: host = '127.0.0.1' elif family == socket.AF_INET6: host = '::1' else: - raise ValueError("Only AF_INET and AF_INET6 socket address families " - "are supported") + raise ValueError("Only AF_INET and AF_INET6 socket address " + "families are supported") if type != socket.SOCK_STREAM: raise ValueError("Only SOCK_STREAM socket type is supported") if proto != 0: diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py index 6599e4eabdb..6bf7e79607e 100644 --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -285,7 +285,8 @@ class BaseEventLoopTests(test_utils.TestCase): @mock.patch('asyncio.base_events.logger') def test__run_once_logging(self, m_logger): def slow_select(timeout): - # Sleep a bit longer than a second to avoid timer resolution issues. + # Sleep a bit longer than a second to avoid timer resolution + # issues. time.sleep(1.1) return [] @@ -1217,14 +1218,16 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): self.loop.run_forever() fmt, *args = m_logger.warning.call_args[0] self.assertRegex(fmt % tuple(args), - "^Executing took .* seconds$") + "^Executing " + "took .* seconds$") # slow task asyncio.async(stop_loop_coro(self.loop), loop=self.loop) self.loop.run_forever() fmt, *args = m_logger.warning.call_args[0] self.assertRegex(fmt % tuple(args), - "^Executing took .* seconds$") + "^Executing " + "took .* seconds$") if __name__ == '__main__': diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py index 286370914d9..dac1e897afe 100644 --- a/Lib/test/test_asyncio/test_futures.py +++ b/Lib/test/test_asyncio/test_futures.py @@ -133,7 +133,8 @@ class FutureTests(test_utils.TestCase): exc = RuntimeError() f_exception = asyncio.Future(loop=self.loop) f_exception.set_exception(exc) - self.assertEqual(repr(f_exception), '') + self.assertEqual(repr(f_exception), + '') self.assertIs(f_exception.exception(), exc) def func_repr(func): @@ -332,16 +333,21 @@ class FutureTests(test_utils.TestCase): if debug: frame = source_traceback[-1] regex = (r'^Future exception was never retrieved\n' - r'future: \n' - r'source_traceback: Object created at \(most recent call last\):\n' + r'future: \n' + r'source_traceback: Object ' + r'created at \(most recent call last\):\n' r' File' r'.*\n' - r' File "{filename}", line {lineno}, in check_future_exception_never_retrieved\n' + r' File "{filename}", line {lineno}, ' + r'in check_future_exception_never_retrieved\n' r' future = asyncio\.Future\(loop=self\.loop\)$' - ).format(filename=re.escape(frame[0]), lineno=frame[1]) + ).format(filename=re.escape(frame[0]), + lineno=frame[1]) else: regex = (r'^Future exception was never retrieved\n' - r'future: $' + r'future: ' + r'$' ) exc_info = (type(exc), exc, exc.__traceback__) m_log.error.assert_called_once_with(mock.ANY, exc_info=exc_info) @@ -352,12 +358,14 @@ class FutureTests(test_utils.TestCase): r'Future/Task created at \(most recent call last\):\n' r' File' r'.*\n' - r' File "{filename}", line {lineno}, in check_future_exception_never_retrieved\n' + r' File "{filename}", line {lineno}, ' + r'in check_future_exception_never_retrieved\n' r' future = asyncio\.Future\(loop=self\.loop\)\n' r'Traceback \(most recent call last\):\n' r'.*\n' r'MemoryError$' - ).format(filename=re.escape(frame[0]), lineno=frame[1]) + ).format(filename=re.escape(frame[0]), + lineno=frame[1]) else: regex = (r'^Future/Task exception was never retrieved\n' r'Traceback \(most recent call last\):\n' diff --git a/Lib/test/test_asyncio/test_streams.py b/Lib/test/test_asyncio/test_streams.py index 73a375aba42..05963cf1478 100644 --- a/Lib/test/test_asyncio/test_streams.py +++ b/Lib/test/test_asyncio/test_streams.py @@ -613,8 +613,10 @@ os.close(fd) watcher.attach_loop(self.loop) try: asyncio.set_child_watcher(watcher) - proc = self.loop.run_until_complete( - asyncio.create_subprocess_exec(*args, pass_fds={wfd}, loop=self.loop)) + create = asyncio.create_subprocess_exec(*args, + pass_fds={wfd}, + loop=self.loop) + proc = self.loop.run_until_complete(create) self.loop.run_until_complete(proc.wait()) finally: asyncio.set_child_watcher(None) diff --git a/Lib/test/test_asyncio/test_subprocess.py b/Lib/test/test_asyncio/test_subprocess.py index 1fe9095d165..5fc1dc0a034 100644 --- a/Lib/test/test_asyncio/test_subprocess.py +++ b/Lib/test/test_asyncio/test_subprocess.py @@ -115,7 +115,9 @@ class SubprocessMixin: def test_send_signal(self): code = 'import time; print("sleeping", flush=True); time.sleep(3600)' args = [sys.executable, '-c', code] - create = asyncio.create_subprocess_exec(*args, loop=self.loop, stdout=subprocess.PIPE) + create = asyncio.create_subprocess_exec(*args, + stdout=subprocess.PIPE, + loop=self.loop) proc = self.loop.run_until_complete(create) @asyncio.coroutine diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py index 1520fb4cc75..7807dc04719 100644 --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -208,7 +208,8 @@ class TaskTests(test_utils.TestCase): self.assertEqual(notmuch.__name__, 'notmuch') if PY35: self.assertEqual(notmuch.__qualname__, - 'TaskTests.test_task_repr_coro_decorator..notmuch') + 'TaskTests.test_task_repr_coro_decorator' + '..notmuch') self.assertEqual(notmuch.__module__, __name__) # test coroutine object @@ -218,7 +219,8 @@ class TaskTests(test_utils.TestCase): # function, as expected, and have a qualified name (__qualname__ # attribute). coro_name = 'notmuch' - coro_qualname = 'TaskTests.test_task_repr_coro_decorator..notmuch' + coro_qualname = ('TaskTests.test_task_repr_coro_decorator' + '..notmuch') else: # On Python < 3.5, generators inherit the name of the code, not of # the function. See: http://bugs.python.org/issue21205 @@ -239,7 +241,8 @@ class TaskTests(test_utils.TestCase): else: code = gen.gi_code coro = ('%s() running at %s:%s' - % (coro_qualname, code.co_filename, code.co_firstlineno)) + % (coro_qualname, code.co_filename, + code.co_firstlineno)) self.assertEqual(repr(gen), '' % coro) @@ -1678,7 +1681,8 @@ class TaskTests(test_utils.TestCase): self.assertTrue(m_log.error.called) message = m_log.error.call_args[0][0] func_filename, func_lineno = test_utils.get_function_source(coro_noop) - regex = (r'^ was never yielded from\n' + regex = (r'^ ' + r'was never yielded from\n' r'Coroutine object created at \(most recent call last\):\n' r'.*\n' r' File "%s", line %s, in test_coroutine_never_yielded\n'