Mailman 3 May 2015 - Python-checkins

cpython (3.5): Issue #24284: The startswith and endswith methods of the str class no longer
by serhiy.storchaka May 31, 2015

May 31, 2015

https://hg.python.org/cpython/rev/a82498f424fe changeset: 96419:a82498f424fe branch: 3.5 parent: 96416:a09cc60d89db user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun May 31 09:15:51 2015 +0300 summary: 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. files: Doc/whatsnew/3.5.rst | 4 ++++ Lib/test/string_tests.py | 6 ++++++ Misc/… [View More]NEWS | 4 ++++ Objects/unicodeobject.c | 6 +++--- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -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 --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -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 --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,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 --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -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); -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython (merge 3.5 -> default): Issue #24284: The startswith and endswith methods of the str class no longer
by serhiy.storchaka May 31, 2015

May 31, 2015

https://hg.python.org/cpython/rev/04162e06323f changeset: 96420:04162e06323f parent: 96417:85c22fe713a3 parent: 96419:a82498f424fe user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun May 31 09:16:13 2015 +0300 summary: 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. files: Doc/whatsnew/3.5.rst | 4 ++++ Lib/test/string_tests.py | 6 +… [View More]+++++ Misc/NEWS | 4 ++++ Objects/unicodeobject.c | 6 +++--- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -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 --git a/Lib/test/string_tests.py b/Lib/test/string_tests.py --- a/Lib/test/string_tests.py +++ b/Lib/test/string_tests.py @@ -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 --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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 --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -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); -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython (2.7): Issue #24264: Fixed buffer overflow in the imageop module.
by serhiy.storchaka May 31, 2015

May 31, 2015

https://hg.python.org/cpython/rev/de0ccaaf2e64 changeset: 96418:de0ccaaf2e64 branch: 2.7 parent: 96415:44590c1b264e user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun May 31 09:05:10 2015 +0300 summary: Issue #24264: Fixed buffer overflow in the imageop module. files: Lib/test/test_imageop.py | 4 +++- Misc/NEWS | 2 ++ Modules/imageop.c | 7 +++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Lib/test/… [View More]

1 0

cpython (3.5): improve section title
by benjamin.peterson May 31, 2015

May 31, 2015

https://hg.python.org/cpython/rev/a09cc60d89db changeset: 96416:a09cc60d89db branch: 3.5 parent: 96413:5f1e24f083c7 user: Benjamin Peterson <benjamin(a)python.org> date: Sun May 31 00:22:42 2015 -0500 summary: improve section title files: Doc/whatsnew/3.5.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -151,8 +151,8 @@ :pep:… [View More]

1 0

cpython (merge 3.5 -> default): merge 3.5
by benjamin.peterson May 31, 2015

May 31, 2015

https://hg.python.org/cpython/rev/85c22fe713a3 changeset: 96417:85c22fe713a3 parent: 96414:9d261141eb0c parent: 96416:a09cc60d89db user: Benjamin Peterson <benjamin(a)python.org> date: Sun May 31 00:22:49 2015 -0500 summary: merge 3.5 files: Doc/whatsnew/3.5.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -151,8 +151,8 @@ :… [View More]

1 0

cpython (2.7): Issue #21853: Fixed the inspect module in unicode disabled build.
by serhiy.storchaka May 31, 2015

May 31, 2015

