[Python-checkins] cpython (merge 3.3 -> default): Issue #18549: Eliminate dead code in socket_ntohl().

[christian.heimes]

http://hg.python.org/cpython/rev/2a59428dbff5
changeset:   84817:2a59428dbff5
parent:      84815:1d0ff57e392e
parent:      84816:b7ea3f94f6ca
user:        Christian Heimes <christian at cheimes.de>
date:        Thu Jul 25 11:47:25 2013 +0200
summary:
  Issue #18549: Eliminate dead code in socket_ntohl().
CID 982369

files:
  Misc/NEWS              |  2 ++
  Modules/socketmodule.c |  2 --
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -166,6 +166,8 @@
 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
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -4663,8 +4663,6 @@
         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));
 }
 

-- 
Repository URL: http://hg.python.org/cpython