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.
  ........
................

diff --git a/Misc/ACKS b/Misc/ACKS
index 410158aa409576e3134493c8190cb94a1864703c..b8d1dee65ead9a7f2e7f8fdba373fb63257ddc81 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -605,6 +605,7 @@ Anders Qvist
 Burton Radons
 Brodie Rao
 Antti Rasinen
+Sridhar Ratnakumar
 Eric Raymond
 Edward K. Ream
 Chris Rebert

diff --git a/Misc/NEWS b/Misc/NEWS
index 9040939989e268e7a9397ddae7a8e4af7ba6d8b5..873f86a480c70f3a2f18ddb1baf5ad1c9b287d70 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,9 @@ Core and Builtins
 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()

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index c21ac5d380a9931899f680f8ea6f7ddde62c4e6c..8b21abf25dd18e017955407c169a5d48c276760f 100644 (file)
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -66,7 +66,7 @@ enum py_ssl_version {
        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 */