https://hg.python.org/cpython/rev/44590c1b264e changeset: 96415:44590c1b264e branch: 2.7 parent: 96385:14d1018940cb user: Serhiy Storchaka <storchaka(a)gmail.com> date: Sun May 31 08:01:00 2015 +0300 summary: Issue #21853: Fixed the inspect module in unicode disabled build. files: Lib/inspect.py | 9 +++++++-- Lib/test/test_inspect.py | 10 +++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Lib/inspect.py b/Lib/inspect.… [View More]py --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -969,8 +969,13 @@ assign(varkw, named) elif named: unexpected = next(iter(named)) - if isinstance(unexpected, unicode): - unexpected = unexpected.encode(sys.getdefaultencoding(), 'replace') + try: + unicode + except NameError: + pass + else: + if isinstance(unexpected, unicode): + unexpected = unexpected.encode(sys.getdefaultencoding(), 'replace') raise TypeError("%s() got an unexpected keyword argument '%s'" % (f_name, unexpected)) unassigned = num_args - len([arg for arg in args if is_assigned(arg)]) diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -8,7 +8,7 @@ from UserList import UserList from UserDict import UserDict -from test.test_support import run_unittest, check_py3k_warnings +from test.test_support import run_unittest, check_py3k_warnings, have_unicode with check_py3k_warnings( ("tuple parameter unpacking has been removed", SyntaxWarning), @@ -17,7 +17,10 @@ from test import inspect_fodder2 as mod2 # C module for test_findsource_binary -import unicodedata +try: + import unicodedata +except ImportError: + unicodedata = None # Functions tested in this suite: # ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode, @@ -798,7 +801,8 @@ self.assertEqualException(f, '2, c=3') self.assertEqualException(f, '2, 3, c=4') self.assertEqualException(f, '2, c=4, b=3') - self.assertEqualException(f, '**{u"\u03c0\u03b9": 4}') + if have_unicode: + self.assertEqualException(f, '**{u"\u03c0\u03b9": 4}') # f got multiple values for keyword argument self.assertEqualException(f, '1, a=2') self.assertEqualException(f, '1, **{"a":2}') -- Repository URL: https://hg.python.org/cpython [View Less]

1 0

cpython (3.5): Issue 24004: Add a unittest for @asyncio.coroutine supporting Awaitables
by yury.selivanov May 31, 2015

May 31, 2015

https://hg.python.org/cpython/rev/5f1e24f083c7 changeset: 96413:5f1e24f083c7 branch: 3.5 parent: 96411:d1959cafc68c user: Yury Selivanov <yselivanov(a)sprymix.com> date: Sat May 30 21:04:37 2015 -0400 summary: Issue 24004: Add a unittest for @asyncio.coroutine supporting Awaitables files: Lib/test/test_asyncio/test_pep492.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_asyncio/test_pep492.py b/Lib/test/… [View More]

1 0

cpython (merge 3.5 -> default): Issue 24004: Add a unittest for @asyncio.coroutine supporting Awaitables
by yury.selivanov May 31, 2015

May 31, 2015

https://hg.python.org/cpython/rev/9d261141eb0c changeset: 96414:9d261141eb0c parent: 96412:6c53591d589b parent: 96413:5f1e24f083c7 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Sat May 30 21:04:58 2015 -0400 summary: Issue 24004: Add a unittest for @asyncio.coroutine supporting Awaitables (Merge 3.5) files: Lib/test/test_asyncio/test_pep492.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/Lib/test/… [View More]

1 0

cpython (merge 3.5 -> default): Issue 24004: Support Awaitables (pep 492) in @asyncio.coroutine decorator
by yury.selivanov May 31, 2015

May 31, 2015

https://hg.python.org/cpython/rev/6c53591d589b changeset: 96412:6c53591d589b parent: 96409:673dc0b8a402 parent: 96411:d1959cafc68c user: Yury Selivanov <yselivanov(a)sprymix.com> date: Sat May 30 21:02:49 2015 -0400 summary: Issue 24004: Support Awaitables (pep 492) in @asyncio.coroutine decorator (Merge 3.5) files: Lib/asyncio/coroutines.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Lib/asyncio/coroutines.py b/… [View More]

1 0

cpython (3.4): Issue 24004: Support Awaitables (pep 492) in @asyncio.coroutine decorator
by yury.selivanov May 31, 2015

May 31, 2015

https://hg.python.org/cpython/rev/b7b73029c825 changeset: 96410:b7b73029c825 branch: 3.4 parent: 96390:943fa0e8b6a4 user: Yury Selivanov <yselivanov(a)sprymix.com> date: Sat May 30 21:02:12 2015 -0400 summary: Issue 24004: Support Awaitables (pep 492) in @asyncio.coroutine decorator files: Lib/asyncio/coroutines.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Lib/asyncio/coroutines.py b/Lib/asyncio/coroutines.py ---… [View More]

1 0