Commit graph

101860 commits

Author SHA1 Message Date
R David Murray
b0e6951193 Merge #20145 backport: delete whatsnew entry. 2014-03-25 15:34:17 -04:00
R David Murray
ef1c26798c backport: #20145: assert[Raises|Warns]Regex now raise TypeError on bad regex.
Previously a non-string, non-regex second argument and missing callable
argument could cause the test to appear to always pass.

Initial patch by Kamilla Holanda.
2014-03-25 15:31:50 -04:00
Victor Stinner
1db91ebcd1 (Merge 3.4) Issue #21058: fix typo in a comment. Patch written by Vajrasky Kok. 2014-03-25 18:19:49 +01:00
Victor Stinner
87d13ea56d Issue #21058: fix typo in a comment. Patch written by Vajrasky Kok. 2014-03-25 18:19:17 +01:00
Victor Stinner
ea7db8c78a Merge 3.4 2014-03-25 12:51:08 +01:00
Victor Stinner
b60ac7acfb Issue #21038: Use monotonic clock to compute timeout, not the system clock 2014-03-25 12:50:50 +01:00
Victor Stinner
6f20b7c473 Issue #21038: Cleanup test_epoll.py
Remove useless test and unused variables. Initial patch by Andreas Schwab.
2014-03-25 12:49:53 +01:00
Victor Stinner
0ad0bfabf8 (Merge 3.4) Issue #12209: Minor edits to faulthandler doc. Patch written by
Éric Araujo.
2014-03-25 12:34:17 +01:00
Victor Stinner
215ad66405 Issue #12209: Minor edits to faulthandler doc. Patch written by Éric Araujo. 2014-03-25 12:33:56 +01:00
Vinay Sajip
6d457287eb Merged documentation update from 3.4. 2014-03-25 11:22:24 +00:00
Vinay Sajip
4908910ab7 Updated external link in documentation. 2014-03-25 11:21:41 +00:00
Georg Brandl
b50f8c9c0d merge with 3.4 2014-03-25 10:13:44 +01:00
Georg Brandl
1afe2af690 Closes #21045: make the Qt help build not look completely stupid 2014-03-25 10:12:47 +01:00
Victor Stinner
acb6c0491c (Merge 3.4) Issue #21006: asyncio doc: reorganize subprocess doc 2014-03-25 09:40:39 +01:00
Victor Stinner
984600fba7 Issue #21006: asyncio doc: reorganize subprocess doc 2014-03-25 09:40:26 +01:00
Georg Brandl
0d046e2a21 merge with 3.4 2014-03-25 09:34:55 +01:00
Georg Brandl
1c669c1154 Closes #18456: Doc fix: PyDict_Update only works with dict-like objects, not key-value sequences. Patch by priyapappachan. 2014-03-25 09:34:30 +01:00
Victor Stinner
75fd575402 (Merge 3.4) Issue #21058: Fix a leak of file descriptor in
tempfile.NamedTemporaryFile(), close the file descriptor if io.open() fails
2014-03-25 09:19:14 +01:00
Victor Stinner
1f99f9d5c2 Issue #21058: Fix a leak of file descriptor in tempfile.NamedTemporaryFile(),
close the file descriptor if io.open() fails
2014-03-25 09:18:04 +01:00
Victor Stinner
9ba908fec1 Null merge, patch already applied to default 2014-03-25 00:43:03 +01:00
Donald Stufft
eaeb955f48 Merge in 3.4 to bring forward the Issue #21043 changes. 2014-03-24 19:28:08 -04:00
Donald Stufft
4137465bf5 Issue #21043: Remove the recommendation for specific CA organizations
Closes #21043 by updating the documentation to remove specific CA
organizations and update the text to no longer need to tell you to
download root certificates, but instead use the OS certificates
avaialble through SSLContext.load_default_certs.
2014-03-24 19:26:03 -04:00
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