summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python/0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-04-15 12:54:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-16 11:10:02 +0100
commit0ee1b6d0c934944c0b6dba69e4c16d8e848b85bd (patch)
tree6d952de325df29a087789c74fc8bb4abadc69249 /meta/recipes-devtools/python/python/0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch
parent24597588d29388ab4fc9485fcf27f8b580a4f5e8 (diff)
downloadpoky-0ee1b6d0c934944c0b6dba69e4c16d8e848b85bd.tar.gz
python: update to 2.7.16
Drop backported patches License-update: copyright years (From OE-Core rev: 061dfcdf062d64e4e1e50e28edfacb14e41b7d74) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python/0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch')
-rw-r--r--meta/recipes-devtools/python/python/0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-devtools/python/python/0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch b/meta/recipes-devtools/python/python/0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch
deleted file mode 100644
index 96882712e9..0000000000
--- a/meta/recipes-devtools/python/python/0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 0e1f3856a7e1511fb64d99646c54ddf3897cd444 Mon Sep 17 00:00:00 2001
2From: Dimitri John Ledkov <xnox@ubuntu.com>
3Date: Fri, 28 Sep 2018 14:15:52 +0100
4Subject: [PATCH 2/4] bpo-34818: Add missing closing() wrapper in test_tls1_3.
5
6Python 2.7 socket classes do not implement context manager protocol,
7hence closing() is required around it. Resolves testcase error
8traceback.
9
10Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
11
12https://bugs.python.org/issue34818
13
14Patch taken from Ubuntu.
15
16Upstream-Status: Submitted [https://github.com/python/cpython/pull/9622]
17Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
18---
19 Lib/test/test_ssl.py | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
23index f51572e319..7a14053cee 100644
24--- a/Lib/test/test_ssl.py
25+++ b/Lib/test/test_ssl.py
26@@ -2817,7 +2817,7 @@ else:
27 ssl.OP_NO_TLSv1 | ssl.OP_NO_TLSv1_1 | ssl.OP_NO_TLSv1_2
28 )
29 with ThreadedEchoServer(context=context) as server:
30- with context.wrap_socket(socket.socket()) as s:
31+ with closing(context.wrap_socket(socket.socket())) as s:
32 s.connect((HOST, server.port))
33 self.assertIn(s.cipher()[0], [
34 'TLS_AES_256_GCM_SHA384',
35--
362.17.1
37