From 9228837e310cf37f5d2ce662fcd8d83424ef6fa6 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Thu, 25 Jul 2013 11:46:10 +0200 Subject: Issue #18549: Eliminate dead code in socket_ntohl(). CID 982369 --- Misc/NEWS | 2 ++ Modules/socketmodule.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 85238f6..7880adb 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -52,6 +52,8 @@ Core and Builtins Library ------- +- Issue #18549: Eliminate dead code in socket_ntohl() + - Issue #18514: Fix unreachable Py_DECREF() call in PyCData_FromBaseObj() - Issue #18513: Fix behaviour of cmath.rect w.r.t. signed zeros on OS X 10.8 + diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 2c8a29c..1202d38 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -4702,8 +4702,6 @@ socket_ntohl(PyObject *self, PyObject *arg) return PyErr_Format(PyExc_TypeError, "expected int/long, %s found", Py_TYPE(arg)->tp_name); - if (x == (unsigned long) -1 && PyErr_Occurred()) - return NULL; return PyLong_FromUnsignedLong(ntohl(x)); } -- cgit v0.12