summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikolay Kim <fafhrd91@gmail.com>2013-03-22 18:52:57 -0700
committerNikolay Kim <fafhrd91@gmail.com>2013-03-22 18:52:57 -0700
commitfac8dea17f4eeb283acd51aab9175f9e196707c9 (patch)
tree09555b7d166dc1f39b3bb1a4adfe6391a541a343
parentbbd7ec1ca73e2ade65cafc1c6eda82566def028e (diff)
downloadtrollius-fac8dea17f4eeb283acd51aab9175f9e196707c9.tar.gz
better name
-rw-r--r--examples/udp_echo.py4
-rw-r--r--tests/events_test.py67
-rw-r--r--tulip/base_events.py6
-rw-r--r--tulip/events.py6
4 files changed, 45 insertions, 38 deletions
diff --git a/examples/udp_echo.py b/examples/udp_echo.py
index 1597812..9e995d1 100644
--- a/examples/udp_echo.py
+++ b/examples/udp_echo.py
@@ -54,14 +54,14 @@ class MyClientUdpEchoProtocol:
def start_server():
loop = tulip.get_event_loop()
- tulip.Task(loop.create_datagram_connection(
+ tulip.Task(loop.create_datagram_endpoint(
MyServerUdpEchoProtocol, local_addr=ADDRESS))
loop.run_forever()
def start_client():
loop = tulip.get_event_loop()
- tulip.Task(loop.create_datagram_connection(
+ tulip.Task(loop.create_datagram_endpoint(
MyClientUdpEchoProtocol, remote_addr=ADDRESS))
loop.run_forever()
diff --git a/tests/events_test.py b/tests/events_test.py
index 0150724..dcfd36c 100644
--- a/tests/events_test.py
+++ b/tests/events_test.py
@@ -779,41 +779,41 @@ class EventLoopTestsMixin:
self.assertTrue(m_sock.close.called)
@unittest.mock.patch('tulip.base_events.socket')
- def test_create_datagram_connection_no_addrinfo(self, m_socket):
+ def test_create_datagram_endpoint_no_addrinfo(self, m_socket):
self.suppress_log_errors()
m_socket.error = socket.error
m_socket.getaddrinfo.return_value = []
- coro = self.event_loop.create_datagram_connection(
+ coro = self.event_loop.create_datagram_endpoint(
MyDatagramProto, local_addr=('localhost', 0))
self.assertRaises(
socket.error, self.event_loop.run_until_complete, coro)
- def test_create_datagram_connection_addr_error(self):
+ def test_create_datagram_endpoint_addr_error(self):
self.suppress_log_errors()
- coro = self.event_loop.create_datagram_connection(
+ coro = self.event_loop.create_datagram_endpoint(
MyDatagramProto, local_addr='localhost')
self.assertRaises(
AssertionError, self.event_loop.run_until_complete, coro)
- coro = self.event_loop.create_datagram_connection(
+ coro = self.event_loop.create_datagram_endpoint(
MyDatagramProto, local_addr=('localhost', 1, 2, 3))
self.assertRaises(
AssertionError, self.event_loop.run_until_complete, coro)
- def test_create_datagram_connection(self):
+ def test_create_datagram_endpoint(self):
class TestMyDatagramProto(MyDatagramProto):
def datagram_received(self, data, addr):
super().datagram_received(data, addr)
self.transport.sendto(b'resp:'+data, addr)
- coro = self.event_loop.create_datagram_connection(
+ coro = self.event_loop.create_datagram_endpoint(
TestMyDatagramProto, local_addr=('127.0.0.1', 0))
s_transport, server = self.event_loop.run_until_complete(coro)
host, port = s_transport.get_extra_info('addr')
- coro = self.event_loop.create_datagram_connection(
+ coro = self.event_loop.create_datagram_endpoint(
MyDatagramProto, remote_addr=(host, port))
transport, client = self.event_loop.run_until_complete(coro)
@@ -837,66 +837,66 @@ class EventLoopTestsMixin:
self.assertEqual('CLOSED', client.state)
server.transport.close()
- def test_create_datagram_connection_connect_err(self):
+ def test_create_datagram_endpoint_connect_err(self):
self.suppress_log_errors()
self.event_loop.sock_connect = unittest.mock.Mock()
self.event_loop.sock_connect.side_effect = socket.error
- coro = self.event_loop.create_datagram_connection(
+ coro = self.event_loop.create_datagram_endpoint(
protocols.DatagramProtocol, remote_addr=('127.0.0.1', 0))
self.assertRaises(
socket.error, self.event_loop.run_until_complete, coro)
@unittest.mock.patch('tulip.base_events.socket')
- def test_create_datagram_connection_socket_err(self, m_socket):
+ def test_create_datagram_endpoint_socket_err(self, m_socket):
self.suppress_log_errors()
m_socket.error = socket.error
m_socket.getaddrinfo = socket.getaddrinfo
m_socket.socket.side_effect = socket.error
- coro = self.event_loop.create_datagram_connection(
+ coro = self.event_loop.create_datagram_endpoint(
protocols.DatagramProtocol, family=socket.AF_INET)
self.assertRaises(
socket.error, self.event_loop.run_until_complete, coro)
- coro = self.event_loop.create_datagram_connection(
+ coro = self.event_loop.create_datagram_endpoint(
protocols.DatagramProtocol, local_addr=('127.0.0.1', 0))
self.assertRaises(
socket.error, self.event_loop.run_until_complete, coro)
- def test_create_datagram_connection_no_matching_family(self):
+ def test_create_datagram_endpoint_no_matching_family(self):
self.suppress_log_errors()
- coro = self.event_loop.create_datagram_connection(
+ coro = self.event_loop.create_datagram_endpoint(
protocols.DatagramProtocol,
remote_addr=('127.0.0.1', 0), local_addr=('::1', 0))
self.assertRaises(
ValueError, self.event_loop.run_until_complete, coro)
@unittest.mock.patch('tulip.base_events.socket')
- def test_create_datagram_connection_setblk_err(self, m_socket):
+ def test_create_datagram_endpoint_setblk_err(self, m_socket):
self.suppress_log_errors()
m_socket.error = socket.error
m_socket.socket.return_value.setblocking.side_effect = socket.error
- coro = self.event_loop.create_datagram_connection(
+ coro = self.event_loop.create_datagram_endpoint(
protocols.DatagramProtocol, family=socket.AF_INET)
self.assertRaises(
socket.error, self.event_loop.run_until_complete, coro)
self.assertTrue(
m_socket.socket.return_value.close.called)
- def test_create_datagram_connection_noaddr_nofamily(self):
+ def test_create_datagram_endpoint_noaddr_nofamily(self):
self.suppress_log_errors()
- coro = self.event_loop.create_datagram_connection(
+ coro = self.event_loop.create_datagram_endpoint(
protocols.DatagramProtocol)
self.assertRaises(ValueError, self.event_loop.run_until_complete, coro)
@unittest.mock.patch('tulip.base_events.socket')
- def test_create_datagram_connection_cant_bind(self, m_socket):
+ def test_create_datagram_endpoint_cant_bind(self, m_socket):
self.suppress_log_errors()
class Err(socket.error):
@@ -908,7 +908,7 @@ class EventLoopTestsMixin:
m_sock = m_socket.socket.return_value = unittest.mock.Mock()
m_sock.bind.side_effect = Err
- fut = self.event_loop.create_datagram_connection(
+ fut = self.event_loop.create_datagram_endpoint(
MyDatagramProto,
local_addr=('127.0.0.1', 0), family=socket.AF_INET)
self.assertRaises(Err, self.event_loop.run_until_complete, fut)
@@ -1064,17 +1064,24 @@ if sys.platform == 'win32':
def test_accept_connection_exception(self):
raise unittest.SkipTest(
"IocpEventLoop does not have _accept_connection()")
- def test_create_datagram_connection(self):
+ def test_create_datagram_endpoint(self):
raise unittest.SkipTest(
- "IocpEventLoop does not have create_datagram_connection()")
- def test_create_datagram_connection_no_connection(self):
+ "IocpEventLoop does not have create_datagram_endpoint()")
+ def test_create_datagram_endpoint_no_connection(self):
raise unittest.SkipTest(
- "IocpEventLoop does not have "
- "create_datagram_connection_no_connection()")
- def test_create_datagram_connection_cant_bind(self):
+ "IocpEventLoop does not have create_datagram_endpoint()")
+ def test_create_datagram_endpoint_cant_bind(self):
raise unittest.SkipTest(
- "IocpEventLoop does not have start_serving_udp()")
-
+ "IocpEventLoop does not have create_datagram_endpoint()")
+ def test_create_datagram_endpoint_noaddr_nofamily(self):
+ raise unittest.SkipTest(
+ "IocpEventLoop does not have create_datagram_endpoint()")
+ def test_create_datagram_endpoint_socket_err(self):
+ raise unittest.SkipTest(
+ "IocpEventLoop does not have create_datagram_endpoint()")
+ def test_create_datagram_endpoint_connect_err(self):
+ raise unittest.SkipTest(
+ "IocpEventLoop does not have create_datagram_endpoint()")
else:
from tulip import selectors
from tulip import unix_events
@@ -1243,7 +1250,7 @@ class AbstractEventLoopTests(unittest.TestCase):
self.assertRaises(
NotImplementedError, ev_loop.start_serving, f)
self.assertRaises(
- NotImplementedError, ev_loop.create_datagram_connection, f)
+ NotImplementedError, ev_loop.create_datagram_endpoint, f)
self.assertRaises(
NotImplementedError, ev_loop.add_reader, 1, f)
self.assertRaises(
diff --git a/tulip/base_events.py b/tulip/base_events.py
index 8c05c34..46cab27 100644
--- a/tulip/base_events.py
+++ b/tulip/base_events.py
@@ -339,9 +339,9 @@ class BaseEventLoop(events.AbstractEventLoop):
return transport, protocol
@tasks.coroutine
- def create_datagram_connection(self, protocol_factory,
- local_addr=None, remote_addr=None, *,
- family=0, proto=0, flags=0):
+ def create_datagram_endpoint(self, protocol_factory,
+ local_addr=None, remote_addr=None, *,
+ family=0, proto=0, flags=0):
"""Create datagram connection."""
if not (local_addr or remote_addr):
if family == 0:
diff --git a/tulip/events.py b/tulip/events.py
index f6a8352..ba9a50f 100644
--- a/tulip/events.py
+++ b/tulip/events.py
@@ -184,9 +184,9 @@ class AbstractEventLoop:
family=0, proto=0, flags=0, sock=None):
raise NotImplementedError
- def create_datagram_connection(self, protocol,
- local_addr=None, remote_addr=None, *,
- family=0, proto=0, flags=0):
+ def create_datagram_endpoint(self, protocol_factory,
+ local_addr=None, remote_addr=None, *,
+ family=0, proto=0, flags=0):
raise NotImplementedError
def connect_read_pipe(self, protocol_factory, pipe):