Browse Source

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

CID 982369
pull/224/head
Christian Heimes 13 years ago
parent
commit
9228837e31
  1. 2
      Misc/NEWS
  2. 2
      Modules/socketmodule.c

2
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 +

2
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));
}

Loading…
Cancel
Save