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

[raymond.hettinger]

http://hg.python.org/cpython/rev/55c55bfe237b
changeset:   85167:55c55bfe237b
parent:      85164:b0cc8c9ab912
parent:      85166:8f9bc9283400
user:        Raymond Hettinger <python at rcn.com>
date:        Tue Aug 13 18:20:55 2013 -0700
summary:
  merge

files:
  Objects/stringlib/eq.h |  9 ---------
  1 files changed, 0 insertions(+), 9 deletions(-)


diff --git a/Objects/stringlib/eq.h b/Objects/stringlib/eq.h
--- a/Objects/stringlib/eq.h
+++ b/Objects/stringlib/eq.h
@@ -20,15 +20,6 @@
         return 1;
     if (PyUnicode_KIND(a) != PyUnicode_KIND(b))
         return 0;
-    /* Just comparing the first byte is enough to see if a and b differ.
-     * If they are 2 byte or 4 byte character most differences will happen in
-     * the lower bytes anyways.
-     */
-    if (PyUnicode_1BYTE_DATA(a)[0] != PyUnicode_1BYTE_DATA(b)[0])
-        return 0;
-    if (PyUnicode_KIND(a) == PyUnicode_1BYTE_KIND &&
-        PyUnicode_GET_LENGTH(a) == 1)
-        return 1;
     return memcmp(PyUnicode_1BYTE_DATA(a), PyUnicode_1BYTE_DATA(b),
                   PyUnicode_GET_LENGTH(a) * PyUnicode_KIND(a)) == 0;
 }

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