From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 28 Dec 2012 08:09:54 +0000 (+0200)
Subject: Issue #16761: Raise TypeError when int() called with base argument only.
X-Git-Tag: v3.4.0a1~1749
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c819b077bb9125db303651a383fb03e68c822084;p=python

Issue #16761: Raise TypeError when int() called with base argument only.
---

c819b077bb9125db303651a383fb03e68c822084
diff --cc Lib/test/test_int.py
index db79926f8f,c35a42f596..09b9a7785b
--- a/Lib/test/test_int.py
+++ b/Lib/test/test_int.py
@@@ -233,41 -233,9 +233,33 @@@ class IntTestCases(unittest.TestCase)
          self.assertEqual(int(x=1.2), 1)
          self.assertEqual(int('100', base=2), 4)
          self.assertEqual(int(x='100', base=2), 4)
- 
-     # For example, PyPy 1.9.0 raised TypeError for these cases because it
-     # expects x to be a string if base is given.
-     @support.cpython_only
-     def test_base_arg_with_no_x_arg(self):
-         self.assertEqual(int(base=6), 0)
-         # Even invalid bases don't raise an exception.
-         self.assertEqual(int(base=1), 0)
-         self.assertEqual(int(base=1000), 0)
-         self.assertEqual(int(base='foo'), 0)
+         self.assertRaises(TypeError, int, base=10)
+         self.assertRaises(TypeError, int, base=0)
  
 +    def test_int_base_limits(self):
 +        """Testing the supported limits of the int() base parameter."""
 +        self.assertEqual(int('0', 5), 0)
 +        with self.assertRaises(ValueError):
 +            int('0', 1)
 +        with self.assertRaises(ValueError):
 +            int('0', 37)
 +        with self.assertRaises(ValueError):
 +            int('0', -909)  # An old magic value base from Python 2.
 +        with self.assertRaises(ValueError):
 +            int('0', base=0-(2**234))
 +        with self.assertRaises(ValueError):
 +            int('0', base=2**234)
 +        # Bases 2 through 36 are supported.
 +        for base in range(2,37):
 +            self.assertEqual(int('0', base=base), 0)
 +
 +    def test_int_base_bad_types(self):
 +        """Not integer types are not valid bases; issue16772."""
 +        with self.assertRaises(TypeError):
 +            int('0', 5.5)
 +        with self.assertRaises(TypeError):
 +            int('0', 5.0)
 +
      def test_non_numeric_input_types(self):
          # Test possible non-numeric types for the argument x, including
          # subclasses of the explicitly documented accepted types.
diff --cc Objects/longobject.c
index 49e9d5d915,9535830658..5a50f24330
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@@ -4255,22 -4267,23 +4255,28 @@@ long_new(PyTypeObject *type, PyObject *
      if (!PyArg_ParseTupleAndKeywords(args, kwds, "|OO:int", kwlist,
                                       &x, &obase))
          return NULL;
-     if (x == NULL)
+     if (x == NULL) {
+         if (obase != NULL) {
+             PyErr_SetString(PyExc_TypeError,
+                             "int() missing string argument");
+             return NULL;
+         }
          return PyLong_FromLong(0L);
+     }
      if (obase == NULL)
          return PyNumber_Long(x);
 +    if (!PyLong_Check(obase)) {
 +        PyErr_SetString(PyExc_TypeError,
-                         "int() arg 2 must be an integer.");
++                        "int() base must be an integer.");
 +        return NULL;
 +    }
  
 -    base = PyLong_AsLongAndOverflow(obase, &overflow);
 +    base = PyNumber_AsSsize_t(obase, NULL);
      if (base == -1 && PyErr_Occurred())
          return NULL;
 -    if (overflow || (base != 0 && base < 2) || base > 36) {
 +    if ((base != 0 && base < 2) || base > 36) {
          PyErr_SetString(PyExc_ValueError,
-                         "int() arg 2 must be >= 2 and <= 36");
+                         "int() base must be >= 2 and <= 36");
          return NULL;
      }