diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-04-15 12:54:54 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-16 11:10:02 +0100 |
commit | 0ee1b6d0c934944c0b6dba69e4c16d8e848b85bd (patch) | |
tree | 6d952de325df29a087789c74fc8bb4abadc69249 /meta/recipes-devtools/python/python/0003-bpo-34834-Fix-test_ssl.test_options-to-account-for-O.patch | |
parent | 24597588d29388ab4fc9485fcf27f8b580a4f5e8 (diff) | |
download | poky-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/0003-bpo-34834-Fix-test_ssl.test_options-to-account-for-O.patch')
-rw-r--r-- | meta/recipes-devtools/python/python/0003-bpo-34834-Fix-test_ssl.test_options-to-account-for-O.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-devtools/python/python/0003-bpo-34834-Fix-test_ssl.test_options-to-account-for-O.patch b/meta/recipes-devtools/python/python/0003-bpo-34834-Fix-test_ssl.test_options-to-account-for-O.patch deleted file mode 100644 index 77016cb430..0000000000 --- a/meta/recipes-devtools/python/python/0003-bpo-34834-Fix-test_ssl.test_options-to-account-for-O.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From 8b06d56d26eee289fec22b9b72ab4c7cc3d6c482 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dimitri John Ledkov <xnox@ubuntu.com> | ||
3 | Date: Fri, 28 Sep 2018 16:34:16 +0100 | ||
4 | Subject: [PATCH 3/4] bpo-34834: Fix test_ssl.test_options to account for | ||
5 | OP_ENABLE_MIDDLEBOX_COMPAT. | ||
6 | |||
7 | Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com> | ||
8 | |||
9 | https://bugs.python.org/issue34834 | ||
10 | |||
11 | Patch taken from Ubuntu. | ||
12 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/9624] | ||
13 | |||
14 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
15 | --- | ||
16 | Lib/test/test_ssl.py | 5 +++++ | ||
17 | 1 file changed, 5 insertions(+) | ||
18 | |||
19 | diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py | ||
20 | index 7a14053cee..efc906a5ba 100644 | ||
21 | --- a/Lib/test/test_ssl.py | ||
22 | +++ b/Lib/test/test_ssl.py | ||
23 | @@ -777,6 +777,11 @@ class ContextTests(unittest.TestCase): | ||
24 | default = (ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3) | ||
25 | if not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 0): | ||
26 | default |= ssl.OP_NO_COMPRESSION | ||
27 | + if not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 1): | ||
28 | + # define MIDDLEBOX constant, as python2.7 does not know about it | ||
29 | + # but it is used by default. | ||
30 | + OP_ENABLE_MIDDLEBOX_COMPAT = 1048576L | ||
31 | + default |= OP_ENABLE_MIDDLEBOX_COMPAT | ||
32 | self.assertEqual(default, ctx.options) | ||
33 | ctx.options |= ssl.OP_NO_TLSv1 | ||
34 | self.assertEqual(default | ssl.OP_NO_TLSv1, ctx.options) | ||
35 | -- | ||
36 | 2.17.1 | ||
37 | |||