Commit Graph

54077 Commits

Author SHA1 Message Date
Michael Foord a3eabb6f8e Merge 2012-03-25 18:16:26 +01:00
Michael Foord 313f85f0ca unittest.mock.MagicMock objects are now unorderable by default 2012-03-25 18:16:07 +01:00
Stefan Krah fe17b2bc77 Raise MemoryError instead of InvalidOperation/MallocError for compatibility
with decimal.py. The standard specifies InsufficientStorage (MallocError) as
a sub-condition of InvalidOperation. This allows a calculation to continue
with NaN results when allocation fails.
2012-03-25 18:59:21 +02:00
Andrew Svetlov 1d5617958f Remove extra spaces in doc example. 2012-03-25 11:44:59 +03:00
Andrew Svetlov cd49d53238 Issue #14200 — now displayhook for IDLE works in non-subprocess mode as well as subprecess. 2012-03-25 11:43:02 +03:00
Georg Brandl 1a7742eb4d merge with 3.2 2012-03-25 08:43:32 +02:00
Georg Brandl 11ee31ab08 Closes #14401: fix typos in curses howto. 2012-03-25 08:43:22 +02:00
Charles-François Natali 9384c7ddab Issue #13902: Fix a random test_threading failure on FreeBSD 6 buildbots (due
to a known bug in pthread implementation on FreeBSD < 7).
2012-03-24 20:37:01 +01:00
Charles-François Natali 8e6fe648cc Issue #13902: Fix a random test_threading failure on FreeBSD 6 buildbots (due
to a known bug in pthread implementation on FreeBSD < 7).
2012-03-24 20:36:09 +01:00
Eli Bendersky 60ee04969e Issue #14349: Fix the doc of the MAKE_FUNCTION opcode in Doc/library/dis.rst to
correctly list the stack params it expects.
2012-03-24 18:52:45 +02:00
Martin v. Löwis ecc92db031 merge 3.2 2012-03-24 17:40:50 +01:00
Martin v. Löwis 2dee394af9 Issue #14400: Fix typo. 2012-03-24 17:39:57 +01:00
Charles-François Natali 55bce63ea0 Issue #14154: Reimplement the bigmem test memory watchdog as a subprocess. 2012-03-24 10:06:23 +01:00
Georg Brandl 226ed7ecbd Fix indentation. 2012-03-24 08:12:41 +01:00
Stefan Krah 60187b5ee5 Issue #7652: Enable linking of _decimal.so against an installed libmpdec. 2012-03-23 19:06:27 +01:00
Stefan Krah 0175af85a5 Merge. 2012-03-23 16:37:41 +01:00
Stefan Krah c64150bcac Fix formatting after removing tabs. 2012-03-23 16:34:41 +01:00
Stefan Krah cd9e1d0205 Whitespace. 2012-03-23 16:22:05 +01:00
Vinay Sajip 080e1cc33a Null merge for backported fix. 2012-03-23 14:38:12 +00:00
Vinay Sajip ee64b28cf4 Closes #14314: backported fix. 2012-03-23 14:36:22 +00:00
Giampaolo Rodola' c7ea19fee8 attempt to fix asyncore buildbot failure 2012-03-23 15:09:58 +01:00
Giampaolo Rodola' a3481e70d1 attempt to fix asyncore buildbot failure 2012-03-23 15:07:07 +01:00
Stefan Krah b6405efd1b Use the same exception hierarchy as decimal.py. FloatOperation now also
inherits from TypeError. Cleanup in module initialization to make repeated
import failures robust.
2012-03-23 14:46:48 +01:00
Kristján Valur Jónsson 4b0215fd99 Merge with 3.2 2012-03-23 12:52:11 +00:00
Kristján Valur Jónsson c5d47d5ac3 Fix typo when "PyObject*" was changed to "identifier" 2012-03-23 12:50:53 +00:00
Giampaolo Rodola' 4164ac1f27 merge 2012-03-23 13:29:49 +01:00
Giampaolo Rodola' 466a54f4dc fix failing asyncore test as per http://bugs.python.org/issue10340#msg156586 2012-03-23 13:29:01 +01:00
Eli Bendersky 396e8fcf36 Issue #13782: streamline argument type-checking in ET.Element
append, extend and insert now consistently type-check their argument in both
the C and Python implementations, and raise TypeError for non-Element
argument.

