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

[benjamin.peterson]

https://hg.python.org/cpython/rev/9a4b64a0926c
changeset:   104025:9a4b64a0926c
parent:      104023:15f82b64eee0
parent:      104024:8b7c309a53ac
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Sep 22 23:40:08 2016 -0700
summary:
  merge 3.6

files:
  Objects/abstract.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Objects/abstract.c b/Objects/abstract.c
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -2687,7 +2687,7 @@
 
     n = 0;
     while (1) {
-        PyObject *arg = (PyObject *)va_arg(countva, PyObject *);
+        PyObject *arg = va_arg(countva, PyObject *);
         if (arg == NULL) {
             break;
         }

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