1
0
forked from aniani/vim

patch 7.4.1456

Problem:    Test 87 fails with Python 3.5.
Solution:   Work around difference. (Taro Muraoka)
This commit is contained in:
Bram Moolenaar
2016-02-28 20:13:18 +01:00
parent fc2457e21d
commit 29e1951e14
2 changed files with 9 additions and 1 deletions

View File

@@ -228,6 +228,8 @@ def ee(expr, g=globals(), l=locals()):
cb.append(expr + ':' + repr((e.__class__, TypeError(msg)))) cb.append(expr + ':' + repr((e.__class__, TypeError(msg))))
else: else:
cb.append(expr + ':' + repr((e.__class__, e))) 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: else:
cb.append(expr + ':' + repr((e.__class__, e))) cb.append(expr + ':' + repr((e.__class__, e)))
else: else:
@@ -264,13 +266,17 @@ EOF
:let messages=[] :let messages=[]
:delfunction DictNew :delfunction DictNew
py3 <<EOF py3 <<EOF
import sys
d=vim.bindeval('{}') d=vim.bindeval('{}')
m=vim.bindeval('messages') m=vim.bindeval('messages')
def em(expr, g=globals(), l=locals()): def em(expr, g=globals(), l=locals()):
try: try:
exec(expr, g, l) exec(expr, g, l)
except Exception as e: 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"]')
em('d["abc1"]="\\0"') em('d["abc1"]="\\0"')

View File

@@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1456,
/**/ /**/
1455, 1455,
/**/ /**/