From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 4 Nov 2013 10:27:14 +0000 (+0100)
Subject: Issue #16286: remove duplicated identity check from unicode_compare()
X-Git-Tag: v3.4.0b1~399
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0c7b2af0552a4810aa4f879ca90b2706350d192;p=thirdparty%2FPython%2Fcpython.git

Issue #16286: remove duplicated identity check from unicode_compare()

Move the test to PyUnicode_Compare()
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index f0aff5f16ae5..154103dfea31 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -10428,10 +10428,6 @@ unicode_compare(PyObject *str1, PyObject *str2)
     void *data1, *data2;
     Py_ssize_t len1, len2, len;
 
-    /* a string is equal to itself */
-    if (str1 == str2)
-        return 0;
-
     kind1 = PyUnicode_KIND(str1);
     kind2 = PyUnicode_KIND(str2);
     data1 = PyUnicode_DATA(str1);
@@ -10555,6 +10551,11 @@ PyUnicode_Compare(PyObject *left, PyObject *right)
         if (PyUnicode_READY(left) == -1 ||
             PyUnicode_READY(right) == -1)
             return -1;
+
+        /* a string is equal to itself */
+        if (left == right)
+            return 0;
+
         return unicode_compare(left, right);
     }
     PyErr_Format(PyExc_TypeError,