bpo-42393: Raise OverflowError iso. DeprecationWarning on overflow in socket.ntohs and socket.htons (GH-23980)
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
index e4af713..bc28030 100755
--- a/Lib/test/test_socket.py
+++ b/Lib/test/test_socket.py
@@ -1121,9 +1121,11 @@ def testNtoHErrors(self):
s_good_values = [0, 1, 2, 0xffff]
l_good_values = s_good_values + [0xffffffff]
l_bad_values = [-1, -2, 1<<32, 1<<1000]
- s_bad_values = l_bad_values + [_testcapi.INT_MIN - 1,
- _testcapi.INT_MAX + 1]
- s_deprecated_values = [1<<16, _testcapi.INT_MAX]
+ s_bad_values = (
+ l_bad_values +
+ [_testcapi.INT_MIN-1, _testcapi.INT_MAX+1] +
+ [1 << 16, _testcapi.INT_MAX]
+ )
for k in s_good_values:
socket.ntohs(k)
socket.htons(k)
@@ -1136,9 +1138,6 @@ def testNtoHErrors(self):
for k in l_bad_values:
self.assertRaises(OverflowError, socket.ntohl, k)
self.assertRaises(OverflowError, socket.htonl, k)
- for k in s_deprecated_values:
- self.assertWarns(DeprecationWarning, socket.ntohs, k)
- self.assertWarns(DeprecationWarning, socket.htons, k)
def testGetServBy(self):
eq = self.assertEqual