mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-25 19:03:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 65658,65869,65882 via svnmerge from

Browse Source 
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
  ........
................
This commit is contained in:
Benjamin Peterson 2008-08-19 21:42:13 +00:00
parent 949d47dc7a
commit 4aeec04624
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Doc/library/ssl.rst
View File

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

2
Include/pymath.h
View File

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

2
Lib/lib2to3/refactor.py
View File

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