changeset:   96420:04162e06323f
parent:      96417:85c22fe713a3
parent:      96419:a82498f424fe
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Sun May 31 09:16:13 2015 +0300
files:       Doc/whatsnew/3.5.rst Misc/NEWS
description:
Issue #24284: The startswith and endswith methods of the str class no longer
return True when finding the empty string and the indexes are completely out
of range.


diff -r 85c22fe713a3 -r 04162e06323f Doc/whatsnew/3.5.rst
--- a/Doc/whatsnew/3.5.rst	Sun May 31 00:22:49 2015 -0500
+++ b/Doc/whatsnew/3.5.rst	Sun May 31 09:16:13 2015 +0300
@@ -1049,6 +1049,10 @@
   program depends on patching the module level variable to capture the debug
   output, you will need to update it to capture sys.stderr instead.
 
+* The :meth:`str.startswith` and :meth:`str.endswith` methods no longer return
+  ``True`` when finding the empty string and the indexes are completely out of
+  range.  See :issue:`24284`.
+
 Changes in the C API
 --------------------
 
diff -r 85c22fe713a3 -r 04162e06323f Lib/test/string_tests.py
--- a/Lib/test/string_tests.py	Sun May 31 00:22:49 2015 -0500
+++ b/Lib/test/string_tests.py	Sun May 31 09:16:13 2015 +0300
@@ -976,6 +976,9 @@
         self.checkequal(True, 'helloworld', 'startswith', 'lowo', 3)
         self.checkequal(True, 'helloworld', 'startswith', 'lowo', 3, 7)
         self.checkequal(False, 'helloworld', 'startswith', 'lowo', 3, 6)
+        self.checkequal(True, '', 'startswith', '', 0, 1)
+        self.checkequal(True, '', 'startswith', '', 0, 0)
+        self.checkequal(False, '', 'startswith', '', 1, 0)
 
         # test negative indices
         self.checkequal(True, 'hello', 'startswith', 'he', 0, -1)
@@ -1022,6 +1025,9 @@
         self.checkequal(False, 'helloworld', 'endswith', 'lowo', 3, 8)
         self.checkequal(False, 'ab', 'endswith', 'ab', 0, 1)
         self.checkequal(False, 'ab', 'endswith', 'ab', 0, 0)
+        self.checkequal(True, '', 'endswith', '', 0, 1)
+        self.checkequal(True, '', 'endswith', '', 0, 0)
+        self.checkequal(False, '', 'endswith', '', 1, 0)
 
         # test negative indices
         self.checkequal(True, 'hello', 'endswith', 'lo', -2)
diff -r 85c22fe713a3 -r 04162e06323f Misc/NEWS
--- a/Misc/NEWS	Sun May 31 00:22:49 2015 -0500
+++ b/Misc/NEWS	Sun May 31 09:16:13 2015 +0300
@@ -22,6 +22,10 @@
 Core and Builtins
 -----------------
 
+- Issue #24284: The startswith and endswith methods of the str class no longer
+  return True when finding the empty string and the indexes are completely out
+  of range.
+
 - Issue #24115: Update uses of PyObject_IsTrue(), PyObject_Not(),
   PyObject_IsInstance(), PyObject_RichCompareBool() and _PyDict_Contains()
   to check for and handle errors correctly.
diff -r 85c22fe713a3 -r 04162e06323f Objects/unicodeobject.c
--- a/Objects/unicodeobject.c	Sun May 31 00:22:49 2015 -0500
+++ b/Objects/unicodeobject.c	Sun May 31 09:16:13 2015 +0300
@@ -9280,14 +9280,14 @@
         PyUnicode_READY(substring) == -1)
         return -1;
 
-    if (PyUnicode_GET_LENGTH(substring) == 0)
-        return 1;
-
     ADJUST_INDICES(start, end, PyUnicode_GET_LENGTH(self));
     end -= PyUnicode_GET_LENGTH(substring);
     if (end < start)
         return 0;
 
+    if (PyUnicode_GET_LENGTH(substring) == 0)
+        return 1;
+
     kind_self = PyUnicode_KIND(self);
     data_self = PyUnicode_DATA(self);
     kind_sub = PyUnicode_KIND(substring);