diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-11-18 19:35:23 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-11-18 19:35:23 (GMT) |
| commit | 9cd177526afc086a300b548588880329c32f607d (patch) | |
| tree | e842c29c3f11a1bcd885863fa8ea90e40f155bc8 /Doc/library | |
| parent | 81ca7c784c4dd58dde691284321e3e220550a75c (diff) | |
| download | cpython-9cd177526afc086a300b548588880329c32f607d.zip cpython-9cd177526afc086a300b548588880329c32f607d.tar.gz cpython-9cd177526afc086a300b548588880329c32f607d.tar.bz2 | |
Merged revisions 59005-59040 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
I've tried to fix test_cmd_line_script but I wasn't able to get all tests
right. Nick, can you please have a look?
........
r59020 | facundo.batista | 2007-11-16 19:04:14 +0100 (Fri, 16 Nov 2007) | 12 lines
Now in find, rfind, index, and rindex, you can use None as defaults,
as usual with slicing (both with str and unicode strings). This
fixes issue 1259.
For str only the stringobject.c file was modified. But for unicode,
I needed to repeat in the four functions a lot of code, so created
a new function that does part of the job for them (and placed it in
find.h, following a suggestion of Barry).
Also added tests for this behaviour.
........
r59021 | facundo.batista | 2007-11-16 19:41:24 +0100 (Fri, 16 Nov 2007) | 4 lines
Fix for stupid error (I need to remember to do a full 'make clean + make'
cycle before the tests...). Sorry.
........
r59022 | facundo.batista | 2007-11-16 20:16:15 +0100 (Fri, 16 Nov 2007) | 3 lines
Made _ParseTupleFinds only defined to unicodeobject.c
........
r59024 | raymond.hettinger | 2007-11-17 02:51:22 +0100 (Sat, 17 Nov 2007) | 1 line
Fix signature in example
........
r59033 | brett.cannon | 2007-11-17 08:07:29 +0100 (Sat, 17 Nov 2007) | 5 lines
Remove a confusing sentence about pth files and which directories are searched
for them.
Closes issue #1431. Thanks Giambattista Bloisi for the help.
........
r59039 | nick.coghlan | 2007-11-18 12:56:28 +0100 (Sun, 18 Nov 2007) | 1 line
Patch #1739468: Directories and zipfiles containing __main__.py are now executable
........
Diffstat (limited to 'Doc/library')
| -rw-r--r-- | Doc/library/collections.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 0b856fe..d46a895 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -427,7 +427,7 @@ Example:: def __asdict__(self): 'Return a new dict mapping field names to their values' return dict(zip(('x', 'y'), self)) - def __replace__(self, field, value): + def __replace__(self, **kwds): 'Return a new Point object replacing specified fields with new values' return Point(**dict(zip(('x', 'y'), self) + kwds.items())) x = property(itemgetter(0)) |