Added tests
2012-03-23 14:24:20 +02:00
R David Murray 42243c4dca #14380: Make actual default match docs, fix __init__ order.
Éric pointed out that given that the default was documented as None, someone
would reasonably pass that to get the default behavior.  In fixing the code to
use None, I noticed that the change to _charset was being done after it had
already been passed to MIMENonMultipart.  The change to the test verifies that
the order is now correct.
2012-03-22 22:40:44 -04:00
R David Murray 8680bcc5db #14380: Have MIMEText defaults to utf-8 when passed non-ASCII unicode
Previously it would just accept the unicode, which would wind up as unicode in
the transfer-encoded message object, which is just wrong.

Patch by Jeff Knupp.
2012-03-22 22:17:51 -04:00
Kristján Valur Jónsson 192195a4fc Merge with 3.2 (Issue #14387) 2012-03-22 23:13:48 +00:00
Kristján Valur Jónsson b81e5388b6 Issue #14387 : undefine 'small' so that it doesn't clash with Windows headers. 2012-03-22 23:10:37 +00:00
Georg Brandl 2ac82f8dc9 Fix indentation. 2012-03-22 22:20:21 +01:00
Ned Deily e8b416e754 Issue #14382: Ensure new unittest.test.testmock is installed.
(Original patch by Vinay Sajip)
2012-03-22 13:34:11 -07:00
Benjamin Peterson eee50b07b1 merge 3.2 2012-03-22 15:30:03 -04:00
Giampaolo Rodola' f4ce1146fc fix #10340: properly handle EINVAL on OSX and also avoid to call handle_connect() in case of a disconnetected socket which is not meant to connect. 2012-03-22 16:24:33 +01:00
Giampaolo Rodola' 4a65b0a355 issue 10340 - forgot to update Misc/NEWS 2012-03-22 16:22:06 +01:00
Giampaolo Rodola' 3539ef3d21 merge 79422b3684f1 in 3.3 branch (issue 10340) 2012-03-22 16:19:45 +01:00
Giampaolo Rodola' 350c94b900 fix #10340: properly handle EINVAL on OSX and also avoid to call handle_connect() in case of a disconnetected socket which is not meant to connect. 2012-03-22 16:17:43 +01:00
Benjamin Peterson cc58031d6a merge 3.2 2012-03-22 10:40:20 -04:00
Benjamin Peterson 9faf5ee750 this should technicaly be identifier 2012-03-22 10:39:16 -04:00
Antoine Pitrou d0acb411ef Issue #14387: Do not include accu.h from Python.h. 2012-03-22 14:42:18 +01:00
Antoine Pitrou 0197ff97d0 Issue #14387: Do not include accu.h from Python.h. 2012-03-22 14:38:16 +01:00
Benjamin Peterson b304764ba2 merge 3.2 2012-03-22 08:56:27 -04:00
Benjamin Peterson ab79c71f39 check for NULL 2012-03-22 08:56:15 -04:00
Benjamin Peterson 98ba753432 merge 3.2 (#14378) 2012-03-22 08:19:50 -04:00
Benjamin Peterson a4e4e35783 check by equality for __future__ not identity (closes #14378) 2012-03-22 08:19:04 -04:00
Georg Brandl 96ad2619b2 Fix typo. 2012-03-22 07:42:31 +01:00
Victor Stinner 59af08f545 Micro-optimize PyObject_GetAttrString()
w cannot be NULL so use Py_DECREF() instead of Py_XDECREF().
2012-03-22 02:09:08 +01:00
Antoine Pitrou d5d17eb653 Issue #14204: The ssl module now has support for the Next Protocol Negotiation extension, if available in the underlying OpenSSL library.
Patch by Colin Marc.
2012-03-22 00:23:03 +01:00