Éric Araujo bbcfc1f2d9 Merge from 3.1. ...

The fix was already committed to 3.2, but I merged two small changes
recommended by Raymond while I was working on the 2.7 patch to ease
future merges.

2011-03-23 03:43:22 +01:00

..

stringlib

#11515: Merge with 3.1.

2011-03-15 05:59:46 +02:00

abstract.c

code style

2010-11-20 17:21:08 +00:00

boolobject.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

bytearrayobject.c

#11515: Merge with 3.1.

2011-03-15 05:59:46 +02:00

bytes_methods.c

Merged revisions 84070,84074 via svnmerge from

2010-08-15 17:46:50 +00:00

bytesobject.c

#11515: Merge with 3.1.

2011-03-15 05:59:46 +02:00

capsule.c

Issue #2443: Added a new macro, Py_VA_COPY, which is equivalent to C99

2010-08-11 17:31:17 +00:00

cellobject.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +00:00

classobject.c

make hashes always the size of pointers; introduce Py_hash_t #9778

2010-10-17 20:54:53 +00:00

codeobject.c

Remove arbitrary string length limits

2011-01-05 03:33:26 +00:00

complexobject.c

Removed static function complex_format, moved it into complex_repr. Modified tests to check both str and repr, which are the same for complex.

2010-12-04 13:27:34 +00:00

descrobject.c

Merged revisions 87368 via svnmerge from

2010-12-18 15:06:45 +00:00

dictnotes.txt

Merged revisions 53623-53858 via svnmerge from

2007-02-23 15:07:44 +00:00

dictobject.c

#11565: Merge with 3.1.

2011-03-16 11:35:38 +02:00

enumobject.c

Merged revisions 81465-81466,81468,81679,81735,81760,81868,82183 via svnmerge from

2010-06-27 21:45:24 +00:00

exceptions.c

Merged revisions 85896 via svnmerge from

2010-10-28 23:06:57 +00:00

fileobject.c

Issue #9015, #9611: stdprinter.write() clamps the length to 2^31-1 on Windows

2011-01-04 13:15:39 +00:00

floatobject.c

Use copysign to produce appropriately signed zeros instead of trying to worm around possible compiler optimizations.

2010-12-04 13:14:29 +00:00

frameobject.c

Issue #9089: Remove references to intobject.c and intobject.h from comments.

2010-06-27 18:19:09 +00:00

funcobject.c

Merge branches/pep-0384.

2010-12-03 20:14:31 +00:00

genobject.c

Remove redundant includes of headers that are already included by Python.h.

2010-11-30 09:41:01 +00:00

iterobject.c

Fix nit (sentinel on lhs of comparison).

2010-08-07 05:54:08 +00:00

listobject.c

#11565: Merge with 3.1.

2011-03-16 11:35:38 +02:00

listsort.txt

Merged revisions 74613,74615,74619-74620,74622 via svnmerge from

2009-09-01 08:13:16 +00:00

lnotab_notes.txt

Merged revisions 72487-72488,72879 via svnmerge from

2009-07-21 04:30:03 +00:00

longobject.c

#11565: Merge with 3.1.

2011-03-16 11:35:38 +02:00

memoryobject.c

Merged revisions 88550 via svnmerge from

2011-02-24 20:53:48 +00:00

methodobject.c

make hashes always the size of pointers; introduce Py_hash_t #9778

2010-10-17 20:54:53 +00:00

moduleobject.c

Merged revisions 87251 via svnmerge from

2010-12-14 23:30:42 +00:00

object.c

Merge branches/pep-0384.

2010-12-03 20:14:31 +00:00

obmalloc.c

Merged revisions 87834 via svnmerge from

2011-01-07 21:49:25 +00:00

rangeobject.c

rangeobject.c (compute_slice_indices): Make function static.

2011-01-16 20:57:01 +00:00

setobject.c

Merge from 3.1.

2011-03-23 03:43:22 +01:00

sliceobject.c

Merge branches/pep-0384.

2010-12-03 20:14:31 +00:00

structseq.c

Merge branches/pep-0384.

2010-12-03 20:14:31 +00:00

tupleobject.c

Merge branches/pep-0384.

2010-12-03 20:14:31 +00:00

typeobject.c

#11565: Merge with 3.1.

2011-03-16 11:35:38 +02:00

typeslots.inc

Issue #11134: Add missing fields to typeslots.h.

2011-02-11 20:50:24 +00:00

typeslots.py

Support comment lines and missing indices in typeslots.h.

2011-01-06 19:26:21 +00:00

unicodectype.c

Remove redundant includes of headers that are already included by Python.h.

2010-11-30 09:41:01 +00:00

unicodeobject.c

Merged revisions 88697 via svnmerge from

2011-03-01 22:48:49 +00:00

unicodetype_db.h

Upgrade to Unicode 6.0.0.

2010-10-11 22:42:28 +00:00

weakrefobject.c

Issue #10359: Remove ";" after function definition, invalid in ISO C

2010-11-09 09:32:19 +00:00