Mercurial > vim
changeset 8328:0a55dd381410 v7.4.1456
commit https://github.com/vim/vim/commit/29e1951e14907b62797554ad0cc85cbbe75a1be4
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Feb 28 20:13:18 2016 +0100
patch 7.4.1456
Problem: Test 87 fails with Python 3.5.
Solution: Work around difference. (Taro Muraoka)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 28 Feb 2016 20:15:04 +0100 |
| parents | a475e36a18e6 |
| children | 105cfd08008e |
| files | src/testdir/test87.in src/version.c |
| diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test87.in +++ b/src/testdir/test87.in @@ -228,6 +228,8 @@ def ee(expr, g=globals(), l=locals()): cb.append(expr + ':' + repr((e.__class__, TypeError(msg)))) else: cb.append(expr + ':' + repr((e.__class__, e))) + elif sys.version_info >= (3, 5) and e.__class__ is ValueError and str(e) == 'embedded null byte': + msg = cb.append(expr + ':' + repr((TypeError, TypeError('expected bytes with no null')))) else: cb.append(expr + ':' + repr((e.__class__, e))) else: @@ -264,13 +266,17 @@ EOF :let messages=[] :delfunction DictNew py3 <<EOF +import sys d=vim.bindeval('{}') m=vim.bindeval('messages') def em(expr, g=globals(), l=locals()): try: exec(expr, g, l) except Exception as e: - m.extend([e.__class__.__name__]) + if sys.version_info >= (3, 5) and e.__class__ is ValueError and str(e) == 'embedded null byte': + m.extend([TypeError.__name__]) + else: + m.extend([e.__class__.__name__]) em('d["abc1"]') em('d["abc1"]="\\0"')