From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 25 Apr 2010 21:54:00 +0000 (+0000)
Subject: condense condition
X-Git-Tag: v3.2a1~1005
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a23831ff44e0178006a0039d218d60252d5bd755;p=python

condense condition
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index ae401a6b62..3851008a88 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -6784,10 +6784,7 @@ PyUnicode_CompareWithASCIIString(PyObject* uni, const char* str)
             return ((int)id[i] < (int)str[i]) ? -1 : 1;
     /* This check keeps Python strings that end in '\0' from comparing equal
      to C strings identical up to that point. */
-    if (PyUnicode_GET_SIZE(uni) != i)
-        /* We'll say the Python string is longer. */
-        return 1;
-    if (id[i])
+    if (PyUnicode_GET_SIZE(uni) != i || id[i])
         return 1; /* uni is longer */
     if (str[i])
         return -1; /* str is longer */