0175af85a5
Merge.
2012-03-23 16:37:41 +01:00
c64150bcac
Fix formatting after removing tabs.
2012-03-23 16:34:41 +01:00
cd9e1d0205
Whitespace.
2012-03-23 16:22:05 +01:00
080e1cc33a
Null merge for backported fix.
2012-03-23 14:38:12 +00:00
ee64b28cf4
Closes #14314 : backported fix.
2012-03-23 14:36:22 +00:00
c7ea19fee8
attempt to fix asyncore buildbot failure
2012-03-23 15:09:58 +01:00
a3481e70d1
attempt to fix asyncore buildbot failure
2012-03-23 15:07:07 +01:00
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
4b0215fd99
Merge with 3.2
2012-03-23 12:52:11 +00:00
c5d47d5ac3
Fix typo when "PyObject*" was changed to "identifier"
2012-03-23 12:50:53 +00:00
4164ac1f27
merge
2012-03-23 13:29:49 +01:00
466a54f4dc
fix failing asyncore test as per http://bugs.python.org/issue10340#msg156586
2012-03-23 13:29:01 +01:00
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
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
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
192195a4fc
Merge with 3.2 (Issue #14387 )
2012-03-22 23:13:48 +00:00
b81e5388b6
Issue #14387 : undefine 'small' so that it doesn't clash with Windows headers.
2012-03-22 23:10:37 +00:00
2ac82f8dc9
Fix indentation.
2012-03-22 22:20:21 +01:00
e8b416e754
Issue #14382 : Ensure new unittest.test.testmock is installed.
...
(Original patch by Vinay Sajip)
2012-03-22 13:34:11 -07:00
eee50b07b1
merge 3.2
2012-03-22 15:30:03 -04:00
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
4a65b0a355
issue 10340 - forgot to update Misc/NEWS
2012-03-22 16:22:06 +01:00
3539ef3d21
merge 79422b3684f1 in 3.3 branch (issue 10340)
2012-03-22 16:19:45 +01:00
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
cc58031d6a
merge 3.2
2012-03-22 10:40:20 -04:00
9faf5ee750
this should technicaly be identifier
2012-03-22 10:39:16 -04:00
d0acb411ef
Issue #14387 : Do not include accu.h from Python.h.
2012-03-22 14:42:18 +01:00
0197ff97d0
Issue #14387 : Do not include accu.h from Python.h.
2012-03-22 14:38:16 +01:00
b304764ba2
merge 3.2
2012-03-22 08:56:27 -04:00
ab79c71f39
check for NULL
2012-03-22 08:56:15 -04:00
98ba753432
merge 3.2 ( #14378 )
2012-03-22 08:19:50 -04:00
a4e4e35783
check by equality for __future__ not identity ( closes #14378 )
2012-03-22 08:19:04 -04:00
96ad2619b2
Fix typo.
2012-03-22 07:42:31 +01:00
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
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
a966c6fddb
Issue #3035 : Unused functions from tkinter are marked as pending peprecated.
2012-03-21 23:52:59 +02:00
04fb08f690
Merge.
2012-03-21 20:27:33 +01:00
7cc5521d40
Whitespace.
2012-03-21 20:21:20 +01:00
1da08e77df
Merge #12757 : Make doctest skipping in -OO mode work with unittest/regrtest -v
2012-03-21 14:55:04 -04:00
e112153727
#12757 : Make doctest skipping in -OO mode work with unittest/regrtest -v
2012-03-21 14:53:42 -04:00
520e8508a0
long() -> int()
2012-03-21 14:51:14 -04:00
b7f1da5a3c
make _PyNumber_ConvertIntegralToInt static, since it's only used in abstract.c
2012-03-21 14:44:43 -04:00
d614e707ca
rewrite this function, which was still accounting for classic classes
2012-03-21 14:38:11 -04:00
65e32d1f1a
merge heads
2012-03-21 14:26:09 -04:00
851a07e5c2
Document decimal.MIN_ETINY.
2012-03-21 18:47:20 +01:00
1919b7e72b
Issue #7652 : Integrate the decimal floating point libmpdec library to speed
...
up the decimal module. Performance gains of the new C implementation are
between 12x and 80x, depending on the application.
2012-03-21 18:25:23 +01:00
8bfccd852e
Remove non-existing file from pythoncore project.
2012-03-21 11:37:09 +00:00
206d2a43a3
Merge from 3.2 for issue #3573 , fix Misc/NEWS as Ned Deily guess.
2012-03-21 13:31:12 +02:00
0f71f44156
#3573 : idle now doesn't hungs if launched as: idle -e <directory>
...
Patch by Guilherme Polo.
2012-03-21 13:23:41 +02:00
1b1a8e7cb5
correctly lookup __trunc__ in int() constructor
2012-03-20 23:48:11 -04:00
Stefan Krah
Vinay Sajip
Giampaolo Rodola'
Kristján Valur Jónsson
Eli Bendersky
R David Murray
Georg Brandl
Ned Deily
Benjamin Peterson
Antoine Pitrou
Victor Stinner
Andrew Svetlov
krisvale