Benjamin Peterson d82f45b720 Merged revisions 88066 via svnmerge from ...

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

........
  r88066 | benjamin.peterson | 2011-01-17 13:44:46 -0600 (Mon, 17 Jan 2011) | 1 line

  correct assertion
........

2011-01-17 19:46:48 +00:00

..

stringlib

Merged revisions 83400 via svnmerge from

2010-08-01 10:43:42 +00:00

abstract.c

Merged revisions 84714 via svnmerge from

2010-09-11 16:03:33 +00:00

boolobject.c

Recorded merge of revisions 81032 via svnmerge from

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

bytearrayobject.c

Merged revisions 84070,84074 via svnmerge from

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

bytes_methods.c

Merged revisions 84070,84074 via svnmerge from

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

bytesobject.c

Merged revisions 84629 via svnmerge from

2010-09-08 13:00:07 +00:00

capsule.c

Merged revisions 75220 via svnmerge from

2009-10-03 20:15:21 +00:00

cellobject.c

Recorded merge of revisions 81032 via svnmerge from

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

classobject.c

Recorded merge of revisions 81032 via svnmerge from

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

cobject.c

#5947: add PendingDeprecationWarning to PyCObject functions.

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

codeobject.c

Recorded merge of revisions 81032 via svnmerge from

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

complexobject.c

Recorded merge of revisions 81032 via svnmerge from

2010-05-09 16:14:21 +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

Issue 10221: Improve error message for dict.pop().

2010-10-30 08:14:53 +00:00

enumobject.c

Recorded merge of revisions 81032 via svnmerge from

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

exceptions.c

Merged revisions 85896 via svnmerge from

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

fileobject.c

Recorded merge of revisions 81032 via svnmerge from

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

floatobject.c

Merged revisions 87032 via svnmerge from

2010-12-04 13:04:18 +00:00

frameobject.c

Recorded merge of revisions 81032 via svnmerge from

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

funcobject.c

Recorded merge of revisions 81032 via svnmerge from

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

genobject.c

Recorded merge of revisions 81032 via svnmerge from

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

iterobject.c

Recorded merge of revisions 81032 via svnmerge from

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

listobject.c

Recorded merge of revisions 81032 via svnmerge from

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

listsort.txt

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

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

longobject.c

Recorded merge of revisions 81032 via svnmerge from

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

memoryobject.c

Merged revisions 84408-84409 via svnmerge from

2010-09-01 21:16:10 +00:00

methodobject.c

Recorded merge of revisions 81032 via svnmerge from

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

moduleobject.c

Merged revisions 87251 via svnmerge from

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

object.c

Merged revisions 84717 via svnmerge from

2010-09-11 16:40:47 +00:00

obmalloc.c

Merged revisions 87834 via svnmerge from

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

rangeobject.c

Recorded merge of revisions 81032 via svnmerge from

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

setobject.c

Merged revisions 84146-84147,84150 via svnmerge from

2010-08-17 19:39:39 +00:00

sliceobject.c

Recorded merge of revisions 81032 via svnmerge from

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

structseq.c

Recorded merge of revisions 81032 via svnmerge from

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

tupleobject.c

Recorded merge of revisions 81032 via svnmerge from

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

typeobject.c

Merged revisions 88066 via svnmerge from

2011-01-17 19:46:48 +00:00

unicodectype.c

Recorded merge of revisions 81032 via svnmerge from

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

unicodeobject.c

Merged revisions 86277 via svnmerge from

2010-11-06 19:29:45 +00:00

unicodetype_db.h

Merged revisions 71894 via svnmerge from

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

weakrefobject.c

Recorded merge of revisions 81032 via svnmerge from

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