1
0
forked from aniani/vim

updated for version 7.4.195

Problem:    Python tests fail.
Solution:   Change "then" to "than" in more places. (Dominique Pelle, Taro
            Muraoka)
This commit is contained in:
Bram Moolenaar
2014-03-12 15:26:40 +01:00
parent 4064e24a0f
commit 038e5d4766
5 changed files with 12 additions and 10 deletions

View File

@@ -675,7 +675,7 @@ except ImportError:
# Check GCing iterator that was not fully exhausted # Check GCing iterator that was not fully exhausted
i = iter(vim.buffers) i = iter(vim.buffers)
cb.append('i:' + str(next(i))) 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) i2 = iter(vim.buffers)
cb.append('i2:' + str(next(i2))) cb.append('i2:' + str(next(i2)))
cb.append('i:' + str(next(i))) cb.append('i:' + str(next(i)))

View File

@@ -882,11 +882,11 @@ ll[1:100] = "abcJ":error:('list is locked',)
l[:] = FailingIter():NotImplementedError:('iter',) l[:] = FailingIter():NotImplementedError:('iter',)
l[:] = FailingIterNext():NotImplementedError:('next',) l[:] = FailingIterNext():NotImplementedError:('next',)
<<< Finished <<< 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') ('a', 'b', 'c', 'O')
nel[1:10:2] = "a":ValueError:('attempt to assign sequence of size 1 to extended slice of size 2',) nel[1:10:2] = "a":ValueError:('attempt to assign sequence of size 1 to extended slice of size 2',)
('a', 'b', 'c', 'O') ('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') ('a', 'b', 'c', 'O')
nel[:] = FailingIterNextN(2):NotImplementedError:('next N',) nel[:] = FailingIterNextN(2):NotImplementedError:('next N',)
('a', 'b', 'c', 'O') ('a', 'b', 'c', 'O')
@@ -1233,8 +1233,8 @@ vim.buffers[100000000]:KeyError:(100000000,)
>>> Testing NumberToLong using vim.buffers[%s] >>> Testing NumberToLong using vim.buffers[%s]
vim.buffers[[]]:TypeError:('expected int(), long() or something supporting coercing to long(), but got list',) 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[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[-1]:ValueError:('number must be greater than zero',)
vim.buffers[0]:ValueError:('number must be greater then zero',) vim.buffers[0]:ValueError:('number must be greater than zero',)
<<< Finished <<< Finished
> Current > Current
>> CurrentGetattr >> CurrentGetattr

View File

@@ -664,7 +664,7 @@ py3 << EOF
# Check GCing iterator that was not fully exhausted # Check GCing iterator that was not fully exhausted
i = iter(vim.buffers) i = iter(vim.buffers)
cb.append('i:' + str(next(i))) 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) i2 = iter(vim.buffers)
cb.append('i2:' + str(next(i2))) cb.append('i2:' + str(next(i2)))
cb.append('i:' + str(next(i))) cb.append('i:' + str(next(i)))

View File

@@ -882,11 +882,11 @@ ll[1:100] = "abcJ":(<class 'vim.error'>, error('list is locked',))
l[:] = FailingIter():(<class 'NotImplementedError'>, NotImplementedError('iter',)) l[:] = FailingIter():(<class 'NotImplementedError'>, NotImplementedError('iter',))
l[:] = FailingIterNext():(<class 'NotImplementedError'>, NotImplementedError('next',)) l[:] = FailingIterNext():(<class 'NotImplementedError'>, NotImplementedError('next',))
<<< Finished <<< 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') (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',)) 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') (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') (b'a', b'b', b'c', b'O')
nel[:] = FailingIterNextN(2):(<class 'NotImplementedError'>, NotImplementedError('next N',)) nel[:] = FailingIterNextN(2):(<class 'NotImplementedError'>, NotImplementedError('next N',))
(b'a', b'b', b'c', b'O') (b'a', b'b', b'c', b'O')
@@ -1233,8 +1233,8 @@ vim.buffers[100000000]:(<class 'KeyError'>, KeyError(100000000,))
>>> Testing NumberToLong using vim.buffers[%s] >>> Testing NumberToLong using vim.buffers[%s]
vim.buffers[[]]:(<class 'TypeError'>, TypeError('expected int() or something supporting coercing to int(), but got list',)) 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[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[-1]:(<class 'ValueError'>, ValueError('number must be greater than zero',))
vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater then zero',)) vim.buffers[0]:(<class 'ValueError'>, ValueError('number must be greater than zero',))
<<< Finished <<< Finished
> Current > Current
>> CurrentGetattr >> CurrentGetattr

View File

@@ -738,6 +738,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 */
/**/
195,
/**/ /**/
194, 194,
/**/ /**/