changeset: 87959:a3de2b3881c1 branch: 3.3 parent: 87957:35f6a5937a63 user: Serhiy Storchaka date: Sat Dec 14 21:07:09 2013 +0200 files: Lib/test/test_getargs2.py Lib/test/test_index.py Lib/test/test_int.py Misc/NEWS Objects/abstract.c Objects/longobject.c description: Issue #17576: Removed deprecation warnings added in changeset 618cca51a27e. diff -r 35f6a5937a63 -r a3de2b3881c1 Lib/test/test_getargs2.py --- a/Lib/test/test_getargs2.py Sat Dec 14 20:35:04 2013 +0200 +++ b/Lib/test/test_getargs2.py Sat Dec 14 21:07:09 2013 +0200 @@ -75,8 +75,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 -r 35f6a5937a63 -r a3de2b3881c1 Lib/test/test_index.py --- a/Lib/test/test_index.py Sat Dec 14 20:35:04 2013 +0200 +++ b/Lib/test/test_index.py Sat Dec 14 21:07:09 2013 +0200 @@ -81,8 +81,7 @@ 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 -r 35f6a5937a63 -r a3de2b3881c1 Lib/test/test_int.py --- a/Lib/test/test_int.py Sat Dec 14 20:35:04 2013 +0200 +++ b/Lib/test/test_int.py Sat Dec 14 21:07:09 2013 +0200 @@ -359,18 +359,15 @@ 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 -r 35f6a5937a63 -r a3de2b3881c1 Misc/NEWS --- a/Misc/NEWS Sat Dec 14 20:35:04 2013 +0200 +++ b/Misc/NEWS Sat Dec 14 21:07:09 2013 +0200 @@ -19,9 +19,6 @@ 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 -r 35f6a5937a63 -r a3de2b3881c1 Objects/abstract.c --- a/Objects/abstract.c Sat Dec 14 20:35:04 2013 +0200 +++ b/Objects/abstract.c Sat Dec 14 21:07:09 2013 +0200 @@ -1162,15 +1162,6 @@ 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 -r 35f6a5937a63 -r a3de2b3881c1 Objects/longobject.c --- a/Objects/longobject.c Sat Dec 14 20:35:04 2013 +0200 +++ b/Objects/longobject.c Sat Dec 14 21:07:09 2013 +0200 @@ -153,15 +153,6 @@ 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; }