diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-05-20 15:41:44 +0200 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-05-20 15:41:44 +0200 |
commit | 4dfe02a3890b51f3c5476d1fa6ada2d0a4d2cf1e (patch) | |
tree | fb02f2218117ca44c48411aa2fb7941911438907 | |
parent | 6dcf596ea618c68fa4b8a5883292426cbe926be8 (diff) | |
download | trollius-4dfe02a3890b51f3c5476d1fa6ada2d0a4d2cf1e.tar.gz |
Replace asyncio with trollius
47 files changed, 219 insertions, 219 deletions
diff --git a/examples/cacheclt.py b/examples/cacheclt.py index 501334f..1f8ece4 100644 --- a/examples/cacheclt.py +++ b/examples/cacheclt.py @@ -4,9 +4,9 @@ See cachesvr.py for protocol description. """ import argparse -import asyncio -from asyncio import From, Return -from asyncio import test_utils +import trollius as asyncio +from trollius import From, Return +from trollius import test_utils import json import logging @@ -168,7 +168,7 @@ class CacheClient: def main(): asyncio.set_event_loop(None) if args.iocp: - from asyncio.windows_events import ProactorEventLoop + from trollius.windows_events import ProactorEventLoop loop = ProactorEventLoop() else: loop = asyncio.new_event_loop() diff --git a/examples/cachesvr.py b/examples/cachesvr.py index 0999882..97d97e9 100644 --- a/examples/cachesvr.py +++ b/examples/cachesvr.py @@ -57,8 +57,8 @@ form is returned, but the connection is not closed: """ import argparse -import asyncio -from asyncio import From +import trollius as asyncio +from trollius import From import json import logging import os @@ -218,7 +218,7 @@ class Cache: def main(): asyncio.set_event_loop(None) if args.iocp: - from asyncio.windows_events import ProactorEventLoop + from trollius.windows_events import ProactorEventLoop loop = ProactorEventLoop() else: loop = asyncio.new_event_loop() diff --git a/examples/child_process.py b/examples/child_process.py index 8b2659b..9e403a4 100644 --- a/examples/child_process.py +++ b/examples/child_process.py @@ -10,16 +10,16 @@ import os import sys try: - import asyncio + import trollius as asyncio except ImportError: # asyncio is not installed sys.path.append(os.path.join(os.path.dirname(__file__), '..')) - import asyncio -from asyncio import From, Return + import trollius as asyncio +from trollius import From, Return if sys.platform == 'win32': - from asyncio.windows_utils import Popen, PIPE - from asyncio.windows_events import ProactorEventLoop + from trollius.windows_utils import Popen, PIPE + from trollius.windows_events import ProactorEventLoop else: from subprocess import Popen, PIPE diff --git a/examples/crawl.py b/examples/crawl.py index 716f39d..7f54059 100644 --- a/examples/crawl.py +++ b/examples/crawl.py @@ -17,8 +17,8 @@ from __future__ import print_function # - Handle out of file descriptors directly? (How?) import argparse -import asyncio -from asyncio import From, Return +import trollius as asyncio +from trollius import From, Return import asyncio.locks import cgi import logging @@ -841,7 +841,7 @@ def main(): log = Logger(args.level) if args.iocp: - from asyncio.windows_events import ProactorEventLoop + from trollius.windows_events import ProactorEventLoop loop = ProactorEventLoop() asyncio.set_event_loop(loop) elif args.select: diff --git a/examples/echo_client_tulip.py b/examples/echo_client_tulip.py index 7d91e43..88f8b7f 100644 --- a/examples/echo_client_tulip.py +++ b/examples/echo_client_tulip.py @@ -1,5 +1,5 @@ -import asyncio -from asyncio import From +import trollius as asyncio +from trollius import From END = b'Bye-bye!\n' diff --git a/examples/echo_server_tulip.py b/examples/echo_server_tulip.py index 7b024de..8a41b35 100644 --- a/examples/echo_server_tulip.py +++ b/examples/echo_server_tulip.py @@ -1,5 +1,5 @@ -import asyncio -from asyncio import From +import trollius as asyncio +from trollius import From @asyncio.coroutine def echo_server(): diff --git a/examples/fetch0.py b/examples/fetch0.py index 924089b..f98feeb 100644 --- a/examples/fetch0.py +++ b/examples/fetch0.py @@ -3,7 +3,7 @@ from __future__ import print_function import sys -from asyncio import * +from trollius import * @coroutine diff --git a/examples/fetch1.py b/examples/fetch1.py index f2aa6dc..9e9a1ca 100644 --- a/examples/fetch1.py +++ b/examples/fetch1.py @@ -10,7 +10,7 @@ try: except ImportError: from urlparse import urlparse -from asyncio import * +from trollius import * class Response: diff --git a/examples/fetch2.py b/examples/fetch2.py index d7fcaef..5a321a8 100644 --- a/examples/fetch2.py +++ b/examples/fetch2.py @@ -13,7 +13,7 @@ except ImportError: from urlparse import urlparse from httplib import BadStatusLine -from asyncio import * +from trollius import * class Request: diff --git a/examples/fetch3.py b/examples/fetch3.py index 644994e..0fc56d1 100644 --- a/examples/fetch3.py +++ b/examples/fetch3.py @@ -14,7 +14,7 @@ except ImportError: from urlparse import urlparse from httplib import BadStatusLine -from asyncio import * +from trollius import * class ConnectionPool: @@ -223,7 +223,7 @@ def fetch(url, verbose=True, max_redirect=10): def main(): if '--iocp' in sys.argv: - from asyncio.windows_events import ProactorEventLoop + from trollius.windows_events import ProactorEventLoop loop = ProactorEventLoop() set_event_loop(loop) else: diff --git a/examples/fuzz_as_completed.py b/examples/fuzz_as_completed.py index cba6580..7e74fe7 100644 --- a/examples/fuzz_as_completed.py +++ b/examples/fuzz_as_completed.py @@ -4,8 +4,8 @@ from __future__ import print_function -import asyncio -from asyncio import From, Return +import trollius as asyncio +from trollius import From, Return import itertools import random import sys diff --git a/examples/hello_callback.py b/examples/hello_callback.py index df889e5..c835346 100644 --- a/examples/hello_callback.py +++ b/examples/hello_callback.py @@ -1,6 +1,6 @@ """Print 'Hello World' every two seconds, using a callback.""" -import asyncio +import trollius def print_and_repeat(loop): @@ -9,6 +9,6 @@ def print_and_repeat(loop): if __name__ == '__main__': - loop = asyncio.get_event_loop() + loop = trollius.get_event_loop() print_and_repeat(loop) loop.run_forever() diff --git a/examples/hello_coroutine.py b/examples/hello_coroutine.py index a3d14cb..4a10681 100644 --- a/examples/hello_coroutine.py +++ b/examples/hello_coroutine.py @@ -1,16 +1,16 @@ """Print 'Hello World' every two seconds, using a coroutine.""" -import asyncio -from asyncio import From +import trollius +from trollius import From -@asyncio.coroutine +@trollius.coroutine def greet_every_two_seconds(): while True: print('Hello World') - yield From(asyncio.sleep(2)) + yield From(trollius.sleep(2)) if __name__ == '__main__': - loop = asyncio.get_event_loop() + loop = trollius.get_event_loop() loop.run_until_complete(greet_every_two_seconds()) diff --git a/examples/shell.py b/examples/shell.py index 7334337..3d5acbf 100644 --- a/examples/shell.py +++ b/examples/shell.py @@ -1,10 +1,10 @@ """Examples using create_subprocess_exec() and create_subprocess_shell().""" -import asyncio -from asyncio import From +import trollius as asyncio +from trollius import From import signal -from asyncio.subprocess import PIPE -from asyncio.py33_exceptions import ProcessLookupError +from trollius.subprocess import PIPE +from trollius.py33_exceptions import ProcessLookupError @asyncio.coroutine def cat(loop): diff --git a/examples/simple_tcp_server.py b/examples/simple_tcp_server.py index 5f2b276..882938e 100644 --- a/examples/simple_tcp_server.py +++ b/examples/simple_tcp_server.py @@ -10,9 +10,9 @@ fail if this port is currently in use. from __future__ import print_function import sys -import asyncio +import trollius as asyncio import asyncio.streams -from asyncio import From, Return +from trollius import From, Return class MyServer: diff --git a/examples/sink.py b/examples/sink.py index 3a8345b..fb28ade 100644 --- a/examples/sink.py +++ b/examples/sink.py @@ -5,7 +5,7 @@ import argparse import os import sys -from asyncio import * +from trollius import * ARGS = argparse.ArgumentParser(description="TCP data sink example.") ARGS.add_argument( @@ -81,7 +81,7 @@ def main(): global args args = ARGS.parse_args() if args.iocp: - from asyncio.windows_events import ProactorEventLoop + from trollius.windows_events import ProactorEventLoop loop = ProactorEventLoop() set_event_loop(loop) else: diff --git a/examples/source.py b/examples/source.py index c863dd2..c3ebd55 100644 --- a/examples/source.py +++ b/examples/source.py @@ -4,8 +4,8 @@ from __future__ import print_function import argparse import sys -from asyncio import * -from asyncio import test_utils +from trollius import * +from trollius import test_utils ARGS = argparse.ArgumentParser(description="TCP data sink example.") @@ -86,7 +86,7 @@ def main(): global args args = ARGS.parse_args() if args.iocp: - from asyncio.windows_events import ProactorEventLoop + from trollius.windows_events import ProactorEventLoop loop = ProactorEventLoop() set_event_loop(loop) else: diff --git a/examples/source1.py b/examples/source1.py index a1e1808..48a53af 100644 --- a/examples/source1.py +++ b/examples/source1.py @@ -4,8 +4,8 @@ from __future__ import print_function import argparse import sys -from asyncio import * -from asyncio import test_utils +from trollius import * +from trollius import test_utils ARGS = argparse.ArgumentParser(description="TCP data sink example.") ARGS.add_argument( @@ -85,7 +85,7 @@ def main(): global args args = ARGS.parse_args() if args.iocp: - from asyncio.windows_events import ProactorEventLoop + from trollius.windows_events import ProactorEventLoop loop = ProactorEventLoop() set_event_loop(loop) else: diff --git a/examples/stacks.py b/examples/stacks.py index 985366b..7bdd165 100644 --- a/examples/stacks.py +++ b/examples/stacks.py @@ -1,7 +1,7 @@ """Crude demo for print_stack().""" -from asyncio import * +from trollius import * @coroutine diff --git a/examples/subprocess_attach_read_pipe.py b/examples/subprocess_attach_read_pipe.py index eeccfde..861c1ac 100644 --- a/examples/subprocess_attach_read_pipe.py +++ b/examples/subprocess_attach_read_pipe.py @@ -1,8 +1,8 @@ #!/usr/bin/env python3 """Example showing how to attach a read pipe to a subprocess.""" -import asyncio +import trollius as asyncio import os, sys -from asyncio import From +from trollius import From code = """ import os, sys diff --git a/examples/subprocess_attach_write_pipe.py b/examples/subprocess_attach_write_pipe.py index 5720d24..7dd7880 100644 --- a/examples/subprocess_attach_write_pipe.py +++ b/examples/subprocess_attach_write_pipe.py @@ -1,9 +1,9 @@ #!/usr/bin/env python3 """Example showing how to attach a write pipe to a subprocess.""" -import asyncio -from asyncio import From +import trollius as asyncio +from trollius import From import os, sys -from asyncio import subprocess +from trollius import subprocess code = """ import os, sys diff --git a/examples/subprocess_shell.py b/examples/subprocess_shell.py index 24374dc..9ee88fe 100644 --- a/examples/subprocess_shell.py +++ b/examples/subprocess_shell.py @@ -1,11 +1,11 @@ """Example writing to and reading from a subprocess at the same time using tasks.""" -import asyncio +import trollius as asyncio import os -from asyncio import From -from asyncio.subprocess import PIPE -from asyncio.py33_exceptions import BrokenPipeError, ConnectionResetError +from trollius import From +from trollius.subprocess import PIPE +from trollius.py33_exceptions import BrokenPipeError, ConnectionResetError @asyncio.coroutine diff --git a/examples/tcp_echo.py b/examples/tcp_echo.py index 1cec06b..773327f 100755 --- a/examples/tcp_echo.py +++ b/examples/tcp_echo.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """TCP echo server example.""" import argparse -import asyncio +import trollius as asyncio import sys try: import signal @@ -105,7 +105,7 @@ if __name__ == '__main__': ARGS.print_help() else: if args.iocp: - from asyncio import windows_events + from trollius import windows_events loop = windows_events.ProactorEventLoop() asyncio.set_event_loop(loop) else: diff --git a/examples/timing_tcp_server.py b/examples/timing_tcp_server.py index 9e546d4..c93c407 100644 --- a/examples/timing_tcp_server.py +++ b/examples/timing_tcp_server.py @@ -13,9 +13,9 @@ import sys import time import random -import asyncio +import trollius as asyncio import asyncio.streams -from asyncio import From, Return +from trollius import From, Return class MyServer: diff --git a/examples/udp_echo.py b/examples/udp_echo.py index 54388e9..bd64639 100755 --- a/examples/udp_echo.py +++ b/examples/udp_echo.py @@ -2,7 +2,7 @@ """UDP echo example.""" import argparse import sys -import asyncio +import trollius as asyncio try: import signal except ImportError: diff --git a/runtests.py b/runtests.py index 66448ad..e3edd82 100755 --- a/runtests.py +++ b/runtests.py @@ -29,7 +29,7 @@ import random import re import sys import textwrap -from asyncio.compat import PY33 +from trollius.compat import PY33 if PY33: import importlib.machinery else: diff --git a/tests/echo3.py b/tests/echo3.py index ca95bbe..a009ea3 100644 --- a/tests/echo3.py +++ b/tests/echo3.py @@ -5,7 +5,7 @@ asyncio_path = os.path.join(os.path.dirname(__file__), '..') asyncio_path = os.path.abspath(asyncio_path) sys.path.insert(0, asyncio_path) -from asyncio.py33_exceptions import wrap_error +from trollius.py33_exceptions import wrap_error sys.path.remove(asyncio_path) if __name__ == '__main__': diff --git a/tests/test_base_events.py b/tests/test_base_events.py index b659199..3e3c514 100644 --- a/tests/test_base_events.py +++ b/tests/test_base_events.py @@ -6,15 +6,15 @@ import socket import sys import unittest -import asyncio -from asyncio import Return, From -from asyncio import base_events -from asyncio import constants -from asyncio import test_utils -from asyncio.py33_exceptions import BlockingIOError -from asyncio.test_utils import mock -from asyncio.test_support import IPV6_ENABLED -from asyncio.time_monotonic import time_monotonic +import trollius as asyncio +from trollius import Return, From +from trollius import base_events +from trollius import constants +from trollius import test_utils +from trollius.py33_exceptions import BlockingIOError +from trollius.test_utils import mock +from trollius.test_support import IPV6_ENABLED +from trollius.time_monotonic import time_monotonic MOCK_ANY = mock.ANY @@ -228,8 +228,8 @@ class BaseEventLoopTests(test_utils.TestCase): self.loop.set_debug(False) self.assertFalse(self.loop.get_debug()) - @mock.patch('asyncio.base_events.time_monotonic') - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.base_events.time_monotonic') + @mock.patch('trollius.base_events.logger') def test__run_once_logging(self, m_logger, m_time_monotonic): # Log to INFO level if timeout > 1.0 sec. non_local = { @@ -334,7 +334,7 @@ class BaseEventLoopTests(test_utils.TestCase): 1/0 # Test call_soon (events.Handle) - with mock.patch('asyncio.base_events.logger') as log: + with mock.patch('trollius.base_events.logger') as log: fut = asyncio.Future(loop=self.loop) self.loop.call_soon(zero_error, fut) fut.add_done_callback(lambda fut: self.loop.stop()) @@ -344,7 +344,7 @@ class BaseEventLoopTests(test_utils.TestCase): exc_info=(ZeroDivisionError, MOCK_ANY, MOCK_ANY)) # Test call_later (events.TimerHandle) - with mock.patch('asyncio.base_events.logger') as log: + with mock.patch('trollius.base_events.logger') as log: fut = asyncio.Future(loop=self.loop) self.loop.call_later(0.01, zero_error, fut) fut.add_done_callback(lambda fut: self.loop.stop()) @@ -364,7 +364,7 @@ class BaseEventLoopTests(test_utils.TestCase): 1/0 # Test Future.__del__ - with mock.patch('asyncio.base_events.logger') as log: + with mock.patch('trollius.base_events.logger') as log: fut = asyncio.async(zero_error_coro(), loop=self.loop) fut.add_done_callback(lambda *args: self.loop.stop()) self.loop.run_forever() @@ -408,7 +408,7 @@ class BaseEventLoopTests(test_utils.TestCase): mock_handler.reset_mock() self.loop.set_exception_handler(None) - with mock.patch('asyncio.base_events.logger') as log: + with mock.patch('trollius.base_events.logger') as log: run_loop() log.error.assert_called_with( test_utils.MockPattern( @@ -431,7 +431,7 @@ class BaseEventLoopTests(test_utils.TestCase): self.loop.set_exception_handler(handler) - with mock.patch('asyncio.base_events.logger') as log: + with mock.patch('trollius.base_events.logger') as log: run_loop() log.error.assert_called_with( test_utils.MockPattern( @@ -460,7 +460,7 @@ class BaseEventLoopTests(test_utils.TestCase): loop.call_soon(zero_error) loop._run_once() - with mock.patch('asyncio.base_events.logger') as log: + with mock.patch('trollius.base_events.logger') as log: run_loop() log.error.assert_called_with( 'Exception in default exception handler', @@ -471,7 +471,7 @@ class BaseEventLoopTests(test_utils.TestCase): del contexts[:] loop.set_exception_handler(custom_handler) - with mock.patch('asyncio.base_events.logger') as log: + with mock.patch('trollius.base_events.logger') as log: run_loop() log.error.assert_called_with( test_utils.MockPattern('Exception in default exception.*' @@ -553,7 +553,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): def tearDown(self): self.loop.close() - @mock.patch('asyncio.base_events.socket') + @mock.patch('trollius.base_events.socket') def test_create_connection_multiple_errors(self, m_socket): class MyProto(asyncio.Protocol): @@ -643,7 +643,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): with self.assertRaises(socket.error): self.loop.run_until_complete(coro) - @mock.patch('asyncio.base_events.socket') + @mock.patch('trollius.base_events.socket') def test_create_connection_multiple_errors_local_addr(self, m_socket): def bind(addr): @@ -815,7 +815,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): f = self.loop.create_server(MyProto, '0.0.0.0', 0) self.assertRaises(socket.error, self.loop.run_until_complete, f) - @mock.patch('asyncio.base_events.socket') + @mock.patch('trollius.base_events.socket') def test_create_server_cant_bind(self, m_socket): class Err(socket.error): @@ -832,7 +832,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): self.assertRaises(socket.error, self.loop.run_until_complete, fut) self.assertTrue(m_sock.close.called) - @mock.patch('asyncio.base_events.socket') + @mock.patch('trollius.base_events.socket') def test_create_datagram_endpoint_no_addrinfo(self, m_socket): m_socket.error = socket.error m_socket.getaddrinfo.return_value = [] @@ -862,7 +862,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): self.assertRaises( socket.error, self.loop.run_until_complete, coro) - @mock.patch('asyncio.base_events.socket') + @mock.patch('trollius.base_events.socket') def test_create_datagram_endpoint_socket_err(self, m_socket): m_socket.error = socket.error m_socket.getaddrinfo = socket.getaddrinfo @@ -886,7 +886,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): self.assertRaises( ValueError, self.loop.run_until_complete, coro) - @mock.patch('asyncio.base_events.socket') + @mock.patch('trollius.base_events.socket') def test_create_datagram_endpoint_setblk_err(self, m_socket): m_socket.error = socket.error m_socket.socket.return_value.setblocking.side_effect = socket.error @@ -903,7 +903,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): asyncio.DatagramProtocol) self.assertRaises(ValueError, self.loop.run_until_complete, coro) - @mock.patch('asyncio.base_events.socket') + @mock.patch('trollius.base_events.socket') def test_create_datagram_endpoint_cant_bind(self, m_socket): class Err(socket.error): pass @@ -927,7 +927,7 @@ class BaseEventLoopWithSelectorTests(test_utils.TestCase): self.loop._accept_connection(MyProto, sock) self.assertFalse(sock.close.called) - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.base_events.logger') def test_accept_connection_exception(self, m_log): sock = mock.Mock() sock.fileno.return_value = 10 diff --git a/tests/test_events.py b/tests/test_events.py index 50dcff4..fca78ad 100644 --- a/tests/test_events.py +++ b/tests/test_events.py @@ -28,18 +28,18 @@ try: except ImportError: concurrent = None -from asyncio import Return, From -from asyncio import futures +from trollius import Return, From +from trollius import futures -import asyncio -from asyncio import selector_events -from asyncio import test_utils -from asyncio.py33_exceptions import (wrap_error, +import trollius as asyncio +from trollius import selector_events +from trollius import test_utils +from trollius.py33_exceptions import (wrap_error, BlockingIOError, ConnectionRefusedError, FileNotFoundError) -from asyncio.test_utils import mock -from asyncio.time_monotonic import time_monotonic -from asyncio import test_support as support # find_unused_port, IPV6_ENABLED, TEST_HOME_DIR +from trollius.test_utils import mock +from trollius.time_monotonic import time_monotonic +from trollius import test_support as support # find_unused_port, IPV6_ENABLED, TEST_HOME_DIR def data_file(filename): @@ -1701,7 +1701,7 @@ if sys.platform == 'win32': def test_remove_fds_after_closing(self): raise unittest.SkipTest("IocpEventLoop does not have add_reader()") else: - from asyncio import selectors + from trollius import selectors class UnixEventLoopTestsMixin(EventLoopTestsMixin): def setUp(self): @@ -2033,7 +2033,7 @@ class PolicyTests(test_utils.TestCase): policy.set_event_loop(None) self.assertRaises(AssertionError, policy.get_event_loop) - @mock.patch('asyncio.events.threading.current_thread') + @mock.patch('trollius.events.threading.current_thread') def test_get_event_loop_thread(self, m_current_thread): def f(): diff --git a/tests/test_futures.py b/tests/test_futures.py index 66ffc57..ae570e0 100644 --- a/tests/test_futures.py +++ b/tests/test_futures.py @@ -7,9 +7,9 @@ except ImportError: import threading import unittest -import asyncio -from asyncio import test_utils -from asyncio.test_utils import mock +import trollius as asyncio +from trollius import test_utils +from trollius.test_utils import mock def _fakefunc(f): @@ -146,20 +146,20 @@ class FutureTests(test_utils.TestCase): newf_cancelled._copy_state(f_cancelled) self.assertTrue(newf_cancelled.cancelled()) - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.base_events.logger') def test_tb_logger_abandoned(self, m_log): fut = asyncio.Future(loop=self.loop) del fut self.assertFalse(m_log.error.called) - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.base_events.logger') def test_tb_logger_result_unretrieved(self, m_log): fut = asyncio.Future(loop=self.loop) fut.set_result(42) del fut self.assertFalse(m_log.error.called) - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.base_events.logger') def test_tb_logger_result_retrieved(self, m_log): fut = asyncio.Future(loop=self.loop) fut.set_result(42) @@ -167,7 +167,7 @@ class FutureTests(test_utils.TestCase): del fut self.assertFalse(m_log.error.called) - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.base_events.logger') def test_tb_logger_exception_unretrieved(self, m_log): self.loop.set_debug(True) asyncio.set_event_loop(self.loop) @@ -177,7 +177,7 @@ class FutureTests(test_utils.TestCase): test_utils.run_briefly(self.loop) self.assertTrue(m_log.error.called) - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.base_events.logger') def test_tb_logger_exception_retrieved(self, m_log): fut = asyncio.Future(loop=self.loop) fut.set_exception(RuntimeError('boom')) @@ -185,7 +185,7 @@ class FutureTests(test_utils.TestCase): del fut self.assertFalse(m_log.error.called) - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.base_events.logger') def test_tb_logger_exception_result_retrieved(self, m_log): fut = asyncio.Future(loop=self.loop) fut.set_exception(RuntimeError('boom')) @@ -212,7 +212,7 @@ class FutureTests(test_utils.TestCase): self.assertIs(f1, f2) @test_utils.skipIf(concurrent is None, 'need concurrent.futures') - @mock.patch('asyncio.futures.events') + @mock.patch('trollius.futures.events') def test_wrap_future_use_global_loop(self, m_events): def run(arg): return (arg, get_thread_ident()) diff --git a/tests/test_locks.py b/tests/test_locks.py index 0d05187..6ba0b62 100644 --- a/tests/test_locks.py +++ b/tests/test_locks.py @@ -3,10 +3,10 @@ import unittest import re -import asyncio -from asyncio import From, Return -from asyncio import test_utils -from asyncio.test_utils import mock +import trollius as asyncio +from trollius import From, Return +from trollius import test_utils +from trollius.test_utils import mock STR_RGX_REPR = ( diff --git a/tests/test_proactor_events.py b/tests/test_proactor_events.py index c07d820..9f89b76 100644 --- a/tests/test_proactor_events.py +++ b/tests/test_proactor_events.py @@ -3,14 +3,14 @@ import socket import unittest -from asyncio import test_utils -from asyncio.proactor_events import BaseProactorEventLoop -from asyncio.proactor_events import _ProactorDuplexPipeTransport -from asyncio.proactor_events import _ProactorSocketTransport -from asyncio.proactor_events import _ProactorWritePipeTransport -from asyncio.py33_exceptions import ConnectionAbortedError, ConnectionResetError -from asyncio.test_utils import mock -import asyncio +from trollius import test_utils +from trollius.proactor_events import BaseProactorEventLoop +from trollius.proactor_events import _ProactorDuplexPipeTransport +from trollius.proactor_events import _ProactorSocketTransport +from trollius.proactor_events import _ProactorWritePipeTransport +from trollius.py33_exceptions import ConnectionAbortedError, ConnectionResetError +from trollius.test_utils import mock +import trollius as asyncio class ProactorSocketTransportTests(test_utils.TestCase): @@ -140,7 +140,7 @@ class ProactorSocketTransportTests(test_utils.TestCase): self.loop._proactor.send.return_value.add_done_callback.\ assert_called_with(tr._loop_writing) - @mock.patch('asyncio.proactor_events.logger') + @mock.patch('trollius.proactor_events.logger') def test_loop_writing_err(self, m_log): err = self.loop._proactor.send.side_effect = OSError() tr = _ProactorSocketTransport(self.loop, self.sock, self.protocol) @@ -214,7 +214,7 @@ class ProactorSocketTransportTests(test_utils.TestCase): test_utils.run_briefly(self.loop) self.assertFalse(self.protocol.connection_lost.called) - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.base_events.logger') def test_fatal_error(self, m_logging): tr = _ProactorSocketTransport(self.loop, self.sock, self.protocol) tr._force_close = mock.Mock() @@ -439,7 +439,7 @@ class BaseProactorEventLoopTests(test_utils.TestCase): def test_process_events(self): self.loop._process_events([]) - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.base_events.logger') def test_create_server(self, m_log): pf = mock.Mock() call_soon = self.loop.call_soon = mock.Mock() diff --git a/tests/test_queues.py b/tests/test_queues.py index 141e66b..19ab713 100644 --- a/tests/test_queues.py +++ b/tests/test_queues.py @@ -2,10 +2,10 @@ import unittest -import asyncio -from asyncio import Return, From -from asyncio import test_utils -from asyncio.test_utils import mock +import trollius as asyncio +from trollius import Return, From +from trollius import test_utils +from trollius.test_utils import mock class _QueueTestBase(test_utils.TestCase): diff --git a/tests/test_selector_events.py b/tests/test_selector_events.py index 5df0d67..45b7d6a 100644 --- a/tests/test_selector_events.py +++ b/tests/test_selector_events.py @@ -12,21 +12,21 @@ except ImportError: ssl = None else: HAS_SNI = getattr(ssl, 'HAS_SNI', False) - from asyncio.py3_ssl import SSLWantReadError, SSLWantWriteError + from trollius.py3_ssl import SSLWantReadError, SSLWantWriteError -import asyncio -from asyncio.py33_exceptions import ( +import trollius as asyncio +from trollius.py33_exceptions import ( BlockingIOError, InterruptedError, ConnectionResetError, ConnectionRefusedError) -from asyncio import selectors -from asyncio import test_utils -from asyncio.selector_events import BaseSelectorEventLoop -from asyncio.selector_events import _SelectorDatagramTransport -from asyncio.selector_events import _SelectorSocketTransport -from asyncio.selector_events import _SelectorSslTransport -from asyncio.selector_events import _SelectorTransport -from asyncio.selector_events import _SSL_REQUIRES_SELECT -from asyncio.test_utils import mock +from trollius import selectors +from trollius import test_utils +from trollius.selector_events import BaseSelectorEventLoop +from trollius.selector_events import _SelectorDatagramTransport +from trollius.selector_events import _SelectorSocketTransport +from trollius.selector_events import _SelectorSslTransport +from trollius.selector_events import _SelectorTransport +from trollius.selector_events import _SSL_REQUIRES_SELECT +from trollius.test_utils import mock if sys.version_info >= (3,): UNICODE_STR = 'unicode' @@ -77,7 +77,7 @@ class BaseSelectorEventLoopTests(test_utils.TestCase): m, asyncio.Protocol(), m, waiter) self.assertIsInstance(transport, _SelectorSslTransport) - @mock.patch('asyncio.selector_events.ssl', None) + @mock.patch('trollius.selector_events.ssl', None) def test_make_ssl_transport_without_ssl_error(self): m = mock.Mock() self.loop.add_reader = mock.Mock() @@ -662,7 +662,7 @@ class SelectorTransportTests(test_utils.TestCase): self.assertFalse(self.loop.readers) self.assertEqual(1, self.loop.remove_reader_count[7]) - @mock.patch('asyncio.log.logger.error') + @mock.patch('trollius.log.logger.error') def test_fatal_error(self, m_exc): exc = OSError() tr = _SelectorTransport(self.loop, self.sock, self.protocol, None) @@ -911,7 +911,7 @@ class SelectorSocketTransportTests(test_utils.TestCase): self.loop.assert_writer(7, transport._write_ready) self.assertEqual(list_to_buffer([b'data']), transport._buffer) - @mock.patch('asyncio.selector_events.logger') + @mock.patch('trollius.selector_events.logger') def test_write_exception(self, m_log): err = self.sock.send.side_effect = OSError() @@ -1029,7 +1029,7 @@ class SelectorSocketTransportTests(test_utils.TestCase): err, 'Fatal write error on socket transport') - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.base_events.logger') def test_write_ready_exception_and_close(self, m_log): self.sock.send.side_effect = OSError() remove_writer = self.loop.remove_writer = mock.Mock() @@ -1182,7 +1182,7 @@ class SelectorSslTransportTests(test_utils.TestCase): transport.write(b'data') self.assertEqual(transport._conn_lost, 2) - @mock.patch('asyncio.selector_events.logger') + @mock.patch('trollius.selector_events.logger') def test_write_exception(self, m_log): transport = self._make_one() transport._conn_lost = 1 @@ -1400,7 +1400,7 @@ class SelectorSslTransportTests(test_utils.TestCase): class SelectorSslWithoutSslTransportTests(test_utils.TestCase): - @mock.patch('asyncio.selector_events.ssl', None) + @mock.patch('trollius.selector_events.ssl', None) def test_ssl_transport_requires_ssl_module(self): Mock = mock.Mock with self.assertRaises(RuntimeError): @@ -1544,7 +1544,7 @@ class SelectorDatagramTransportTests(test_utils.TestCase): self.assertEqual( [(b'data', ('0.0.0.0', 12345))], list(transport._buffer)) - @mock.patch('asyncio.selector_events.logger') + @mock.patch('trollius.selector_events.logger') def test_sendto_exception(self, m_log): data = b'data' err = self.sock.sendto.side_effect = RuntimeError() @@ -1700,7 +1700,7 @@ class SelectorDatagramTransportTests(test_utils.TestCase): self.assertFalse(transport._fatal_error.called) self.assertTrue(self.protocol.error_received.called) - @mock.patch('asyncio.base_events.logger.error') + @mock.patch('trollius.base_events.logger.error') def test_fatal_error_connected(self, m_exc): transport = _SelectorDatagramTransport( self.loop, self.sock, self.protocol, ('0.0.0.0', 1)) diff --git a/tests/test_selectors.py b/tests/test_selectors.py index 4042ca4..a766f9f 100644 --- a/tests/test_selectors.py +++ b/tests/test_selectors.py @@ -2,9 +2,9 @@ import unittest -from asyncio import selectors -from asyncio import test_utils -from asyncio.test_utils import mock +from trollius import selectors +from trollius import test_utils +from trollius.test_utils import mock class FakeSelector(selectors._BaseSelectorImpl): diff --git a/tests/test_streams.py b/tests/test_streams.py index 6ce8974..1accbe4 100644 --- a/tests/test_streams.py +++ b/tests/test_streams.py @@ -11,11 +11,11 @@ try: except ImportError: ssl = None -import asyncio -from asyncio import Return, From -from asyncio import compat -from asyncio import test_utils -from asyncio.test_utils import mock +import trollius as asyncio +from trollius import Return, From +from trollius import compat +from trollius import test_utils +from trollius.test_utils import mock class StreamReaderTests(test_utils.TestCase): @@ -33,7 +33,7 @@ class StreamReaderTests(test_utils.TestCase): self.loop.close() gc.collect() - @mock.patch('asyncio.streams.events') + @mock.patch('trollius.streams.events') def test_ctor_global_loop(self, m_events): stream = asyncio.StreamReader() self.assertIs(stream._loop, m_events.get_event_loop.return_value) diff --git a/tests/test_subprocess.py b/tests/test_subprocess.py index 228eb36..b699159 100644 --- a/tests/test_subprocess.py +++ b/tests/test_subprocess.py @@ -1,15 +1,15 @@ -from asyncio import subprocess -import asyncio +from trollius import subprocess +import trollius as asyncio import os import signal import sys import unittest -from asyncio import From, Return -from asyncio import test_support as support -from asyncio import test_utils +from trollius import From, Return +from trollius import test_support as support +from trollius import test_utils if sys.platform != 'win32': - from asyncio import unix_events -from asyncio.py33_exceptions import BrokenPipeError + from trollius import unix_events +from trollius.py33_exceptions import BrokenPipeError # Program blocking PROGRAM_BLOCKED = [sys.executable, '-c', 'import time; time.sleep(3600)'] diff --git a/tests/test_tasks.py b/tests/test_tasks.py index b4afabf..befe050 100644 --- a/tests/test_tasks.py +++ b/tests/test_tasks.py @@ -6,11 +6,11 @@ import types import unittest import weakref -import asyncio -from asyncio import From, Return -from asyncio import coroutines -from asyncio import test_utils -from asyncio.test_support import assert_python_ok +import trollius as asyncio +from trollius import From, Return +from trollius import coroutines +from trollius import test_utils +from trollius.test_support import assert_python_ok @asyncio.coroutine @@ -1546,8 +1546,8 @@ class GatherTestsBase: code = '\n'.join(( 'import sys', 'sys.path.insert(0, %r)' % path, - 'import asyncio.coroutines', - 'print(asyncio.coroutines._DEBUG)')) + 'import trollius.coroutines', + 'print(trollius.coroutines._DEBUG)')) # Test with -E to not fail if the unit test was run with # PYTHONASYNCIODEBUG set to a non-empty string diff --git a/tests/test_transports.py b/tests/test_transports.py index badadd0..4943b2f 100644 --- a/tests/test_transports.py +++ b/tests/test_transports.py @@ -2,10 +2,10 @@ import unittest -import asyncio -from asyncio import test_utils -from asyncio import transports -from asyncio.test_utils import mock +import trollius as asyncio +from trollius import test_utils +from trollius import transports +from trollius.test_utils import mock try: memoryview diff --git a/tests/test_unix_events.py b/tests/test_unix_events.py index 86f7992..44fbe73 100644 --- a/tests/test_unix_events.py +++ b/tests/test_unix_events.py @@ -19,12 +19,12 @@ if sys.platform == 'win32': raise unittest.SkipTest('UNIX only') -import asyncio -from asyncio import log -from asyncio import test_utils -from asyncio import unix_events -from asyncio.py33_exceptions import BlockingIOError, ChildProcessError -from asyncio.test_utils import mock +import trollius as asyncio +from trollius import log +from trollius import test_utils +from trollius import unix_events +from trollius.py33_exceptions import BlockingIOError, ChildProcessError +from trollius.test_utils import mock MOCK_ANY = mock.ANY @@ -58,7 +58,7 @@ class SelectorEventLoopSignalTests(test_utils.TestCase): self.loop._handle_signal(signal.NSIG + 1, ()) self.loop.remove_signal_handler.assert_called_with(signal.NSIG + 1) - @mock.patch('asyncio.unix_events.signal') + @mock.patch('trollius.unix_events.signal') def test_add_signal_handler_setup_error(self, m_signal): m_signal.NSIG = signal.NSIG m_signal.set_wakeup_fd.side_effect = ValueError @@ -68,7 +68,7 @@ class SelectorEventLoopSignalTests(test_utils.TestCase): self.loop.add_signal_handler, signal.SIGINT, lambda: True) - @mock.patch('asyncio.unix_events.signal') + @mock.patch('trollius.unix_events.signal') def test_add_signal_handler(self, m_signal): m_signal.NSIG = signal.NSIG @@ -78,7 +78,7 @@ class SelectorEventLoopSignalTests(test_utils.TestCase): self.assertIsInstance(h, asyncio.Handle) self.assertEqual(h._callback, cb) - @mock.patch('asyncio.unix_events.signal') + @mock.patch('trollius.unix_events.signal') def test_add_signal_handler_install_error(self, m_signal): m_signal.NSIG = signal.NSIG @@ -96,8 +96,8 @@ class SelectorEventLoopSignalTests(test_utils.TestCase): self.loop.add_signal_handler, signal.SIGINT, lambda: True) - @mock.patch('asyncio.unix_events.signal') - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.unix_events.signal') + @mock.patch('trollius.base_events.logger') def test_add_signal_handler_install_error2(self, m_logging, m_signal): m_signal.NSIG = signal.NSIG @@ -113,8 +113,8 @@ class SelectorEventLoopSignalTests(test_utils.TestCase): self.assertFalse(m_logging.info.called) self.assertEqual(1, m_signal.set_wakeup_fd.call_count) - @mock.patch('asyncio.unix_events.signal') - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.unix_events.signal') + @mock.patch('trollius.base_events.logger') def test_add_signal_handler_install_error3(self, m_logging, m_signal): class Err(OSError): errno = errno.EINVAL @@ -128,7 +128,7 @@ class SelectorEventLoopSignalTests(test_utils.TestCase): self.assertFalse(m_logging.info.called) self.assertEqual(2, m_signal.set_wakeup_fd.call_count) - @mock.patch('asyncio.unix_events.signal') + @mock.patch('trollius.unix_events.signal') def test_remove_signal_handler(self, m_signal): m_signal.NSIG = signal.NSIG @@ -141,7 +141,7 @@ class SelectorEventLoopSignalTests(test_utils.TestCase): self.assertEqual( (signal.SIGHUP, m_signal.SIG_DFL), m_signal.signal.call_args[0]) - @mock.patch('asyncio.unix_events.signal') + @mock.patch('trollius.unix_events.signal') def test_remove_signal_handler_2(self, m_signal): m_signal.NSIG = signal.NSIG m_signal.SIGINT = signal.SIGINT @@ -158,8 +158,8 @@ class SelectorEventLoopSignalTests(test_utils.TestCase): (signal.SIGINT, m_signal.default_int_handler), m_signal.signal.call_args[0]) - @mock.patch('asyncio.unix_events.signal') - @mock.patch('asyncio.base_events.logger') + @mock.patch('trollius.unix_events.signal') + @mock.patch('trollius.base_events.logger') def test_remove_signal_handler_cleanup_error(self, m_logging, m_signal): m_signal.NSIG = signal.NSIG self.loop.add_signal_handler(signal.SIGHUP, lambda: True) @@ -169,7 +169,7 @@ class SelectorEventLoopSignalTests(test_utils.TestCase): self.loop.remove_signal_handler(signal.SIGHUP) self.assertTrue(m_logging.info) - @mock.patch('asyncio.unix_events.signal') + @mock.patch('trollius.unix_events.signal') def test_remove_signal_handler_error(self, m_signal): m_signal.NSIG = signal.NSIG self.loop.add_signal_handler(signal.SIGHUP, lambda: True) @@ -179,7 +179,7 @@ class SelectorEventLoopSignalTests(test_utils.TestCase): self.assertRaises( OSError, self.loop.remove_signal_handler, signal.SIGHUP) - @mock.patch('asyncio.unix_events.signal') + @mock.patch('trollius.unix_events.signal') def test_remove_signal_handler_error2(self, m_signal): m_signal.NSIG = signal.NSIG self.loop.add_signal_handler(signal.SIGHUP, lambda: True) @@ -191,7 +191,7 @@ class SelectorEventLoopSignalTests(test_utils.TestCase): self.assertRaises( RuntimeError, self.loop.remove_signal_handler, signal.SIGHUP) - @mock.patch('asyncio.unix_events.signal') + @mock.patch('trollius.unix_events.signal') def test_close(self, m_signal): m_signal.NSIG = signal.NSIG @@ -355,7 +355,7 @@ class UnixReadPipeTransportTests(test_utils.TestCase): test_utils.run_briefly(self.loop) self.assertFalse(self.protocol.data_received.called) - @mock.patch('asyncio.log.logger.error') + @mock.patch('trollius.log.logger.error') @mock.patch('os.read') def test__read_ready_error(self, m_read, m_logexc): tr = unix_events._UnixReadPipeTransport( @@ -550,7 +550,7 @@ class UnixWritePipeTransportTests(test_utils.TestCase): self.loop.assert_writer(5, tr._write_ready) self.assertEqual([b'data'], tr._buffer) - @mock.patch('asyncio.unix_events.logger') + @mock.patch('trollius.unix_events.logger') @mock.patch('os.write') def test_write_err(self, m_write, m_log): tr = unix_events._UnixWritePipeTransport( @@ -650,7 +650,7 @@ class UnixWritePipeTransportTests(test_utils.TestCase): self.loop.assert_writer(5, tr._write_ready) self.assertEqual([b'data'], tr._buffer) - @mock.patch('asyncio.log.logger.error') + @mock.patch('trollius.log.logger.error') @mock.patch('os.write') def test__write_ready_err(self, m_write, m_logexc): tr = unix_events._UnixWritePipeTransport( diff --git a/tests/test_windows_events.py b/tests/test_windows_events.py index 26af3fd..d56a706 100644 --- a/tests/test_windows_events.py +++ b/tests/test_windows_events.py @@ -1,4 +1,4 @@ -from asyncio import test_utils +from trollius import test_utils import os import sys import unittest @@ -6,12 +6,12 @@ import unittest if sys.platform != 'win32': raise test_utils.SkipTest('Windows only') -import asyncio -from asyncio import Return, From -from asyncio import _overlapped -from asyncio import py33_winapi as _winapi -from asyncio import windows_events -from asyncio.py33_exceptions import PermissionError, FileNotFoundError +import trollius as asyncio +from trollius import Return, From +from trollius import _overlapped +from trollius import py33_winapi as _winapi +from trollius import windows_events +from trollius.py33_exceptions import PermissionError, FileNotFoundError class UpperProto(asyncio.Protocol): diff --git a/tests/test_windows_utils.py b/tests/test_windows_utils.py index 6dcffe1..8e1b89b 100644 --- a/tests/test_windows_utils.py +++ b/tests/test_windows_utils.py @@ -5,15 +5,15 @@ import sys import unittest if sys.platform != 'win32': - from asyncio.test_utils import SkipTest + from trollius.test_utils import SkipTest raise SkipTest('Windows only') import asyncio.test_support as support -from asyncio.test_support import IPV6_ENABLED -from asyncio import _overlapped -from asyncio import py33_winapi as _winapi -from asyncio import windows_utils -from asyncio.test_utils import mock +from trollius.test_support import IPV6_ENABLED +from trollius import _overlapped +from trollius import py33_winapi as _winapi +from trollius import windows_utils +from trollius.test_utils import mock class WinsocketpairTests(unittest.TestCase): @@ -33,7 +33,7 @@ class WinsocketpairTests(unittest.TestCase): ssock, csock = windows_utils.socketpair(family=socket.AF_INET6) self.check_winsocketpair(ssock, csock) - @mock.patch('asyncio.windows_utils.socket') + @mock.patch('trollius.windows_utils.socket') def test_winsocketpair_exc(self, m_socket): m_socket.AF_INET = socket.AF_INET m_socket.SOCK_STREAM = socket.SOCK_STREAM diff --git a/trollius/coroutines.py b/trollius/coroutines.py index a13f6b7..0a42f67 100644 --- a/trollius/coroutines.py +++ b/trollius/coroutines.py @@ -3,7 +3,7 @@ import inspect import os import sys -from asyncio import futures +from trollius import futures from .log import logger # If you set _DEBUG to true, @coroutine will wrap the resulting diff --git a/trollius/py33_exceptions.py b/trollius/py33_exceptions.py index a35ff2e..0cf8d65 100644 --- a/trollius/py33_exceptions.py +++ b/trollius/py33_exceptions.py @@ -75,7 +75,7 @@ _MAP_ERRNO = { } if sys.platform == 'win32': - from asyncio import _overlapped + from trollius import _overlapped _MAP_ERRNO.update({ _overlapped.ERROR_CONNECTION_REFUSED: ConnectionRefusedError, _overlapped.ERROR_CONNECTION_ABORTED: ConnectionAbortedError, diff --git a/trollius/py33_winapi.py b/trollius/py33_winapi.py index 3852011..792bc45 100644 --- a/trollius/py33_winapi.py +++ b/trollius/py33_winapi.py @@ -29,7 +29,7 @@ except ImportError: from _multiprocessing import win32 import _subprocess - from asyncio import _overlapped + from trollius import _overlapped CloseHandle = win32.CloseHandle CreateNamedPipe = win32.CreateNamedPipe diff --git a/trollius/py3_ssl.py b/trollius/py3_ssl.py index 378d458..ebf21e4 100644 --- a/trollius/py3_ssl.py +++ b/trollius/py3_ssl.py @@ -10,7 +10,7 @@ Backport SSL functions and exceptions: import errno import ssl import sys -from asyncio.py33_exceptions import _wrap_error +from trollius.py33_exceptions import _wrap_error __all__ = ["SSLContext", "BACKPORT_SSL_ERRORS", "BACKPORT_SSL_CONTEXT", "SSLWantReadError", "SSLWantWriteError", "SSLEOFError", diff --git a/trollius/test_support.py b/trollius/test_support.py index 5716a03..8bb4fba 100644 --- a/trollius/test_support.py +++ b/trollius/test_support.py @@ -8,7 +8,7 @@ import socket import subprocess import sys import time -from asyncio import test_utils +from trollius import test_utils # TEST_HOME_DIR refers to the top level directory of the "test" package # that contains Python's regression test suite |