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

[benjamin.peterson]

https://hg.python.org/cpython/rev/1eaf53ab4faa
changeset:   95354:1eaf53ab4faa
parent:      95351:65ac8e587bb0
parent:      95352:47451f6e7e75
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Apr 01 12:37:34 2015 -0400
summary:
  merge 3.4

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


diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -5429,7 +5429,8 @@
         goto err;
     }
 
-    if ((all = PyList_New(0)) == NULL)
+    all = PyList_New(0);
+    if (all == NULL)
         goto err;
     for (res = res0; res; res = res->ai_next) {
         PyObject *single;

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