[Python-checkins] r80560 - in python/branches/release31-maint: Lib/test/test_ssl.py Misc/ACKS

antoine.pitrou python-checkins at python.org
Wed Apr 28 00:09:05 CEST 2010


Author: antoine.pitrou
Date: Wed Apr 28 00:09:05 2010
New Revision: 80560

Log:
Merged revisions 80559 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80559 | antoine.pitrou | 2010-04-28 00:08:08 +0200 (mer., 28 avril 2010) | 12 lines
  
  Merged revisions 80557 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  (the bug was already fixed in py3k, just merging in the tests)
  
  ........
    r80557 | antoine.pitrou | 2010-04-28 00:03:37 +0200 (mer., 28 avril 2010) | 4 lines
    
    Issue #8086: In :func:`ssl.DER_cert_to_PEM_cert()`, fix missing newline
    before the certificate footer.  Patch by Kyle VanderBeek.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/test/test_ssl.py
   python/branches/release31-maint/Misc/ACKS

Modified: python/branches/release31-maint/Lib/test/test_ssl.py
==============================================================================
--- python/branches/release31-maint/Lib/test/test_ssl.py	(original)
+++ python/branches/release31-maint/Lib/test/test_ssl.py	Wed Apr 28 00:09:05 2010
@@ -98,6 +98,10 @@
         p2 = ssl.DER_cert_to_PEM_cert(d1)
         d2 = ssl.PEM_cert_to_DER_cert(p2)
         self.assertEqual(d1, d2)
+        if not p2.startswith(ssl.PEM_HEADER + '\n'):
+            self.fail("DER-to-PEM didn't include correct header:\n%r\n" % p2)
+        if not p2.endswith('\n' + ssl.PEM_FOOTER + '\n'):
+            self.fail("DER-to-PEM didn't include correct footer:\n%r\n" % p2)
 
     @support.cpython_only
     def test_refcycle(self):

Modified: python/branches/release31-maint/Misc/ACKS
==============================================================================
--- python/branches/release31-maint/Misc/ACKS	(original)
+++ python/branches/release31-maint/Misc/ACKS	Wed Apr 28 00:09:05 2010
@@ -766,6 +766,7 @@
 Michael Urman
 Hector Urtubia
 Andi Vajda
+Kyle VanderBeek
 Atul Varma
 Dmitry Vasiliev
 Alexandre Vassalotti


More information about the Python-checkins mailing list