diff options
| author | Christian Heimes <christian@cheimes.de> | 2013-07-25 09:46:10 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2013-07-25 09:46:10 (GMT) |
| commit | 9228837e310cf37f5d2ce662fcd8d83424ef6fa6 (patch) | |
| tree | 2d4876d146aa5aa03164184bc67aa6f9b81c9354 | |
| parent | b042daa5a7fae86f6dc9c568970ce4c57ea403e2 (diff) | |
| download | cpython-9228837e310cf37f5d2ce662fcd8d83424ef6fa6.zip cpython-9228837e310cf37f5d2ce662fcd8d83424ef6fa6.tar.gz cpython-9228837e310cf37f5d2ce662fcd8d83424ef6fa6.tar.bz2 | |
Issue #18549: Eliminate dead code in socket_ntohl().
CID 982369
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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)); } |