Issue #18549: Eliminate dead code in socket_ntohl().

CID 982369
This commit is contained in:
Christian Heimes 2013-07-25 11:47:25 +02:00
commit 7c8cd257e4
2 changed files with 2 additions and 2 deletions

View File

@ -166,6 +166,8 @@ Core and Builtins
Library Library
------- -------
- Issue #18549: Eliminate dead code in socket_ntohl()
- Issue #18530: Remove additional stat call from posixpath.ismount. - Issue #18530: Remove additional stat call from posixpath.ismount.
Patch by Alex Gaynor. Patch by Alex Gaynor.

View File

@ -4663,8 +4663,6 @@ socket_ntohl(PyObject *self, PyObject *arg)
return PyErr_Format(PyExc_TypeError, return PyErr_Format(PyExc_TypeError,
"expected int/long, %s found", "expected int/long, %s found",
Py_TYPE(arg)->tp_name); Py_TYPE(arg)->tp_name);
if (x == (unsigned long) -1 && PyErr_Occurred())
return NULL;
return PyLong_FromUnsignedLong(ntohl(x)); return PyLong_FromUnsignedLong(ntohl(x));
} }