From 7488c79b600cd173b0ccea13adb567d078e7b835 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Thu, 10 May 2018 07:38:20 -0700 Subject: [PATCH] bpo-26701: Tweak the documentation for special methods in int(). (GH-6741) (cherry picked from commit df00f048250b9a07195b0e3b1c5c0161fdcc9db8) Co-authored-by: Serhiy Storchaka --- Doc/library/functions.rst | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index 56c1377d173..94675c1aa83 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -657,8 +657,8 @@ are always available. They are listed here in alphabetical order. .. function:: hex(x) Convert an integer number to a lowercase hexadecimal string prefixed with - "0x". If x is not a Python :class:`int` object, it has to define an - __index__() method that returns an integer. Some examples: + "0x". If *x* is not a Python :class:`int` object, it has to define an + :meth:`__index__` method that returns an integer. Some examples: >>> hex(255) '0xff' @@ -716,12 +716,10 @@ are always available. They are listed here in alphabetical order. int(x, base=10) Return an integer object constructed from a number or string *x*, or return - ``0`` if no arguments are given. If *x* is a number, return - :meth:`x.__int__() `. If *x* defines - :meth:`x.__trunc__() ` but not - :meth:`x.__int__() `, then return - :meth:`x.__trunc__() `. For floating point numbers, - this truncates towards zero. + ``0`` if no arguments are given. If *x* defines :meth:`__int__`, + ``int(x)`` returns ``x.__int__()``. If *x* defines :meth:`__trunc__`, + it returns ``x.__trunc__()``. + For floating point numbers, this truncates towards zero. If *x* is not a number or if *base* is given, then *x* must be a string, :class:`bytes`, or :class:`bytearray` instance representing an :ref:`integer