Skip to content

Commit e898153

Browse files
committed
python#19069: merge with 3.3.
2 parents c1ae254 + 7760b4e commit e898153

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

‎Objects/floatobject.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,9 +1498,9 @@ float_as_integer_ratio(PyObject *v, PyObject *unused)
14981498
PyDoc_STRVAR(float_as_integer_ratio_doc,
14991499
"float.as_integer_ratio() -> (int, int)\n"
15001500
"\n"
1501-
"Returns a pair of integers, whose ratio is exactly equal to the original\n"
1501+
"Return a pair of integers, whose ratio is exactly equal to the original\n"
15021502
"float and with a positive denominator.\n"
1503-
"Raises OverflowError on infinities and a ValueError on NaNs.\n"
1503+
"Raise OverflowError on infinities and a ValueError on NaNs.\n"
15041504
"\n"
15051505
">>> (10.0).as_integer_ratio()\n"
15061506
"(10, 1)\n"
@@ -1687,7 +1687,7 @@ PyDoc_STRVAR(float_setformat_doc,
16871687
"'IEEE, big-endian' or 'IEEE, little-endian', and in addition can only be\n"
16881688
"one of the latter two if it appears to match the underlying C reality.\n"
16891689
"\n"
1690-
"Overrides the automatic determination of C-level floating point type.\n"
1690+
"Override the automatic determination of C-level floating point type.\n"
16911691
"This affects how floats are converted to and from binary strings.");
16921692

16931693
static PyObject *
@@ -1726,27 +1726,27 @@ PyDoc_STRVAR(float__format__doc,
17261726

17271727
static PyMethodDef float_methods[] = {
17281728
{"conjugate", (PyCFunction)float_float, METH_NOARGS,
1729-
"Returns self, the complex conjugate of any float."},
1729+
"Return self, the complex conjugate of any float."},
17301730
{"__trunc__", (PyCFunction)float_trunc, METH_NOARGS,
1731-
"Returns the Integral closest to x between 0 and x."},
1731+
"Return the Integral closest to x between 0 and x."},
17321732
{"__round__", (PyCFunction)float_round, METH_VARARGS,
1733-
"Returns the Integral closest to x, rounding half toward even.\n"
1734-
"When an argument is passed, works like built-in round(x, ndigits)."},
1733+
"Return the Integral closest to x, rounding half toward even.\n"
1734+
"When an argument is passed, work like built-in round(x, ndigits)."},
17351735
{"as_integer_ratio", (PyCFunction)float_as_integer_ratio, METH_NOARGS,
17361736
float_as_integer_ratio_doc},
17371737
{"fromhex", (PyCFunction)float_fromhex,
17381738
METH_O|METH_CLASS, float_fromhex_doc},
17391739
{"hex", (PyCFunction)float_hex,
17401740
METH_NOARGS, float_hex_doc},
17411741
{"is_integer", (PyCFunction)float_is_integer, METH_NOARGS,
1742-
"Returns True if the float is an integer."},
1742+
"Return True if the float is an integer."},
17431743
#if 0
17441744
{"is_inf", (PyCFunction)float_is_inf, METH_NOARGS,
1745-
"Returns True if the float is positive or negative infinite."},
1745+
"Return True if the float is positive or negative infinite."},
17461746
{"is_finite", (PyCFunction)float_is_finite, METH_NOARGS,
1747-
"Returns True if the float is finite, neither infinite nor NaN."},
1747+
"Return True if the float is finite, neither infinite nor NaN."},
17481748
{"is_nan", (PyCFunction)float_is_nan, METH_NOARGS,
1749-
"Returns True if the float is not a number (NaN)."},
1749+
"Return True if the float is not a number (NaN)."},
17501750
#endif
17511751
{"__getnewargs__", (PyCFunction)float_getnewargs, METH_NOARGS},
17521752
{"__getformat__", (PyCFunction)float_getformat,

0 commit comments

Comments
 (0)