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

[victor.stinner]

https://hg.python.org/cpython/rev/90681462f16a
changeset:   103986:90681462f16a
parent:      103983:b355c4c380f5
parent:      103985:50cbc3100475
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Sep 21 14:14:59 2016 +0200
summary:
  Merge 3.6

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


diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -2896,7 +2896,7 @@
                         "PyUnicode_FromFormatV() expects an ASCII-encoded format "
                         "string, got a non-ASCII byte: 0x%02x",
                         (unsigned char)*p);
-                    return NULL;
+                    goto fail;
                 }
                 p++;
             }

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