Mercurial > cpython-lru_cache-weakref
diff Modules/arraymodule.c @ 73093:b82e68cf3b0d
Merge 3.2.
| author | Florent Xicluna <florent.xicluna@gmail.com> |
|---|---|
| date | Mon, 24 Oct 2011 13:17:27 +0200 |
| parents | 7109f31300fb 451fa5782145 |
| children | 98c0265cf7b9 |
line wrap: on
line diff
--- a/Modules/arraymodule.c Mon Oct 24 10:31:52 2011 +0100 +++ b/Modules/arraymodule.c Mon Oct 24 13:17:27 2011 +0200 @@ -1550,7 +1550,7 @@ \n\ Extends this array with data from the unicode string ustr.\n\ The array must be a unicode type array; otherwise a ValueError\n\ -is raised. Use array.frombytes(ustr.decode(...)) to\n\ +is raised. Use array.frombytes(ustr.encode(...)) to\n\ append Unicode data to an array of some other type."); @@ -1572,7 +1572,7 @@ \n\ Convert the array to a unicode string. The array must be\n\ a unicode type array; otherwise a ValueError is raised. Use\n\ -array.tostring().decode() to obtain a unicode string from\n\ +array.tobytes().decode() to obtain a unicode string from\n\ an array of some other type."); @@ -2636,7 +2636,7 @@ extend() -- extend array by appending multiple elements from an iterable\n\ fromfile() -- read items from a file object\n\ fromlist() -- append items from the list\n\ -fromstring() -- append items from the string\n\ +frombytes() -- append items from the string\n\ index() -- return index of first occurrence of an object\n\ insert() -- insert a new item into the array at a provided position\n\ pop() -- remove and return item (default last)\n\ @@ -2644,7 +2644,7 @@ reverse() -- reverse the order of the items in the array\n\ tofile() -- write all items to a file object\n\ tolist() -- return the array converted to an ordinary list\n\ -tostring() -- return the array converted to a string\n\ +tobytes() -- return the array converted to a string\n\ \n\ Attributes:\n\ \n\
