address review: exceptions

Author: skirpichev

Lib/test/test_long.py

@@ -708,8 +708,8 @@ def test__format__(self):
         self.assertEqual(format(1234567890, '_x'), '4996_02d2')
         self.assertEqual(format(1234567890, '_X'), '4996_02D2')
         self.assertEqual(format(8086, '#.8x'), '0x00001f96')
-        self.assertRaises(OverflowError, format, 2048, '.3x')
-        self.assertRaises(OverflowError, format, -2049, '.3x')
+        self.assertRaises(ValueError, format, 2048, '.3x')
+        self.assertRaises(ValueError, format, -2049, '.3x')
 
         # octal
         self.assertEqual(format(3, "o"), "3")
@@ -725,8 +725,8 @@ def test__format__(self):
         self.assertRaises(ValueError, format, 1234567890, ',o')
         self.assertEqual(format(1234567890, '_o'), '111_4540_1322')
         self.assertEqual(format(18, '#.3o'), '0o022')
-        self.assertRaises(OverflowError, format, 256, '.3o')
-        self.assertRaises(OverflowError, format, -257, '.3o')
+        self.assertRaises(ValueError, format, 256, '.3o')
+        self.assertRaises(ValueError, format, -257, '.3o')
 
         # binary
         self.assertEqual(format(3, "b"), "11")
@@ -744,10 +744,10 @@ def test__format__(self):
         self.assertEqual(format(-12, '.8b'), '11110100')
         self.assertEqual(format(73, '.8b'), '01001001')
         self.assertEqual(format(73, '#.8b'), '0b01001001')
-        self.assertRaises(OverflowError, format, 300, '.8b')
-        self.assertRaises(OverflowError, format, -200, '.8b')
-        self.assertRaises(OverflowError, format, 128, '.8b')
-        self.assertRaises(OverflowError, format, -129, '.8b')
+        self.assertRaises(ValueError, format, 300, '.8b')
+        self.assertRaises(ValueError, format, -200, '.8b')
+        self.assertRaises(ValueError, format, 128, '.8b')
+        self.assertRaises(ValueError, format, -129, '.8b')
 
         # make sure these are errors
         self.assertRaises(ValueError, format, 3, "_c")   # underscore,

Python/formatter_unicode.c

@@ -1105,8 +1105,8 @@ format_long_internal(PyObject *value, const InternalFormatSpec *format,
                     Py_SETREF(mod2, value2);
                     if (PyObject_RichCompareBool(value, mod2, Py_LT)) {
                         Py_DECREF(mod2);
-                        PyErr_Format(PyExc_OverflowError,
-                                     "Expected integer in range [-2**%ld, 2**%ld)",
+                        PyErr_Format(PyExc_ValueError,
+                                     "Expected integer in range(-2**%ld, 2**%ld)",
                                      shift - 1, shift - 1);
                         goto done;
                     }
@@ -1121,8 +1121,8 @@ format_long_internal(PyObject *value, const InternalFormatSpec *format,
                     if (PyObject_RichCompareBool(value2, mod2, Py_GE)) {
                         Py_DECREF(mod);
                         Py_DECREF(mod2);
-                        PyErr_Format(PyExc_OverflowError,
-                                     "Expected integer in range [-2**%ld, 2**%ld)",
+                        PyErr_Format(PyExc_ValueError,
+                                     "Expected integer in range(-2**%ld, 2**%ld)",
                                      shift - 1, shift - 1);
                         goto done;
                     }