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

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index a0a64782618bbb4b7b80778a9974dfc7eb071930..8e1c6b00912eed84f0deb481ea82531a7b0675fa 100644 (file)
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -335,6 +335,15 @@ SSLSocket Objects
    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

diff --git a/Include/pymath.h b/Include/pymath.h
index a3735c228606a258e95e6087b40e1fe12cd000b3..7cea9ae22f443ee1d7a25e8d5cf920afc97b180d 100644 (file)
--- a/Include/pymath.h
+++ b/Include/pymath.h
@@ -19,7 +19,7 @@ functions and constants
  *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

diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py
index e4bc2e8239d3f679b0124d72213930977f21161f..3e93da63238203b9ba8efff861598af37fcb8308 100755 (executable)
--- a/Lib/lib2to3/refactor.py
+++ b/Lib/lib2to3/refactor.py
@@ -177,6 +177,8 @@ class RefactoringTool(object):
         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