Mark Dickinson df99f04895 Merged revisions 72718 via svnmerge from ...

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72718 | mark.dickinson | 2009-05-17 11:38:30 +0100 (Sun, 17 May 2009) | 4 lines

  Issue #6044: remove confusing wording from complex -> integer and
  complex -> float conversion error messages.
........

2009-05-17 10:44:48 +00:00

..

stringlib

Merged revisions 71548 via svnmerge from

2009-04-13 00:32:15 +00:00

abstract.c

Merged revisions 69433,69436 via svnmerge from

2009-02-08 14:56:08 +00:00

boolobject.c

…

bufferobject.c

Change the warning emitted for using the buffer() object; memoryview() in 3.0

2008-08-08 04:15:53 +00:00

bytearrayobject.c

Merged revisions 71058,71149-71150,71212,71214-71216,71222,71225,71234,71237-71238,71240-71241,71243,71249,71251 via svnmerge from

2009-04-05 21:26:31 +00:00

bytes_methods.c

…

cellobject.c

…

classobject.c

generate py3k warnings on __getslice__, __delslice__, and __setslice__

2008-08-24 18:10:20 +00:00

cobject.c

#3668: When PyArg_ParseTuple correctly parses a s* format, but raises an

2008-08-29 18:39:48 +00:00

codeobject.c

…

complexobject.c

Merged revisions 72718 via svnmerge from

2009-05-17 10:44:48 +00:00

descrobject.c

Merged revisions 72299 via svnmerge from

2009-05-05 00:52:14 +00:00

dictnotes.txt

…

dictobject.c

Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from

2009-01-01 15:46:10 +00:00

enumobject.c

Convert from long to Py_ssize_t.

2008-07-24 07:04:55 +00:00

exceptions.c

backport r64751

2008-07-30 17:45:10 +00:00

fileobject.c

Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from

2009-01-01 15:46:10 +00:00

floatobject.c

Merged revisions 72564 via svnmerge from

2009-05-11 16:09:39 +00:00

frameobject.c

Merged revisions 71722,71725 via svnmerge from

2009-04-18 20:50:24 +00:00

funcobject.c

…

genobject.c

Merged revisions 70642,70648,70656,70661,70765,70773,70789,70824-70825,70828,70830,70832,70836,70838,70842,70851,70855,70857-70858 via svnmerge from

2009-04-05 21:11:43 +00:00

intobject.c

- Issue #2862: Make int and float freelist management consistent with other

2008-07-06 03:35:58 +00:00

iterobject.c

…

listobject.c

Issue 1242657: list(obj) can swallow KeyboardInterrupt

2009-02-02 22:44:06 +00:00

listsort.txt

…

longobject.c

PyLong_BASE_TWODIGITS_TYPE should be BASE_TWODIGITS_TYPE

2009-03-20 23:33:19 +00:00

methodobject.c

…

moduleobject.c

…

object.c

Merged revisions 71734,71738-71739 via svnmerge from

2009-04-20 02:09:13 +00:00

obmalloc.c

Bug #3951: Py_USING_MEMORY_DEBUGGER should not be enabled by default.

2008-09-25 04:12:50 +00:00

rangeobject.c

…

setobject.c

Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from

2009-01-01 15:46:10 +00:00

sliceobject.c

Merged revisions 71734,71738-71739 via svnmerge from

2009-04-20 02:09:13 +00:00

stringobject.c

Merged revisions 70682 via svnmerge from

2009-03-29 16:18:33 +00:00

structseq.c

Fix:

2008-08-24 05:04:52 +00:00

tupleobject.c

Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from

2008-10-04 21:33:08 +00:00

typeobject.c

Merged revisions 71860 via svnmerge from

2009-04-25 00:44:44 +00:00

unicodectype.c

Merged revisions 71947 via svnmerge from

2009-04-26 01:01:58 +00:00

unicodeobject.c

Merged revisions 72263 via svnmerge from

2009-05-03 22:46:50 +00:00

unicodetype_db.h

Merged revisions 71894 via svnmerge from

2009-04-25 14:05:52 +00:00

weakrefobject.c

Fix #3634 invalid return value from _weakref.ref(Exception).__init__

2008-09-09 20:55:01 +00:00