[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/205810ca5069
changeset:   93377:205810ca5069
parent:      93375:aeb1f941663f
parent:      93376:b9d9e7762783
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Nov 03 21:06:07 2014 -0500
summary:
  merge 3.4

files:
  Lib/test/test_ssl.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


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
@@ -811,7 +811,7 @@
     def test_load_cert_chain(self):
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
         # Combined key and cert in a single file
-        ctx.load_cert_chain(CERTFILE)
+        ctx.load_cert_chain(CERTFILE, keyfile=None)
         ctx.load_cert_chain(CERTFILE, keyfile=CERTFILE)
         self.assertRaises(TypeError, ctx.load_cert_chain, keyfile=CERTFILE)
         with self.assertRaises(OSError) as cm:

-- 
Repository URL: https://hg.python.org/cpython