changeset: 79589:3773c98d9da8 parent: 79586:d82a978dbb46 parent: 79588:365da47a6dc1 user: Chris Jerdonek date: Sun Oct 07 15:02:16 2012 -0700 files: Misc/NEWS Objects/longobject.c Objects/unicodeobject.c description: Issue #14783: Merge changes from 3.3. diff -r d82a978dbb46 -r 3773c98d9da8 Doc/library/functions.rst --- a/Doc/library/functions.rst Sun Oct 07 23:38:44 2012 +0200 +++ b/Doc/library/functions.rst Sun Oct 07 15:02:16 2012 -0700 @@ -1203,7 +1203,8 @@ .. _func-str: -.. function:: str([object[, encoding[, errors]]]) +.. function:: str(object='') + str(object[, encoding[, errors]]) Return a string version of an object, using one of the following modes: diff -r d82a978dbb46 -r 3773c98d9da8 Misc/NEWS --- a/Misc/NEWS Sun Oct 07 23:38:44 2012 +0200 +++ b/Misc/NEWS Sun Oct 07 15:02:16 2012 -0700 @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #14783: Improve int() docstring and switch docstrings for str(), + range(), and slice() to use multi-line signatures. + - Upgrade Unicode data (UCD) to version 6.2. - Issue #15379: Fix passing of non-BMP characters as integers for the charmap diff -r d82a978dbb46 -r 3773c98d9da8 Objects/longobject.c --- a/Objects/longobject.c Sun Oct 07 23:38:44 2012 +0200 +++ b/Objects/longobject.c Sun Oct 07 15:02:16 2012 -0700 @@ -4847,13 +4847,20 @@ }; PyDoc_STRVAR(long_doc, -"int(x[, base]) -> integer\n\ +"int(x=0) -> integer\n\ +int(x, base=10) -> integer\n\ +\n\ +Convert a number or string to an integer, or return 0 if no arguments\n\ +are given. If x is a number, return x.__int__(). For floating point\n\ +numbers, this truncates towards zero.\n\ \n\ -Convert a string or number to an integer, if possible. A floating\n\ -point argument will be truncated towards zero (this does not include a\n\ -string representation of a floating point number!) When converting a\n\ -string, use the optional base. It is an error to supply a base when\n\ -converting a non-string."); +If x is not a number or if base is given, then x must be a string,\n\ +bytes, or bytearray instance representing an integer literal in the\n\ +given base. The literal can be preceded by '+' or '-' and be surrounded\n\ +by whitespace. The base defaults to 10. Valid bases are 0 and 2-36.\n\ +Base 0 means to interpret the base from the string as an integer literal.\n\ +>>> int('0b100', base=0)\n\ +4"); static PyNumberMethods long_as_number = { (binaryfunc)long_add, /*nb_add*/ diff -r d82a978dbb46 -r 3773c98d9da8 Objects/rangeobject.c --- a/Objects/rangeobject.c Sun Oct 07 23:38:44 2012 +0200 +++ b/Objects/rangeobject.c Sun Oct 07 15:02:16 2012 -0700 @@ -136,7 +136,8 @@ } PyDoc_STRVAR(range_doc, -"range([start,] stop[, step]) -> range object\n\ +"range(stop) -> range object\n\ +range(start, stop[, step]) -> range object\n\ \n\ Returns a virtual sequence of numbers from start to stop by step."); @@ -969,7 +970,7 @@ { PyObject *start=NULL, *stop=NULL, *step=NULL; PyObject *range; - + /* create a range object for pickling */ start = PyLong_FromLong(r->start); if (start == NULL) diff -r d82a978dbb46 -r 3773c98d9da8 Objects/sliceobject.c --- a/Objects/sliceobject.c Sun Oct 07 23:38:44 2012 +0200 +++ b/Objects/sliceobject.c Sun Oct 07 15:02:16 2012 -0700 @@ -269,7 +269,8 @@ } PyDoc_STRVAR(slice_doc, -"slice([start,] stop[, step])\n\ +"slice(stop)\n\ +slice(start, stop[, step])\n\ \n\ Create a slice object. This is used for extended slicing (e.g. a[0:10:2])."); diff -r d82a978dbb46 -r 3773c98d9da8 Objects/unicodeobject.c --- a/Objects/unicodeobject.c Sun Oct 07 23:38:44 2012 +0200 +++ b/Objects/unicodeobject.c Sun Oct 07 15:02:16 2012 -0700 @@ -14133,7 +14133,8 @@ } PyDoc_STRVAR(unicode_doc, - "str(object[, encoding[, errors]]) -> str\n\ +"str(object='') -> str\n\ +str(bytes_or_buffer[, encoding[, errors]]) -> str\n\ \n\ Create a new string object from the given object. If encoding or\n\ errors is specified, then the object must expose a data buffer\n\