[Python-checkins] cpython (merge default -> default): merge

[mark.dickinson]

http://hg.python.org/cpython/rev/205b169c8446
changeset:   77615:205b169c8446
parent:      77614:0e5a698d3c4c
parent:      77613:9cf08b779954
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sat Jun 23 09:28:08 2012 +0100
summary:
  merge

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


diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1437,7 +1437,7 @@
                 "getsockaddrarg: port must be 0-65535.");
             return 0;
         }
-        if (flowinfo < 0 || flowinfo > 0xfffff) {
+        if (flowinfo > 0xfffff) {
             PyErr_SetString(
                 PyExc_OverflowError,
                 "getsockaddrarg: flowinfo must be 0-1048575.");
@@ -5119,7 +5119,7 @@
     if (!PyArg_ParseTuple(sa, "si|II",
                           &hostp, &port, &flowinfo, &scope_id))
         return NULL;
-    if (flowinfo < 0 || flowinfo > 0xfffff) {
+    if (flowinfo > 0xfffff) {
         PyErr_SetString(PyExc_OverflowError,
                         "getsockaddrarg: flowinfo must be 0-1048575.");
         return NULL;

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