Benjamin Peterson 0aabda7939 Merged revisions 80129 via svnmerge from ...

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

........
  r80129 | benjamin.peterson | 2010-04-16 17:52:44 -0500 (Fri, 16 Apr 2010) | 1 line

  tiny simplification
........

2010-04-16 23:00:54 +00:00

..

stringlib

Silence compiler warning

2009-09-27 15:53:49 +00:00

abstract.c

Merged revisions 69846 via svnmerge from

2009-07-02 15:37:21 +00:00

boolobject.c

This reverts r63675 based on the discussion in this thread:

2008-06-09 04:58:54 +00:00

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 80129 via svnmerge from

2010-04-16 23:00:54 +00:00

bytes_methods.c

This reverts r63675 based on the discussion in this thread:

2008-06-09 04:58:54 +00:00

cellobject.c

This reverts r63675 based on the discussion in this thread:

2008-06-09 04:58:54 +00:00

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

This reverts r63675 based on the discussion in this thread:

2008-06-09 04:58:54 +00:00

complexobject.c

Merged revisions 72718 via svnmerge from

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

descrobject.c

Remove unused variable.

2009-09-27 16:17:37 +00:00

dictnotes.txt

Patch #1397848: add the reasoning behind no-resize-on-shrinkage.

2007-02-15 09:51:35 +00:00

dictobject.c

Merged revisions 78515-78516,78522 via svnmerge from

2010-03-01 04:05:56 +00:00

enumobject.c

Merged revisions 75055 via svnmerge from

2009-09-25 16:10:55 +00:00

exceptions.c

Merged revisions 78418 via svnmerge from

2010-02-24 14:27:37 +00:00

fileobject.c

Merged revisions 77989 via svnmerge from

2010-02-05 17:11:32 +00:00

floatobject.c

Merged revisions 72564 via svnmerge from

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

frameobject.c

Merged revisions 73129 via svnmerge from

2009-06-01 23:27:15 +00:00

funcobject.c

This reverts r63675 based on the discussion in this thread:

2008-06-09 04:58:54 +00:00

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

Merged revisions 76665 via svnmerge from

2009-12-04 11:25:29 +00:00

iterobject.c

PEP 3123: Provide forward compatibility with Python 3.0, while keeping

2007-07-21 06:55:02 +00:00

listobject.c

Merged revisions 78515-78516,78522 via svnmerge from

2010-03-01 04:05:56 +00:00

listsort.txt

Merged revisions 69846 via svnmerge from

2009-07-02 15:37:21 +00:00

longobject.c

Merged revisions 74769 via svnmerge from

2009-09-13 11:59:41 +00:00

methodobject.c

Merged revisions 73774 via svnmerge from

2009-07-02 17:19:22 +00:00

moduleobject.c

This reverts r63675 based on the discussion in this thread:

2008-06-09 04:58:54 +00:00

object.c

Merged revisions 74457 via svnmerge from

2009-08-15 13:18:47 +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

Merged revisions 76330 via svnmerge from

2009-11-16 17:34:11 +00:00

setobject.c

Merged revisions 78515-78516,78522 via svnmerge from

2010-03-01 04:05:56 +00:00

sliceobject.c

Merged revisions 71734,71738-71739 via svnmerge from

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

stringobject.c

Merged revisions 77743 via svnmerge from

2010-01-25 11:46:11 +00:00

structseq.c

Fix:

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

tupleobject.c

Merged revisions 78515-78516,78522 via svnmerge from

2010-03-01 04:05:56 +00:00

typeobject.c

Merged revisions 76852 via svnmerge from

2009-12-16 03:45:28 +00:00

unicodectype.c

Merged revisions 71947 via svnmerge from

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

unicodeobject.c

Merged revisions 79278,79280 via svnmerge from

2010-03-22 12:56:39 +00:00

unicodetype_db.h

Merged revisions 71894 via svnmerge from

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

weakrefobject.c

Merged revisions 76395 via svnmerge from

2009-11-19 03:11:09 +00:00