[Python-checkins] r80543 - in python/branches/release31-maint: Misc/ACKS Misc/NEWS Modules/_ssl.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Tue Apr 27 21:18:34 2010
New Revision: 80543

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

................
  r80542 | antoine.pitrou | 2010-04-27 21:14:15 +0200 (mar., 27 avril 2010) | 10 lines
  
  Merged revisions 80540 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r80540 | antoine.pitrou | 2010-04-27 21:09:59 +0200 (mar., 27 avril 2010) | 4 lines
    
    Issue #8549: Fix compiling the _ssl extension under AIX.  Patch by
    Sridhar Ratnakumar.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/ACKS
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Modules/_ssl.c

Modified: python/branches/release31-maint/Misc/ACKS
==============================================================================
--- python/branches/release31-maint/Misc/ACKS	(original)
+++ python/branches/release31-maint/Misc/ACKS	Tue Apr 27 21:18:34 2010
@@ -605,6 +605,7 @@
 Burton Radons
 Brodie Rao
 Antti Rasinen
+Sridhar Ratnakumar
 Eric Raymond
 Edward K. Ream
 Chris Rebert

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Tue Apr 27 21:18:34 2010
@@ -40,6 +40,9 @@
 Library
 -------
 
+- Issue #8549: Fix compiling the _ssl extension under AIX.  Patch by
+  Sridhar Ratnakumar.
+
 - Issue #8391: os.execvpe() and os.getenv() supports unicode with surrogates
   and bytes strings for environment keys and values, and use
   sys.getfilesystemencoding() instead of sys.getdefautltencoding()

Modified: python/branches/release31-maint/Modules/_ssl.c
==============================================================================
--- python/branches/release31-maint/Modules/_ssl.c	(original)
+++ python/branches/release31-maint/Modules/_ssl.c	Tue Apr 27 21:18:34 2010
@@ -66,7 +66,7 @@
 	PY_SSL_VERSION_SSL2,
 	PY_SSL_VERSION_SSL3,
 	PY_SSL_VERSION_SSL23,
-	PY_SSL_VERSION_TLS1,
+	PY_SSL_VERSION_TLS1
 };
 
 /* Include symbols from _socket module */