Eric Smith 7bc66b1009 Merged revisions 74222 via svnmerge from ...

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r74222 | eric.smith | 2009-07-26 22:10:42 -0400 (Sun, 26 Jul 2009) | 1 line

  Sync trunk and py3k versions of string formatting. Manual merge of r74219.
........

2009-07-27 02:12:11 +00:00

..

stringlib

Merged revisions 74222 via svnmerge from

2009-07-27 02:12:11 +00:00

abstract.c

Merged revisions 72907 via svnmerge from

2009-05-25 03:10:48 +00:00

boolobject.c

Issue #1717: rename tp_compare to tp_reserved. I'll change the

2009-02-02 20:36:42 +00:00

bytearrayobject.c

Merged revisions 74169 via svnmerge from

2009-07-22 12:06:11 +00:00

bytes_methods.c

Merged revisions 72040 via svnmerge from

2009-04-27 20:39:49 +00:00

bytesobject.c

rename internal methods of the bytes object to bytes_

2009-04-18 15:17:02 +00:00

capsule.c

Merged revisions 73618 via svnmerge from

2009-06-28 16:26:13 +00:00

cellobject.c

Issue #1717: rename tp_compare to tp_reserved. I'll change the

2009-02-02 20:36:42 +00:00

classobject.c

Issue #1717: rename tp_compare to tp_reserved. I'll change the

2009-02-02 20:36:42 +00:00

cobject.c

#5947: add PendingDeprecationWarning to PyCObject functions.

2009-05-06 08:47:56 +00:00

codeobject.c

Issue #1717: rename tp_compare to tp_reserved. I'll change the

2009-02-02 20:36:42 +00:00

complexobject.c

Issue #5829: complex('1e500') shouldn't raise OverflowError

2009-05-20 18:41:04 +00:00

descrobject.c

Merged revisions 72328 via svnmerge from

2009-05-05 09:21:07 +00:00

dictnotes.txt

Merged revisions 53623-53858 via svnmerge from

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

dictobject.c

Merged revisions 74140 via svnmerge from

2009-07-21 14:16:13 +00:00

enumobject.c

Merged revisions 72907 via svnmerge from

2009-05-25 03:10:48 +00:00

exceptions.c

Merged revisions 73447-73448 via svnmerge from

2009-06-16 19:24:38 +00:00

fileobject.c

Issue #1717: rename tp_compare to tp_reserved. I'll change the

2009-02-02 20:36:42 +00:00

floatobject.c

Refactor to remove duplicated nan/inf parsing code in

2009-05-20 22:05:25 +00:00

frameobject.c

Merged revisions 73129 via svnmerge from

2009-06-01 23:29:07 +00:00

funcobject.c

Merged revisions 73623-73624 via svnmerge from

2009-06-28 17:35:48 +00:00

genobject.c

Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from

2009-04-05 19:13:16 +00:00

iterobject.c

Issue #1717: rename tp_compare to tp_reserved. I'll change the

2009-02-02 20:36:42 +00:00

listobject.c

Issue 1242657: list(obj) can swallow KeyboardInterrupt.

2009-02-02 22:55:09 +00:00

listsort.txt

Merged revisions 69846 via svnmerge from

2009-02-21 20:59:32 +00:00

longobject.c

Merged revisions 72202 via svnmerge from

2009-05-02 17:57:52 +00:00

memoryobject.c

Issue 6329: Fix iteration for memoryviews.

2009-06-23 20:38:54 +00:00

methodobject.c

Issue #1717: rename tp_compare to tp_reserved. I'll change the

2009-02-02 20:36:42 +00:00

moduleobject.c

Issue #1717: rename tp_compare to tp_reserved. I'll change the

2009-02-02 20:36:42 +00:00

object.c

Merged revisions 72907 via svnmerge from

2009-05-25 03:10:48 +00:00

obmalloc.c

Merged revisions 66616 via svnmerge from

2008-09-25 04:15:27 +00:00

rangeobject.c

this is also no longer true

2009-06-24 22:16:41 +00:00

setobject.c

Issue #1717: rename tp_compare to tp_reserved. I'll change the

2009-02-02 20:36:42 +00:00

sliceobject.c

Merged revisions 71734,71738-71739 via svnmerge from

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

structseq.c

Issue #1717: rename tp_compare to tp_reserved. I'll change the

2009-02-02 20:36:42 +00:00

tupleobject.c

Merged revisions 70550 via svnmerge from

2009-03-23 19:19:54 +00:00

typeobject.c

Merged revisions 73868 via svnmerge from

2009-07-07 00:45:43 +00:00

unicodectype.c

Merged revisions 71947 via svnmerge from

2009-04-26 01:02:07 +00:00

unicodeobject.c

Merged revisions 73698 via svnmerge from

2009-06-29 22:38:54 +00:00

unicodetype_db.h

Merged revisions 71894 via svnmerge from

2009-04-25 14:13:56 +00:00

weakrefobject.c

Issue #1717: rename tp_compare to tp_reserved. I'll change the

2009-02-02 20:36:42 +00:00