Merge

rhettinger · rhettinger · commit 3b09cd64e0a7 · 2016-09-03T01:55:39.000-07:00
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
@@ -3,6 +3,8 @@
 import ast
 import builtins
 import collections
+import decimal
+import fractions
 import io
 import locale
 import os
@@ -1244,6 +1246,15 @@ def test_round_large(self):
         self.assertEqual(round(5e15+2), 5e15+2)
         self.assertEqual(round(5e15+3), 5e15+3)
 
+    def test_bug_27936(self):
+        # Verify that ndigits=None means the same as passing in no argument
+        for x in [1234,
+                  1234.56,
+                  decimal.Decimal('1234.56'),
+                  fractions.Fraction(123456, 100)]:
+            self.assertEqual(round(x, None), round(x))
+            self.assertEqual(type(round(x, None)), type(round(x)))
+
     def test_setattr(self):
         setattr(sys, 'spam', 1)
         self.assertEqual(sys.spam, 1)
diff --git a/Lib/test/test_long.py b/Lib/test/test_long.py
@@ -1015,7 +1015,7 @@ def test_round(self):
             self.assertIs(type(got), int)
 
         # bad second argument
-        bad_exponents = ('brian', 2.0, 0j, None)
+        bad_exponents = ('brian', 2.0, 0j)
         for e in bad_exponents:
             self.assertRaises(TypeError, round, 3, e)
 
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -46,6 +46,10 @@ Core and Builtins
   ``m_methods`` field to be used to add module level functions to instances
   of non-module types returned from ``Py_create_mod``. Patch by Xiang Zhang.
 
+- Issue #27936: The round() function accepted a second None argument
+  for some types but not for others.  Fixed the inconsistency by
+  accepting None for all numeric types.
+
 - Issue #27487: Warn if a submodule argument to "python -m" or
   runpy.run_module() is found in sys.modules after parent packages are
   imported, but before the submodule is executed.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -2043,7 +2043,7 @@ builtin_round(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    if (ndigits == NULL)
+    if (ndigits == NULL || ndigits == Py_None)
         result = PyObject_CallFunctionObjArgs(round, NULL);
     else
         result = PyObject_CallFunctionObjArgs(round, ndigits, NULL);

Original file line number	Diff line number	Diff line change
`@@ -2043,7 +2043,7 @@ builtin_round(PyObject self, PyObject args, PyObject *kwds)`
`2043`	`2043`	`return NULL;`
`2044`	`2044`	`}`
`2045`	`2045`
`2046`		`- if (ndigits == NULL)`
	`2046`	`+ if (ndigits == NULL \|\| ndigits == Py_None)`
`2047`	`2047`	`result = PyObject_CallFunctionObjArgs(round, NULL);`
`2048`	`2048`	`else`
`2049`	`2049`	`result = PyObject_CallFunctionObjArgs(round, ndigits, NULL);`