commit de71b5658f780e1fac29b1ef8b58af3dd42e65ad
author Bram Moolenaar <Bram@vim.org> Sun Jun 02 17:41:54 2013 +0200
committer Bram Moolenaar <Bram@vim.org> Sun Jun 02 17:41:54 2013 +0200
tree cdcf529e0fca413b18415513673940763cbd9460
parent 525666f28201c313825065d49b98606c8cade457

updated for version 7.3.1096
Problem:    Python: popitem() was not defined in a standard way.
Solution:   Remove the argument from popitem(). (ZyX)

src/testdir/test86.in

diff --git a/src/testdir/test86.in b/src/testdir/test86.in
index 8569e42..dc21af4 100644
--- a/src/testdir/test86.in
+++ b/src/testdir/test86.in
@@ -83,7 +83,7 @@
 :$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[u"a\\0b"]=1')
 
 em('d.pop("abc")')
-em('d.popitem("abc")')
+em('d.popitem()')
 EOF
 :$put =messages
 :unlet messages

src/testdir/test86.ok

diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok
index a98b445..7d24390 100644
--- a/src/testdir/test86.ok
+++ b/src/testdir/test86.ok
@@ -26,7 +26,7 @@
 False
 ['0']
 {'0': -1}
-('', -1L)
+('0', -1L)
 None
 []
 [0, 1, 2, 3]
@@ -666,7 +666,7 @@
 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

src/testdir/test87.in

diff --git a/src/testdir/test87.in b/src/testdir/test87.in
index 395fb19..45a4b8e 100644
--- a/src/testdir/test87.in
+++ b/src/testdir/test87.in
@@ -77,7 +77,7 @@
 :$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[b"a\\0b"]=1')
 
 em('d.pop("abc")')
-em('d.popitem("abc")')
+em('d.popitem()')
 EOF
 :$put =messages
 :unlet messages

src/testdir/test87.ok

diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok
index 569d13f..94a914e 100644
--- a/src/testdir/test87.ok
+++ b/src/testdir/test87.ok
@@ -26,7 +26,7 @@
 False
 [b'0']
 {'0': -1}
-(b'', -1)
+(b'0', -1)
 None
 []
 [0, 1, 2, 3]
@@ -663,7 +663,7 @@
 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