diff options
| author | Christian Heimes <christian@cheimes.de> | 2013-07-25 09:47:25 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2013-07-25 09:47:25 (GMT) |
| commit | 7c8cd257e4bb2f6bda56d65e2445828c096babd5 (patch) | |
| tree | d8c39d33dcf395cd5d46248364afd9249544f4cd | |
| parent | 99f969e7c7fd2fd39441e802461c5aee9b6cef9b (diff) | |
| parent | 9228837e310cf37f5d2ce662fcd8d83424ef6fa6 (diff) | |
| download | cpython-7c8cd257e4bb2f6bda56d65e2445828c096babd5.zip cpython-7c8cd257e4bb2f6bda56d65e2445828c096babd5.tar.gz cpython-7c8cd257e4bb2f6bda56d65e2445828c096babd5.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
@@ -166,6 +166,8 @@ Core and Builtins Library ------- +- Issue #18549: Eliminate dead code in socket_ntohl() + - Issue #18530: Remove additional stat call from posixpath.ismount. Patch by Alex Gaynor. diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 0fd14ab..1e2e84f 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -4663,8 +4663,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)); } |