[Python-3000-checkins] r65884 - in python/branches/py3k: Doc/library/ssl.rst Include/pymath.h Lib/lib2to3 Lib/lib2to3/refactor.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Tue Aug 19 23:42:13 2008
New Revision: 65884

Log:
Merged revisions 65658,65869,65882 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r65658 | bill.janssen | 2008-08-12 12:09:57 -0500 (Tue, 12 Aug 2008) | 1 line
  
  update ssl documentation
................
  r65869 | benjamin.peterson | 2008-08-19 14:27:53 -0500 (Tue, 19 Aug 2008) | 1 line
  
  fix a little typo
................
  r65882 | benjamin.peterson | 2008-08-19 16:07:15 -0500 (Tue, 19 Aug 2008) | 9 lines
  
  Merged revisions 65876 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  
  ........
    r65876 | benjamin.peterson | 2008-08-19 15:54:52 -0500 (Tue, 19 Aug 2008) | 1 line
    
    apply a fix I think will help Windows
  ........
................


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/ssl.rst
   python/branches/py3k/Include/pymath.h
   python/branches/py3k/Lib/lib2to3/   (props changed)
   python/branches/py3k/Lib/lib2to3/refactor.py

Modified: python/branches/py3k/Doc/library/ssl.rst
==============================================================================
--- python/branches/py3k/Doc/library/ssl.rst	(original)
+++ python/branches/py3k/Doc/library/ssl.rst	Tue Aug 19 23:42:13 2008
@@ -335,6 +335,15 @@
    established, returns ``None``.
 
 
+.. method:: SSLSocket.unwrap()
+
+   Performs the SSL shutdown handshake, which removes the TLS layer
+   from the underlying socket, and returns the underlying socket
+   object.  This can be used to go from encrypted operation over a
+   connection to unencrypted.  The returned socket should always be
+   used for further communication with the other side of the
+   connection, rather than the original socket
+
 .. index:: single: certificates
 
 .. index:: single: X509 certificate

Modified: python/branches/py3k/Include/pymath.h
==============================================================================
--- python/branches/py3k/Include/pymath.h	(original)
+++ python/branches/py3k/Include/pymath.h	Tue Aug 19 23:42:13 2008
@@ -19,7 +19,7 @@
  *Note: PC/pyconfig.h defines copysign as _copysign
  */
 #ifndef HAVE_COPYSIGN
-extern double copysign(doube, double);
+extern double copysign(double, double);
 #endif
 
 #ifndef HAVE_ACOSH

Modified: python/branches/py3k/Lib/lib2to3/refactor.py
==============================================================================
--- python/branches/py3k/Lib/lib2to3/refactor.py	(original)
+++ python/branches/py3k/Lib/lib2to3/refactor.py	Tue Aug 19 23:42:13 2008
@@ -177,6 +177,8 @@
         else:
             fixer_pkg = self.fixer_dir
         fixer_pkg = fixer_pkg.replace(os.path.sep, ".")
+        if os.path.altsep:
+            fixer_pkg = self.fixer_dir.replace(os.path.altsep, ".")
         pre_order_fixers = []
         post_order_fixers = []
         fix_names = self.options.fix