Issue #17576: Removed deprecation warnings added in changeset 618cca51a27e.

diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_getargs2.py
index 79eb6399f41a0f5935aaf31e87a506665f8b77e8..715b5c6a32e1894f873c1892c967e856c1594a25 100644 (file)
--- a/Lib/test/test_getargs2.py
+++ b/Lib/test/test_getargs2.py
@@ -75,8 +75,7 @@ class Unsigned_TestCase(unittest.TestCase):
         self.assertEqual(99, getargs_b(Int()))
         self.assertEqual(0, getargs_b(IntSubclass()))
         self.assertRaises(TypeError, getargs_b, BadInt())
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(1, getargs_b(BadInt2()))
+        self.assertEqual(1, getargs_b(BadInt2()))
         self.assertEqual(0, getargs_b(BadInt3()))
 
         self.assertRaises(OverflowError, getargs_b, -1)
@@ -94,8 +93,7 @@ class Unsigned_TestCase(unittest.TestCase):
         self.assertEqual(99, getargs_B(Int()))
         self.assertEqual(0, getargs_B(IntSubclass()))
         self.assertRaises(TypeError, getargs_B, BadInt())
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(1, getargs_B(BadInt2()))
+        self.assertEqual(1, getargs_B(BadInt2()))
         self.assertEqual(0, getargs_B(BadInt3()))
 
         self.assertEqual(UCHAR_MAX, getargs_B(-1))
@@ -113,8 +111,7 @@ class Unsigned_TestCase(unittest.TestCase):
         self.assertEqual(99, getargs_H(Int()))
         self.assertEqual(0, getargs_H(IntSubclass()))
         self.assertRaises(TypeError, getargs_H, BadInt())
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(1, getargs_H(BadInt2()))
+        self.assertEqual(1, getargs_H(BadInt2()))
         self.assertEqual(0, getargs_H(BadInt3()))
 
         self.assertEqual(USHRT_MAX, getargs_H(-1))
@@ -133,8 +130,7 @@ class Unsigned_TestCase(unittest.TestCase):
         self.assertEqual(99, getargs_I(Int()))
         self.assertEqual(0, getargs_I(IntSubclass()))
         self.assertRaises(TypeError, getargs_I, BadInt())
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(1, getargs_I(BadInt2()))
+        self.assertEqual(1, getargs_I(BadInt2()))
         self.assertEqual(0, getargs_I(BadInt3()))
 
         self.assertEqual(UINT_MAX, getargs_I(-1))
@@ -174,8 +170,7 @@ class Signed_TestCase(unittest.TestCase):
         self.assertEqual(99, getargs_h(Int()))
         self.assertEqual(0, getargs_h(IntSubclass()))
         self.assertRaises(TypeError, getargs_h, BadInt())
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(1, getargs_h(BadInt2()))
+        self.assertEqual(1, getargs_h(BadInt2()))
         self.assertEqual(0, getargs_h(BadInt3()))
 
         self.assertRaises(OverflowError, getargs_h, SHRT_MIN-1)
@@ -193,8 +188,7 @@ class Signed_TestCase(unittest.TestCase):
         self.assertEqual(99, getargs_i(Int()))
         self.assertEqual(0, getargs_i(IntSubclass()))
         self.assertRaises(TypeError, getargs_i, BadInt())
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(1, getargs_i(BadInt2()))
+        self.assertEqual(1, getargs_i(BadInt2()))
         self.assertEqual(0, getargs_i(BadInt3()))
 
         self.assertRaises(OverflowError, getargs_i, INT_MIN-1)
@@ -212,8 +206,7 @@ class Signed_TestCase(unittest.TestCase):
         self.assertEqual(99, getargs_l(Int()))
         self.assertEqual(0, getargs_l(IntSubclass()))
         self.assertRaises(TypeError, getargs_l, BadInt())
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(1, getargs_l(BadInt2()))
+        self.assertEqual(1, getargs_l(BadInt2()))
         self.assertEqual(0, getargs_l(BadInt3()))
 
         self.assertRaises(OverflowError, getargs_l, LONG_MIN-1)
@@ -254,8 +247,7 @@ class LongLong_TestCase(unittest.TestCase):
         self.assertEqual(99, getargs_L(Int()))
         self.assertEqual(0, getargs_L(IntSubclass()))
         self.assertRaises(TypeError, getargs_L, BadInt())
