patch 9.1.0844: if_python: no way to pass local vars to python
Problem: if_python: no way to pass local vars to python
Solution: Add locals argument to py3eval(), pyeval() and pyxeval()
(Ben Jackson)
fixes: #8573
closes: #10594
Signed-off-by: Ben Jackson <puremourning@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/testdir/test_pyx2.vim b/src/testdir/test_pyx2.vim
index 7432ceb..781bb41 100644
--- a/src/testdir/test_pyx2.vim
+++ b/src/testdir/test_pyx2.vim
@@ -38,6 +38,49 @@
endfunc
+" Test for pyxeval with locals
+func Test_python_pyeval_locals()
+ let str = 'a string'
+ let num = 0xbadb33f
+ let d = {'a': 1, 'b': 2, 'c': str}
+ let l = [ str, num, d ]
+
+ let locals = #{
+ \ s: str,
+ \ n: num,
+ \ d: d,
+ \ l: l,
+ \ }
+
+ " check basics
+ call assert_equal('a string', pyxeval('s', locals))
+ call assert_equal(0xbadb33f, pyxeval('n', locals))
+ call assert_equal(d, pyxeval('d', locals))
+ call assert_equal(l, pyxeval('l', locals))
+
+ py << trim EOF
+ def __UpdateDict(d, upd):
+ d.update(upd)
+ return d
+
+ def __ExtendList(l, *args):
+ l.extend(*args)
+ return l
+ EOF
+
+ " check assign to dict member works like bindeval
+ call assert_equal(3, pyxeval('__UpdateDict( d, {"c": 3} )["c"]', locals))
+ call assert_equal(3, d['c'])
+
+ " check append lo list
+ call assert_equal(4, pyxeval('len(__ExtendList(l, ["new item"]))', locals))
+ call assert_equal("new item", l[-1])
+
+ " check calling a function
+ let StrLen = function('strlen')
+ call assert_equal(3, pyxeval('f("abc")', {'f': StrLen}))
+endfunc
+
func Test_pyxfile()
" No special comments nor shebangs
redir => var