aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-16 23:24:03 -05:00
Code Activity

updated for version 7.3.1096

Browse Source 
Problem:    Python: popitem() was not defined in a standard way.
Solution:   Remove the argument from popitem(). (ZyX)
This commit is contained in:
Bram Moolenaar
2013-06-02 17:41:54 +02:00
parent 525666f282
commit de71b5658f
7 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/testdir/test86.in
View File

@@ -83,7 +83,7 @@ EOF
:$put =pyeval('repr(''1'' in d)')
:$put =pyeval('repr(list(iter(d)))')
:$put =string(d)
:$put =pyeval('repr(d.popitem(''0''))')
:$put =pyeval('repr(d.popitem())')
:$put =pyeval('repr(d.get(''0''))')
:$put =pyeval('repr(list(iter(d)))')
:"
@@ -226,7 +226,7 @@ em('d["a\\0b"]=1')
em('d[u"a\\0b"]=1')
em('d.pop("abc")')
em('d.popitem("abc")')
em('d.popitem()')
EOF
:$put =messages
:unlet messages

4
src/testdir/test86.ok
View File

@@ -26,7 +26,7 @@ True
False
['0']
{'0': -1}
('', -1L)
('0', -1L)
None
[]
[0, 1, 2, 3]
@@ -666,7 +666,7 @@ d.update((("a", FailingMapping()),)):(<type 'exceptions.NotImplementedError'>, N
d.update((("a", FailingMappingKey()),)):(<type 'exceptions.NotImplementedError'>, NotImplementedError())
<<< Finished
>> DictionaryPopItem
d.popitem(1, 2):(<type 'exceptions.TypeError'>, TypeError('function takes exactly 1 argument (2 given)',))
d.popitem(1, 2):(<type 'exceptions.TypeError'>, TypeError('popitem() takes no arguments (2 given)',))
>> DictionaryHasKey
d.has_key():(<type 'exceptions.TypeError'>, TypeError('function takes exactly 1 argument (0 given)',))
> List

4
src/testdir/test87.in
View File

@@ -77,7 +77,7 @@ EOF
:$put =py3eval('repr(''1'' in d)')
:$put =py3eval('repr(list(iter(d)))')
:$put =string(d)
:$put =py3eval('repr(d.popitem(''0''))')
:$put =py3eval('repr(d.popitem())')
:$put =py3eval('repr(d.get(''0''))')
:$put =py3eval('repr(list(iter(d)))')
:"
@@ -220,7 +220,7 @@ em('d["a\\0b"]=1')
em('d[b"a\\0b"]=1')
em('d.pop("abc")')
em('d.popitem("abc")')
em('d.popitem()')
EOF
:$put =messages
:unlet messages

4
src/testdir/test87.ok
View File

@@ -26,7 +26,7 @@ True
False
[b'0']
{'0': -1}
(b'', -1)
(b'0', -1)
None
[]
[0, 1, 2, 3]
@@ -663,7 +663,7 @@ d.update((("a", FailingMapping()),)):(<class 'NotImplementedError'>, NotImplemen
d.update((("a", FailingMappingKey()),)):(<class 'NotImplementedError'>, NotImplementedError())
<<< Finished
>> DictionaryPopItem
d.popitem(1, 2):(<class 'TypeError'>, TypeError('function takes exactly 1 argument (2 given)',))
d.popitem(1, 2):(<class 'TypeError'>, TypeError('popitem() takes no arguments (2 given)',))
>> DictionaryHasKey
d.has_key():(<class 'TypeError'>, TypeError('function takes exactly 1 argument (0 given)',))
> List