0
0
mirror of https://github.com/python/cpython.git synced 2024-11-24 08:52:25 +01:00
Commit Graph

84532 Commits

Author SHA1 Message Date
Charles-François Natali
1d29cc5b6c Issue #21040: socketserver: Use the selectors module. 2014-03-24 22:25:39 +00:00
Victor Stinner
e3fb80fb76 (Merge 3.4) Issue #21036: Fix typo in macro name
_PY_HASHTABLE_ENTRY_DATA => _Py_HASHTABLE_ENTRY_DATA
2014-03-24 22:36:01 +01:00
Victor Stinner
d9a7352348 Issue #21036: Fix typo in macro name
_PY_HASHTABLE_ENTRY_DATA => _Py_HASHTABLE_ENTRY_DATA
2014-03-24 22:34:34 +01:00
Georg Brandl
77605cb937 merge with 3.4 2014-03-24 09:06:33 +01:00
Georg Brandl
df48b97855 Fix a few scoping issues with versionadded/versionchanged directives. 2014-03-24 09:06:18 +01:00
Georg Brandl
29636aeacc Use deprecated-removed directive, clean up a few markup issues around
deprecated directives.
2014-03-24 08:42:37 +01:00
Zachary Ware
14017b2a53 Merge with 3.4 2014-03-23 22:22:12 -05:00
Zachary Ware
645d3b7655 Remove superfluous open parenthesis. Noticed by cocoatomo on docs@. 2014-03-23 22:21:38 -05:00
Donald Stufft
17dcf7531c Merge the patch for issue #21013 into default 2014-03-23 19:12:13 -04:00
Donald Stufft
6a2ba94908 Issue #21013: Enhance ssl.create_default_context() for server side contexts
Closes #21013 by modfying ssl.create_default_context() to:

* Move the restricted ciphers to only apply when using
  ssl.Purpose.CLIENT_AUTH. The major difference between restricted and not
  is the lack of RC4 in the restricted. However there are servers that exist
  that only expose RC4 still.
* Switches the default protocol to ssl.PROTOCOL_SSLv23 so that the context
  will select TLS1.1 or TLS1.2 if it is available.
* Add ssl.OP_NO_SSLv3 by default to continue to block SSL3.0 sockets
* Add ssl.OP_SINGLE_DH_USE and ssl.OP_SINGLE_ECDG_USE to improve the security
  of the perfect forward secrecy
* Add ssl.OP_CIPHER_SERVER_PREFERENCE so that when used for a server side
  socket the context will prioritize our ciphers which have been carefully
  selected to maximize security and performance.
* Documents the failure conditions when a SSL3.0 connection is required so
  that end users can more easily determine if they need to unset
  ssl.OP_NO_SSLv3.
2014-03-23 19:05:28 -04:00
Georg Brandl
60fa3533eb merge with 3.4 2014-03-23 23:04:45 +01:00
Georg Brandl
553e108fce tutorial: no "linux2" sys.platform on 3.x (thanks Arfrever) 2014-03-23 23:03:59 +01:00
Antoine Pitrou
08eae43e2a Issue #19537: Fix PyUnicode_DATA() alignment under m68k. Patch by Andreas Schwab. 2014-03-23 22:55:40 +01:00
Antoine Pitrou
8c6f8dc527 Issue #19537: Fix PyUnicode_DATA() alignment under m68k. Patch by Andreas Schwab. 2014-03-23 22:55:03 +01:00
R David Murray
e1b6f97dae #20145: assert[Raises|Warns]Regex now raise TypeError on bad regex.
Previously a non-string, non-regex second argument could cause the test
to always pass.

