From e6b2d4407a120e62cf3f658d46dc5f8f6785977d Mon Sep 17 00:00:00 2001
From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sun, 11 Dec 2011 21:54:30 +0100
Subject: [PATCH] unicode_fromascii() doesn't check string content twice in
 debug mode

_PyUnicode_CheckConsistency() also checks string content.
---
 Objects/unicodeobject.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 8d04ea40cdd..d6a250e30e2 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1768,15 +1768,12 @@ static PyObject*
 unicode_fromascii(const unsigned char* s, Py_ssize_t size)
 {
     PyObject *unicode;
+    if (size == 1) {
 #ifdef Py_DEBUG
-    const unsigned char *p;
-    const unsigned char *end = s + size;
-    for (p=s; p < end; p++) {
-        assert(*p < 128);
-    }
+        assert(s[0] < 128);
 #endif
-    if (size == 1)
         return get_latin1_char(s[0]);
+    }
     unicode = PyUnicode_New(size, 127);
     if (!unicode)
         return NULL;