|
|
|
@ -1,4 +1,4 @@
|
|
|
|
|
From 396972d1137e0ef27a30a4bfc36b6dd2b79c3f78 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 9b8f36d08a5bdffa83019f679a9c9d2ef5ca4302 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Aymeric Augustin <aymeric.augustin@m4x.org>
|
|
|
|
|
Date: Sun, 15 Jul 2018 11:07:47 +0200
|
|
|
|
|
Subject: [PATCH 3/3] Support yield from connect/serve on Python 3.7.
|
|
|
|
@ -10,8 +10,8 @@ Fix #435.
|
|
|
|
|
websockets/client.py | 1 +
|
|
|
|
|
websockets/py35/_test_client_server.py | 3 ++
|
|
|
|
|
websockets/server.py | 1 +
|
|
|
|
|
websockets/test_client_server.py | 40 ++++++++++++++++++++++++++
|
|
|
|
|
4 files changed, 45 insertions(+)
|
|
|
|
|
websockets/test_client_server.py | 41 ++++++++++++++++++++++++++
|
|
|
|
|
4 files changed, 46 insertions(+)
|
|
|
|
|
|
|
|
|
|
diff --git a/websockets/client.py b/websockets/client.py
|
|
|
|
|
index a86b90f..bb3009b 100644
|
|
|
|
@ -66,10 +66,18 @@ index 46c80dc..86fa700 100644
|
|
|
|
|
server = yield from self._creating_server
|
|
|
|
|
self.ws_server.wrap(server)
|
|
|
|
|
diff --git a/websockets/test_client_server.py b/websockets/test_client_server.py
|
|
|
|
|
index a3e1e92..f9f18b5 100644
|
|
|
|
|
index a3e1e92..6c25784 100644
|
|
|
|
|
--- a/websockets/test_client_server.py
|
|
|
|
|
+++ b/websockets/test_client_server.py
|
|
|
|
|
@@ -1056,6 +1056,46 @@ class ClientServerOriginTests(unittest.TestCase):
|
|
|
|
|
@@ -24,6 +24,7 @@ from .extensions.permessage_deflate import (
|
|
|
|
|
)
|
|
|
|
|
from .handshake import build_response
|
|
|
|
|
from .http import USER_AGENT, read_response
|
|
|
|
|
+from .protocol import State
|
|
|
|
|
from .server import *
|
|
|
|
|
from .test_protocol import MS
|
|
|
|
|
|
|
|
|
|
@@ -1056,6 +1057,46 @@ class ClientServerOriginTests(unittest.TestCase):
|
|
|
|
|
self.loop.run_until_complete(server.wait_closed())
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|