Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
cb39d1f4
Commit
cb39d1f4
authored
Apr 15, 2015
by
Steve Dower
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue 19933: Provide default argument for ndigits in round. Patch by Vajrasky Kok.
parent
807b80d4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
4 deletions
+16
-4
Doc/library/functions.rst
Doc/library/functions.rst
+2
-2
Lib/test/test_float.py
Lib/test/test_float.py
+8
-0
Misc/NEWS
Misc/NEWS
+3
-0
Objects/floatobject.c
Objects/floatobject.c
+3
-2
No files found.
Doc/library/functions.rst
View file @
cb39d1f4
...
...
@@ -1225,8 +1225,8 @@ are always available. They are listed here in alphabetical order.
.. function:: round(number[, ndigits])
Return the floating point value *number* rounded to *ndigits* digits after
the decimal point. If *ndigits* is omitted, it
defaults to zero. Delegates
to ``number.__round__(ndigits)``.
the decimal point. If *ndigits* is omitted, it
returns the nearest integer
to
its input. Delegates to
``number.__round__(ndigits)``.
For the built-in types supporting :func:`round`, values are rounded to the
closest multiple of 10 to the power minus *ndigits*; if two multiples are
...
...
Lib/test/test_float.py
View file @
cb39d1f4
...
...
@@ -773,6 +773,14 @@ class RoundTestCase(unittest.TestCase):
test
(
sfmt
,
NAN
,
' nan'
)
test
(
sfmt
,
-
NAN
,
' nan'
)
def
test_None_ndigits
(
self
):
for
x
in
round
(
1.23
),
round
(
1.23
,
None
),
round
(
1.23
,
ndigits
=
None
):
self
.
assertEqual
(
x
,
1
)
self
.
assertIsInstance
(
x
,
int
)
for
x
in
round
(
1.78
),
round
(
1.78
,
None
),
round
(
1.78
,
ndigits
=
None
):
self
.
assertEqual
(
x
,
2
)
self
.
assertIsInstance
(
x
,
int
)
# Beginning with Python 2.6 float has cross platform compatible
# ways to create and represent inf and nan
...
...
Misc/NEWS
View file @
cb39d1f4
...
...
@@ -36,6 +36,9 @@ Core and Builtins
Library
-------
- Issue 19933: Provide default argument for ndigits in round. Patch by
Vajrasky Kok.
- Issue #23193: Add a numeric_owner parameter to
tarfile.TarFile.extract and tarfile.TarFile.extractall. Patch by
Michael Vogt and Eric Smith.
...
...
Objects/floatobject.c
View file @
cb39d1f4
...
...
@@ -986,8 +986,9 @@ float_round(PyObject *v, PyObject *args)
x
=
PyFloat_AsDouble
(
v
);
if
(
!
PyArg_ParseTuple
(
args
,
"|O"
,
&
o_ndigits
))
return
NULL
;
if
(
o_ndigits
==
NULL
)
{
/* single-argument round: round to nearest integer */
if
(
o_ndigits
==
NULL
||
o_ndigits
==
Py_None
)
{
/* single-argument round or with None ndigits:
* round to nearest integer */
rounded
=
round
(
x
);
if
(
fabs
(
x
-
rounded
)
==
0
.
5
)
/* halfway case: round to even */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment