[Python-checkins] r46562 - in python/trunk: Lib/test/string_tests.py Objects/stringlib/count.h

[fredrik.lundh]

Author: fredrik.lundh
Date: Tue May 30 19:39:58 2006
New Revision: 46562

Modified:
   python/trunk/Lib/test/string_tests.py
   python/trunk/Objects/stringlib/count.h
Log:
changed count to return 0 for slices outside the source string



Modified: python/trunk/Lib/test/string_tests.py
==============================================================================
--- python/trunk/Lib/test/string_tests.py	(original)
+++ python/trunk/Lib/test/string_tests.py	Tue May 30 19:39:58 2006
@@ -115,7 +115,8 @@
         self.checkequal(2, 'aaa', 'count', 'a', 0, -1)
         self.checkequal(0, 'aaa', 'count', 'a', 0, -10)
         self.checkequal(3, 'aaa', 'count', '', 1)
-        self.checkequal(1, 'aaa', 'count', '', 10)
+        self.checkequal(1, 'aaa', 'count', '', 3)
+        self.checkequal(0, 'aaa', 'count', '', 10)
         self.checkequal(2, 'aaa', 'count', '', -1)
         self.checkequal(4, 'aaa', 'count', '', -10)
 

Modified: python/trunk/Objects/stringlib/count.h
==============================================================================
--- python/trunk/Objects/stringlib/count.h	(original)
+++ python/trunk/Objects/stringlib/count.h	Tue May 30 19:39:58 2006
@@ -15,7 +15,7 @@
 
     if (sub_len == 0) {
         if (str_len < 0)
-            return 1; /* start >= len(str) */
+            return 0; /* start > len(str) */
         return str_len + 1;
     }