Initial patch by Kamilla Holanda.
2014-03-23 15:08:43 -04:00
Richard Oudkerk
91e7f04fc5 Merge 3.4. 2014-03-23 18:53:53 +00:00
Richard Oudkerk
99d8dd2489 Issue #20990: Correction for 619331c67638. 2014-03-23 18:44:11 +00:00
R David Murray
2791e0d4e3 Merge #20976: remove unneeded quopri import in email.utils. 2014-03-23 14:24:44 -04:00
R David Murray
95a8dfb924 #20976: remove unneeded quopri import in email.utils. 2014-03-23 14:18:44 -04:00
Antoine Pitrou
211e6d5908 Issue #20913: make it clear that create_default_context() also enables hostname checking 2014-03-23 16:31:34 +01:00
Antoine Pitrou
f8cbbbb652 Issue #20913: make it clear that create_default_context() also enables hostname checking 2014-03-23 16:31:08 +01:00
Richard Oudkerk
1811687122 Merge 3.4. 2014-03-23 12:53:48 +00:00
Richard Oudkerk
c346060440 Merge 3.3. 2014-03-23 12:52:16 +00:00
Richard Oudkerk
3e952d56ea Issue #20633: Replace relative import by absolute import. 2014-03-23 12:42:28 +00:00
Richard Oudkerk
af2bdbe4f8 Merge 3.4. 2014-03-23 12:32:12 +00:00
Richard Oudkerk
80a5be1d84 Issue #20980: Stop wrapping exception when using ThreadPool. 2014-03-23 12:30:54 +00:00
Richard Oudkerk
bd153de4a4 Merge 3.4. 2014-03-23 11:57:01 +00:00
Richard Oudkerk
a40675a1a2 Issue #20990: Fix issues found by pyflakes for multiprocessing. 2014-03-23 11:54:15 +00:00
Georg Brandl
3fa7ea1348 merge with 3.4 2014-03-22 20:39:08 +01:00
Georg Brandl
75c5ab49ed Closes #20975: make date in the interpreter banner a little more consistent 2014-03-22 20:38:11 +01:00
Antoine Pitrou
0a0a9ade4f Issue #20913: improve the SSL security considerations to first advocate using create_default_context(). 2014-03-22 18:19:36 +01:00
Antoine Pitrou
c5e075ff03 Issue #20913: improve the SSL security considerations to first advocate using create_default_context(). 2014-03-22 18:19:11 +01:00
Antoine Pitrou
39b7fce82d Issue #21015: SSL contexts will now automatically select an elliptic curve for ECDH key exchange on OpenSSL 1.0.2 and later, and otherwise default to "prime256v1".
(should also fix a buildbot failure introduced by #20995)
2014-03-22 18:14:57 +01:00
Antoine Pitrou
0bebbc33fa Issue #21015: SSL contexts will now automatically select an elliptic curve for ECDH key exchange on OpenSSL 1.0.2 and later, and otherwise default to "prime256v1".
(should also fix a buildbot failure introduced by #20995)
2014-03-22 18:13:50 +01:00
Zachary Ware
92497a42b7 Issue #21017: Enable Tix debug build on Windows 2014-03-22 10:37:06 -05:00
Zachary Ware
4bcf5a52ae Issue #15968: Temporarily revert change to PCbuild/rt.bat
to prevent buildbot failures on test_idle.  This change
should go back in once #20035 is fixed.
2014-03-22 00:36:25 -05:00
Benjamin Peterson
940e207412 improve the command-line interface of json.tool (closes #21000)
A patch from Berker Peksag.
2014-03-21 23:17:29 -05:00
Zachary Ware
a191b91a43 Issue #15968: Incorporated Tcl, Tk, and Tix builds into the Windows build
solution.

Currently, Tix is not built in Debug configuration.

This change also:
- simplifies some Tcl/Tk-related msbuild properties for _tkinter
- copies the Tcl and Tk DLLs into the build output directory, meaning
  they will always be available after a build without having to copy
  them manually or change PATH
- removes PCbuild/build_tkinter.py: the solution does the build without
  needing to invoke Python (so Tcl/Tk/Tix can be built in parallel with
  the rest of the build using the `/m` msbuild command line switch)
- removes an outdated README concerning building Tcl/Tk on AMD64
2014-03-21 22:58:19 -05:00
Donald Stufft
04ea84a20d Fix an incomplete merge of Misc/NEWS 2014-03-21 21:49:38 -04:00
Donald Stufft
71b4192e15 Merge changes from 3.4 to bring in fixes for Issue #20995 2014-03-21 21:38:50 -04:00
Donald Stufft
79ccaa2cad Issue #20995: Enhance default ciphers used by the ssl module
Closes #20995 by Enabling better security by prioritizing ciphers
such that:

* Prefer cipher suites that offer perfect forward secrecy (DHE/ECDHE)
* Prefer ECDHE over DHE for better performance
* Prefer any AES-GCM over any AES-CBC for better performance and security
* Then Use HIGH cipher suites as a fallback
* Then Use 3DES as fallback which is secure but slow
* Finally use RC4 as a fallback which is problematic but needed for
  compatibility some times.
* Disable NULL authentication, NULL encryption, and MD5 MACs for security
  reasons
2014-03-21 21:33:34 -04:00
Victor Stinner
068281addd (Merge 3.4) Close #21010: Fix typo in asyncio doc. Patch written by Claudiu
Popa.
2014-03-21 17:17:28 +01:00
Victor Stinner
51f3129ba2 Close #21010: Fix typo in asyncio doc. Patch written by Claudiu Popa. 2014-03-21 17:17:15 +01:00
Victor Stinner
6e643edfe7 Null merge (I transplated 2 commits from default to 3.4) 2014-03-21 17:16:10 +01:00
Brett Cannon
33a4000374 Issue #20627: xmlrpc.client.ServerProxy is now a context manager.
Patch by Claudiu Popa.
2014-03-21 11:24:40 -04:00
Brett Cannon
051f37d2e7 merge 2014-03-21 11:03:07 -04:00
Brett Cannon
46f484ee4e merge 2014-03-21 11:02:10 -04:00
Brett Cannon
5d8a2444bf Merge for issue #20884 2014-03-21 11:01:02 -04:00
Brett Cannon
a00c2407ca Issue #20884: Don't assume in importlib.__init__ that __file__ is
defined.
2014-03-21 10:58:33 -04:00
Brett Cannon
a77d0c36e5 Issue #19165: The formatter module graduates to full deprecation. 2014-03-21 10:52:33 -04:00