Mercurial > vim
changeset 5700:c2e88a40d530 v7.4.195
updated for version 7.4.195
Problem: Python tests fail.
Solution: Change "then" to "than" in more places. (Dominique Pelle, Taro
Muraoka)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 12 Mar 2014 15:26:40 +0100 |
| parents | 3716699948c2 |
| children | 6afe153604f6 |
| files | src/testdir/test86.in src/testdir/test86.ok src/testdir/test87.in src/testdir/test87.ok src/version.c |
| diffstat | 5 files changed, 12 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -675,7 +675,7 @@ except ImportError: # Check GCing iterator that was not fully exhausted i = iter(vim.buffers) cb.append('i:' + str(next(i))) -# and also check creating more then one iterator at a time +# and also check creating more than one iterator at a time i2 = iter(vim.buffers) cb.append('i2:' + str(next(i2))) cb.append('i:' + str(next(i)))
--- a/src/testdir/test86.ok +++ b/src/testdir/test86.ok @@ -882,11 +882,11 @@ ll[1:100] = "abcJ":error:('list is locke l[:] = FailingIter():NotImplementedError:('iter',) l[:] = FailingIterNext():NotImplementedError:('next',) <<< Finished -nel[1:10:2] = "abcK":ValueError:('attempt to assign sequence of size greater then 2 to extended slice',) +nel[1:10:2] = "abcK":ValueError:('attempt to assign sequence of size greater than 2 to extended slice',) ('a', 'b', 'c', 'O') nel[1:10:2] = "a":ValueError:('attempt to assign sequence of size 1 to extended slice of size 2',) ('a', 'b', 'c', 'O') -nel[1:1:-1] = "a":ValueError:('attempt to assign sequence of size greater then 0 to extended slice',) +nel[1:1:-1] = "a":ValueError:('attempt to assign sequence of size greater than 0 to extended slice',) ('a', 'b', 'c', 'O') nel[:] = FailingIterNextN(2):NotImplementedError:('next N',) ('a', 'b', 'c', 'O') @@ -1233,8 +1233,8 @@ vim.buffers[100000000]:KeyError:(1000000 >>> Testing NumberToLong using vim.buffers[%s] vim.buffers[[]]:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',) vim.buffers[None]:TypeError:('expected int(), long() or something supporting coercing to long(), but got NoneType',) -vim.buffers[-1]:ValueError:('number must be greater then zero',) -vim.buffers[0]:ValueError:('number must be greater then zero',) +vim.buffers[-1]:ValueError:('number must be greater than zero',) +vim.buffers[0]:ValueError:('number must be greater than zero',) <<< Finished > Current >> CurrentGetattr
--- a/src/testdir/test87.in +++ b/src/testdir/test87.in @@ -664,7 +664,7 @@ py3 << EOF # Check GCing iterator that was not fully exhausted i = iter(vim.buffers) cb.append('i:' + str(next(i))) -# and also check creating more then one iterator at a time +# and also check creating more than one iterator at a time i2 = iter(vim.buffers) cb.append('i2:' + str(next(i2))) cb.append('i:' + str(next(i)))
--- a/src/testdir/test87.ok +++ b/src/testdir/test87.ok @@ -882,11 +882,11 @@ ll[1:100] = "abcJ":(<class 'vim.error'>, l[:] = FailingIter():(<class 'NotImplementedError'>, NotImplementedError('iter',)) l[:] = FailingIterNext():(<class 'NotImplementedError'>, NotImplementedError('next',)) <<< Finished -nel[1:10:2] = "abcK":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater then 2 to extended slice',)) +nel[1:10:2] = "abcK":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater than 2 to extended slice',)) (b'a', b'b', b'c', b'O') nel[1:10:2] = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size 1 to extended slice of size 2',)) (b'a', b'b', b'c', b'O') -nel[1:1:-1] = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater then 0 to extended slice',)) +nel[1:1:-1] = "a":(<class 'ValueError'>, ValueError('attempt to assign sequence of size greater than 0 to extended slice',)) (b'a', b'b', b'c', b'O') nel[:] = FailingIterNextN(2):(<class 'NotImplementedError'>, NotImplementedError('next N',)) (b'a', b'b', b'c', b'O') @@ -1233,8 +1233,8 @@ vim.buffers[100000000]:(<class 'KeyError >>> Testing NumberToLong using vim.buffers[%s] vim.buffers[[]]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',)) vim.buffers[None]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got NoneType',)) -vim.buffers[-1]:(<class 'ValueError'>, ValueError('number must be greater then zero',)) -vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater then zero',)) +vim.buffers[-1]:(<class 'ValueError'>, ValueError('number must be greater than zero',)) +vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater than zero',)) <<< Finished > Current >> CurrentGetattr