-        with self.assertWarns(DeprecationWarning):
-            self.assertEqual(1, getargs_L(BadInt2()))
+        self.assertEqual(1, getargs_L(BadInt2()))
         self.assertEqual(0, getargs_L(BadInt3()))
 
         self.assertRaises(OverflowError, getargs_L, LLONG_MIN-1)

diff --git a/Lib/test/test_index.py b/Lib/test/test_index.py
index a2ac32132e23432c5d0ee9d9e627bc25575b6ec7..87857119e1dbec69d503c804ff3d44f898107ec7 100644 (file)
--- a/Lib/test/test_index.py
+++ b/Lib/test/test_index.py
@@ -81,8 +81,7 @@ class BaseTestCase(unittest.TestCase):
                 return True
 
         bad_int = BadInt()
-        with self.assertWarns(DeprecationWarning):
-            n = operator.index(bad_int)
+        n = operator.index(bad_int)
         self.assertEqual(n, 1)
 
         bad_int = BadInt2()

diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py
index a4487bc8c453c813e482b381b7212deb00f8f2da..c489510537ebcd4b1c2176af813dfaabc66cf0ab 100644 (file)
--- a/Lib/test/test_int.py
+++ b/Lib/test/test_int.py
@@ -359,18 +359,15 @@ class IntTestCases(unittest.TestCase):
                 return True
 
         bad_int = BadInt()
-        with self.assertWarns(DeprecationWarning):
-            n = int(bad_int)
+        n = int(bad_int)
         self.assertEqual(n, 1)
 
         bad_int = BadInt2()
-        with self.assertWarns(DeprecationWarning):
-            n = int(bad_int)
+        n = int(bad_int)
         self.assertEqual(n, 1)
 
         bad_int = TruncReturnsBadInt()
-        with self.assertWarns(DeprecationWarning):
-            n = int(bad_int)
+        n = int(bad_int)
         self.assertEqual(n, 1)
 
         good_int = TruncReturnsIntSubclass()

diff --git a/Misc/NEWS b/Misc/NEWS
index 462d649d74498f09a9abf98909c6e293628290c9..60e741f8dd173e35a9cbfe9ab976f23ad2c2a8ed 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -19,9 +19,6 @@ Core and Builtins
   contains a frame, and the frame kept a reference to the Python state of the
   destroyed C thread. The crash occurs when a trace function is setup.
 
-- Issue #17576: Deprecation warning emitted now when __int__() or __index__()
-  return not int instance.
-
 - Issue #19932: Fix typo in import.h, missing whitespaces in function prototypes.
 
 - Issue #19729: In str.format(), fix recursive expansion in format spec.

diff --git a/Objects/abstract.c b/Objects/abstract.c
index f776aa975131a334ca8e511e6e2b65a4b940f2b0..124e7664fce5a95263f9228b27e91f40efab97fe 100644 (file)
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1162,15 +1162,6 @@ PyNumber_Index(PyObject *item)
         Py_DECREF(result);
         return NULL;
     }
-    /* Issue #17576: warn if 'result' not of exact type int. */
-    if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
-            "__index__ returned non-int (type %.200s).  "
-            "The ability to return an instance of a strict subclass of int "
-            "is deprecated, and may be removed in a future version of Python.",
-            result->ob_type->tp_name)) {
-        Py_DECREF(result);
-        return NULL;
-    }
     return result;
 }
 

diff --git a/Objects/longobject.c b/Objects/longobject.c
index 29040e60a9f467215d92ba42d343d620aadb6042..4ae22ef31b6eb61f19471164033b6bc48ee81339 100644 (file)
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -153,15 +153,6 @@ _PyLong_FromNbInt(PyObject *integral)
         Py_DECREF(result);
         return NULL;
     }
-    /* Issue #17576: warn if 'result' not of exact type int. */
-    if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1,
-            "__int__ returned non-int (type %.200s).  "
-            "The ability to return an instance of a strict subclass of int "
-            "is deprecated, and may be removed in a future version of Python.",
-            result->ob_type->tp_name)) {
-        Py_DECREF(result);
-        return NULL;
-    }
     return (PyLongObject *)result;
 }