Mark Dickinson 49fe64f349 Merged revisions 72719 via svnmerge from ...

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

................
  r72719 | mark.dickinson | 2009-05-17 11:40:10 +0100 (Sun, 17 May 2009) | 10 lines

  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:43:52 +00:00

..

stringlib

Merged revisions 71550 via svnmerge from

2009-04-13 00:58:35 +00:00

abstract.c

Validate that __length_hint__ returns a usable result.

2009-02-03 02:15:22 +00:00

boolobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

bytearrayobject.c

Merged revisions 70282-70283 via svnmerge from

2009-03-09 21:12:36 +00:00

bytes_methods.c

Renamed PyString to PyBytes

2008-05-26 13:28:38 +00:00

bytesobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

cellobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

classobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

cobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

codeobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

complexobject.c

Merged revisions 72719 via svnmerge from

2009-05-17 10:43:52 +00:00

descrobject.c

Merged revisions 72301 via svnmerge from

2009-05-05 01:01:52 +00:00

dictnotes.txt

Merged revisions 53623-53858 via svnmerge from

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

dictobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

enumobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

exceptions.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

fileobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

floatobject.c

Merged revisions 72565 via svnmerge from

2009-05-11 16:27:53 +00:00

frameobject.c

Merged revisions 71727 via svnmerge from

2009-04-18 21:10:48 +00:00

funcobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

genobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

iterobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

listobject.c

Issue 1242657: list(obj) can swallow KeyboardInterrupt.

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

listsort.txt

Merged revisions 46753-51188 via svnmerge from

2006-08-11 14:57:12 +00:00

longobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

memoryobject.c

Merged revisions 69438 via svnmerge from

2009-02-08 15:07:39 +00:00

methodobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

moduleobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

object.c

Merged revisions 71757 via svnmerge from

2009-04-24 23:05:53 +00:00

obmalloc.c

Merged revisions 66616 via svnmerge from

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

rangeobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

setobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

sliceobject.c

Merged revisions 71757 via svnmerge from

2009-04-24 23:05:53 +00:00

structseq.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00

tupleobject.c

Merged revisions 70507-70508 via svnmerge from

2009-03-21 17:44:10 +00:00

typeobject.c

Merged revisions 71862 via svnmerge from

2009-04-25 01:37:40 +00:00

unicodectype.c

Merged revisions 71949 via svnmerge from

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

unicodeobject.c

Merged revisions 72265 via svnmerge from

2009-05-03 22:57:39 +00:00

unicodetype_db.h

Merged revisions 71896 via svnmerge from

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

weakrefobject.c

Merged revisions 69214 via svnmerge from

2009-02-02 20:41:29 +00:00