Benjamin Peterson 479a38b8fd Merged revisions 82159 via svnmerge from ...

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

................
  r82159 | benjamin.peterson | 2010-06-22 14:21:52 -0500 (Tue, 22 Jun 2010) | 9 lines

  Merged revisions 82157 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r82157 | benjamin.peterson | 2010-06-22 14:16:37 -0500 (Tue, 22 Jun 2010) | 1 line

    remove INT_MAX assertions; they can fail with large Py_ssize_t #9058
  ........
................

2010-06-22 20:11:09 +00:00

..

stringlib

Merged revisions 81823,81835 via svnmerge from

2010-06-08 15:12:17 +00:00

abstract.c

Recorded merge of revisions 81032 via svnmerge from

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

boolobject.c

Recorded merge of revisions 81032 via svnmerge from

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

bytearrayobject.c

Merged revisions 81862 via svnmerge from

2010-06-09 16:58:35 +00:00

bytes_methods.c

Recorded merge of revisions 81032 via svnmerge from

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

bytesobject.c

Merged revisions 81862 via svnmerge from

2010-06-09 16:58:35 +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

Recorded merge of revisions 81032 via svnmerge from

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

dictnotes.txt

Merged revisions 53623-53858 via svnmerge from

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

dictobject.c

Recorded merge of revisions 81032 via svnmerge from

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

enumobject.c

Recorded merge of revisions 81032 via svnmerge from

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

exceptions.c

Merged revisions 82159 via svnmerge from

2010-06-22 20:11:09 +00:00

fileobject.c

Recorded merge of revisions 81032 via svnmerge from

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

floatobject.c

Recorded merge of revisions 81032 via svnmerge from

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

2010-02-02 22:51:34 +00:00

methodobject.c

Recorded merge of revisions 81032 via svnmerge from

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

moduleobject.c

Recorded merge of revisions 81032 via svnmerge from

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

object.c

Merged revisions 81250-81253 via svnmerge from

2010-05-17 09:35:44 +00:00

obmalloc.c

Recorded merge of revisions 81032 via svnmerge from

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

rangeobject.c

Recorded merge of revisions 81032 via svnmerge from

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

setobject.c

Recorded merge of revisions 81032 via svnmerge from

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

Recorded merge of revisions 81032 via svnmerge from

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

unicodectype.c

Recorded merge of revisions 81032 via svnmerge from

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

unicodeobject.c

Merged revisions 81908 via svnmerge from

2010-06-11 21:48:34 +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