]> granicus.if.org Git - python/commitdiff
Merge fix for issue #11746
authorAntoine Pitrou <solipsis@pitrou.net>
Sun, 3 Apr 2011 16:16:50 +0000 (18:16 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sun, 3 Apr 2011 16:16:50 +0000 (18:16 +0200)
1  2 
Misc/NEWS
Modules/_ssl.c

diff --cc Misc/NEWS
index bba0f449cd33262806a2d1327f46fdffe6c6e8f0,7d817fee8adf1804eafc9f786fa4b890d79eea00..9fa8853cef6994b25a8e0eab144f5de1a647b2c2
+++ b/Misc/NEWS
@@@ -87,12 -49,9 +87,15 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #11746: Fix SSLContext.load_cert_chain() to accept elliptic curve
+   private keys.
 +- Issue #5863: Rewrite BZ2File in pure Python, and allow it to accept
 +  file-like objects using a new ``fileobj`` constructor argument.  Patch by
 +  Nadeem Vawda.
 +
 +- unittest.TestCase.assertSameElements has been removed.
 +
  - sys.getfilesystemencoding() raises a RuntimeError if initfsencoding() was not
    called yet: detect bootstrap (startup) issues earlier.
  
diff --cc Modules/_ssl.c
Simple merge