diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-04-15 12:54:54 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-07 13:57:48 +0100 |
commit | 2268bf548a2f7e06da9071b11b4c7a487859778d (patch) | |
tree | bf55b2e3ff5b457049125d6fc2625684d6f47904 /meta/recipes-devtools/python/python/0002-bpo-34818-Add-missing-closing-wrapper-in-test_tls1_3.patch | |
parent | 02dc57ea647423ffe43d42cb9d320abbc1145e28 (diff) | |
download | poky-2268bf548a2f7e06da9071b11b4c7a487859778d.tar.gz |
python: update to 2.7.16
Drop backported patches
License-update: copyright years
(From OE-Core rev: 0fec1d486a3ef663dc4bbab76e5ec0ed646f23e4)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@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.patch | 37 |
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 @@ | |||
1 | From 0e1f3856a7e1511fb64d99646c54ddf3897cd444 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dimitri John Ledkov <xnox@ubuntu.com> | ||
3 | Date: Fri, 28 Sep 2018 14:15:52 +0100 | ||
4 | Subject: [PATCH 2/4] bpo-34818: Add missing closing() wrapper in test_tls1_3. | ||
5 | |||
6 | Python 2.7 socket classes do not implement context manager protocol, | ||
7 | hence closing() is required around it. Resolves testcase error | ||
8 | traceback. | ||
9 | |||
10 | Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> | ||
11 | |||
12 | https://bugs.python.org/issue34818 | ||
13 | |||
14 | Patch taken from Ubuntu. | ||
15 | |||
16 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/9622] | ||
17 | Signed-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 | |||
22 | diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py | ||
23 | index 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 | -- | ||
36 | 2.17.1 | ||
37 | |||