[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5.
larry.hastings
python-checkins at python.org
Sun Jun 26 23:02:18 EDT 2016
https://hg.python.org/cpython/rev/9a9817458bc8
changeset: 102205:9a9817458bc8
parent: 102188:4796d7fb00c5
parent: 102204:0b3a6ca3f923
user: Larry Hastings <larry at hastings.org>
date: Sun Jun 26 20:00:51 2016 -0700
summary:
Merge from 3.5.
files:
.hgtags | 3 +++
Lib/test/test_ssl.py | 3 ++-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -147,6 +147,8 @@
04f3f725896c6961212c3a12e8ac25be6958f4fa v3.4.4rc1
737efcadf5a678b184e0fa431aae11276bf06648 v3.4.4
3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
+619b61e505d0e2ccc8516b366e4ddd1971b46a6f v3.4.5
+3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1
0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2
82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3
@@ -163,5 +165,6 @@
948ef16a69513ba1ff15c9d7d0b012b949df4c80 v3.5.1rc1
37a07cee5969e6d3672583187a73cf636ff28e1b v3.5.1
68feec6488b26327a85a634605dd28eca4daa5f1 v3.5.2rc1
+4def2a2901a5618ea45bcc8f2a1411ef33af18ad v3.5.2
5896da372fb044e38595fb74495de1e1e7c8fb3c v3.6.0a1
37889342355223e2fc1438de3dc7ffcd625c60f7 v3.6.0a2
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -844,7 +844,8 @@
self.assertEqual(ssl.OP_ALL | ssl.OP_NO_TLSv1 | ssl.OP_NO_SSLv3,
ctx.options)
ctx.options = 0
- self.assertEqual(0, ctx.options)
+ # Ubuntu has OP_NO_SSLv3 forced on by default
+ self.assertEqual(0, ctx.options & ~ssl.OP_NO_SSLv3)
else:
with self.assertRaises(ValueError):
ctx.options = 0
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list