diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-06-02 17:41:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-06-02 17:41:54 +0200 |
| commit | de71b5658f780e1fac29b1ef8b58af3dd42e65ad (patch) | |
| tree | cdcf529e0fca413b18415513673940763cbd9460 /src/testdir | |
| parent | 525666f28201c313825065d49b98606c8cade457 (diff) | |
| download | vim-git-de71b5658f780e1fac29b1ef8b58af3dd42e65ad.tar.gz | |
updated for version 7.3.1096v7.3.1096
Problem: Python: popitem() was not defined in a standard way.
Solution: Remove the argument from popitem(). (ZyX)
Diffstat (limited to 'src/testdir')
| -rw-r--r-- | src/testdir/test86.in | 4 | ||||
| -rw-r--r-- | src/testdir/test86.ok | 4 | ||||
| -rw-r--r-- | src/testdir/test87.in | 4 | ||||
| -rw-r--r-- | src/testdir/test87.ok | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/testdir/test86.in b/src/testdir/test86.in index 8569e4241..dc21af493 100644 --- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -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 diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok index a98b4459a..7d243904e 100644 --- a/src/testdir/test86.ok +++ b/src/testdir/test86.ok @@ -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 diff --git a/src/testdir/test87.in b/src/testdir/test87.in index 395fb19b6..45a4b8e40 100644 --- a/src/testdir/test87.in +++ b/src/testdir/test87.in @@ -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 diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok index 569d13f1e..94a914ef8 100644 --- a/src/testdir/test87.ok +++ b/src/testdir/test87.ok @@ -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 |