Mercurial > vim
changeset 10160:32dd27cceadd v7.4.2350
commit https://github.com/vim/vim/commit/cf703fe9d66744ffd7d9c625ee1cbe048ee07740
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Sep 9 14:59:39 2016 +0200
patch 7.4.2350
Problem: Test 86 and 87 fail with some version of Python.
Solution: Unify "can't" and "cannot". Unify quotes.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 09 Sep 2016 15:00:08 +0200 |
| parents | 0ccc6c45ff5b |
| children | eeb7286ab81e |
| files | src/testdir/test86.in src/testdir/test86.ok src/testdir/test87.in src/testdir/test87.ok src/version.c |
| diffstat | 5 files changed, 23 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -239,6 +239,14 @@ def ee(expr, g=globals(), l=locals()): 'TypeError:("\'FailingNumber\' object is not iterable",)') if msg.find('(\'\'') > -1 or msg.find('(\'can\'t') > -1: msg = msg.replace('(\'', '("').replace('\',)', '",)') + # Some Python versions say can't, others cannot. + if msg.find('can\'t') > -1: + msg = msg.replace('can\'t', 'cannot') + # Some Python versions use single quote, some double quote + if msg.find('"cannot ') > -1: + msg = msg.replace('"cannot ', '\'cannot ') + if msg.find(' attributes"') > -1: + msg = msg.replace(' attributes"', ' attributes\'') if expr == 'fd(self=[])': # HACK: PyMapping_Check changed meaning msg = msg.replace('AttributeError:(\'keys\',)',
--- a/src/testdir/test86.ok +++ b/src/testdir/test86.ok @@ -628,7 +628,7 @@ testdir test86.in > Output >> OutputSetattr -del sys.stdout.softspace:AttributeError:("can't delete OutputObject attributes",) +del sys.stdout.softspace:AttributeError:('cannot delete OutputObject attributes',) >>> Testing NumberToLong using sys.stdout.softspace = %s sys.stdout.softspace = []:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',) sys.stdout.softspace = None:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',)
--- a/src/testdir/test87.in +++ b/src/testdir/test87.in @@ -238,9 +238,18 @@ def ee(expr, g=globals(), l=locals()): 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')))) + cb.append(expr + ':' + repr((TypeError, TypeError('expected bytes with no null')))) else: - cb.append(expr + ':' + repr((e.__class__, e))) + msg = repr((e.__class__, e)) + # Some Python versions say can't, others cannot. + if msg.find('can\'t') > -1: + msg = msg.replace('can\'t', 'cannot') + # Some Python versions use single quote, some double quote + if msg.find('"cannot ') > -1: + msg = msg.replace('"cannot ', '\'cannot ') + if msg.find(' attributes"') > -1: + msg = msg.replace(' attributes"', ' attributes\'') + cb.append(expr + ':' + msg) else: cb.append(expr + ':NOT FAILED') except Exception as e:
--- a/src/testdir/test87.ok +++ b/src/testdir/test87.ok @@ -628,7 +628,7 @@ b'testdir' test87.in > Output >> OutputSetattr -del sys.stdout.softspace:(<class 'AttributeError'>, AttributeError("can't delete OutputObject attributes",)) +del sys.stdout.softspace:(<class 'AttributeError'>, AttributeError('cannot delete OutputObject attributes',)) >>> Testing NumberToLong using sys.stdout.softspace = %s sys.stdout.softspace = []:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',)) sys.stdout.softspace = None:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got NoneType',))