rpms/python-websockets
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix wrong cherry-pick

Browse Source 
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2018-07-16 14:14:35 +02:00
parent ca6410a3b0
commit 51f4a5d5df
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-Add-support-for-Python-3.7.patch
View File

@ -1,4 +1,4 @@
From ab9c33d7f6e8c7728e2d30c479840ca9d880a270 Mon Sep 17 00:00:00 2001 From 2b83e7ccc12af9fec136e9f4897e1585b3b931aa Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org> From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Thu, 24 May 2018 22:29:12 +0200 Date: Thu, 24 May 2018 22:29:12 +0200
Subject: [PATCH 1/3] Add support for Python 3.7. Subject: [PATCH 1/3] Add support for Python 3.7.

2
0002-Replace-conditional-errors-with-version-checks.patch
View File

@ -1,4 +1,4 @@
From 69e8dd1e6daee31dc1e068e96918daf5565cd052 Mon Sep 17 00:00:00 2001 From 5ec12cf82b3cd0101d00dd762eb883ddc9f9c96c Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org> From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Tue, 5 Jun 2018 22:08:55 +0200 Date: Tue, 5 Jun 2018 22:08:55 +0200
Subject: [PATCH 2/3] Replace conditional errors with version checks. Subject: [PATCH 2/3] Replace conditional errors with version checks.

18
0003-Support-yield-from-connect-serve-on-Python-3.7.patch
View File

@ -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> From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun, 15 Jul 2018 11:07:47 +0200 Date: Sun, 15 Jul 2018 11:07:47 +0200
Subject: [PATCH 3/3] Support yield from connect/serve on Python 3.7. Subject: [PATCH 3/3] Support yield from connect/serve on Python 3.7.
@ -10,8 +10,8 @@ Fix #435.
websockets/client.py | 1 + websockets/client.py | 1 +
websockets/py35/_test_client_server.py | 3 ++ websockets/py35/_test_client_server.py | 3 ++
websockets/server.py | 1 + websockets/server.py | 1 +
websockets/test_client_server.py | 40 ++++++++++++++++++++++++++ websockets/test_client_server.py | 41 ++++++++++++++++++++++++++
4 files changed, 45 insertions(+) 4 files changed, 46 insertions(+)
diff --git a/websockets/client.py b/websockets/client.py diff --git a/websockets/client.py b/websockets/client.py
index a86b90f..bb3009b 100644 index a86b90f..bb3009b 100644
@ -66,10 +66,18 @@ index 46c80dc..86fa700 100644
server = yield from self._creating_server server = yield from self._creating_server
self.ws_server.wrap(server) self.ws_server.wrap(server)
diff --git a/websockets/test_client_server.py b/websockets/test_client_server.py 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 --- a/websockets/test_client_server.py
+++ b/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()) self.loop.run_until_complete(server.wait_closed())