updated for version 7.3.1166
Problem: Loading Python modules is not tested.
Solution: Enable commented-out tests, add missing files. (ZyX)
diff --git a/.gitignore b/.gitignore
index d4af3a2..9caf09a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@
*.mo
*.swp
*~
+*.pyc
src/po/vim.pot
# Generated by "make test"
diff --git a/Filelist b/Filelist
index ee5ad8f..1dea3f1 100644
--- a/Filelist
+++ b/Filelist
@@ -84,6 +84,9 @@
src/testdir/test49.vim \
src/testdir/test60.vim \
src/testdir/test83-tags? \
+ src/testdir/python2/*.py \
+ src/testdir/python3/*.py \
+ src/testdir/pythonx/*.py \
src/proto.h \
src/proto/blowfish.pro \
src/proto/buffer.pro \
diff --git a/src/testdir/python2/module.py b/src/testdir/python2/module.py
new file mode 100644
index 0000000..5f0a6f0
--- /dev/null
+++ b/src/testdir/python2/module.py
@@ -0,0 +1 @@
+dir = '2'
diff --git a/src/testdir/python3/module.py b/src/testdir/python3/module.py
new file mode 100644
index 0000000..1ccfb09
--- /dev/null
+++ b/src/testdir/python3/module.py
@@ -0,0 +1 @@
+dir = '3'
diff --git a/src/testdir/pythonx/module.py b/src/testdir/pythonx/module.py
new file mode 100644
index 0000000..6bf5a64
--- /dev/null
+++ b/src/testdir/pythonx/module.py
@@ -0,0 +1 @@
+dir = 'x'
diff --git a/src/testdir/pythonx/modulex.py b/src/testdir/pythonx/modulex.py
new file mode 100644
index 0000000..ec6a706
--- /dev/null
+++ b/src/testdir/pythonx/modulex.py
@@ -0,0 +1 @@
+ddir = 'xx'
diff --git a/src/testdir/test86.in b/src/testdir/test86.in
index f2248c4..26c7fe2 100644
--- a/src/testdir/test86.in
+++ b/src/testdir/test86.in
@@ -1069,13 +1069,13 @@
ee('vim.current.xxx = True')
EOF
:"
-:" Test import TODO: BROKEN
-:"py << EOF
-:"vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
-:"from module import dir as d
-:"from modulex import ddir
-:"cb.append(d + ',' + ddir)
-:"EOF
+:" Test import
+py << EOF
+vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
+from module import dir as d
+from modulex import ddir
+cb.append(d + ',' + ddir)
+EOF
:"
:" Test exceptions
:fun Exe(e)
diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok
index 3c22bf6..145979f 100644
--- a/src/testdir/test86.ok
+++ b/src/testdir/test86.ok
@@ -1083,6 +1083,7 @@
vim.current.window = True:(<type 'exceptions.TypeError'>, TypeError('expected vim.Window object',))
vim.current.tabpage = True:(<type 'exceptions.TypeError'>, TypeError('expected vim.TabPage object',))
vim.current.xxx = True:(<type 'exceptions.AttributeError'>, AttributeError('xxx',))
+2,xx
vim.command("throw 'abc'"):(<class 'vim.error'>, error('abc',))
Exe("throw 'def'"):(<class 'vim.error'>, error('def',))
vim.eval("Exe('throw ''ghi''')"):(<class 'vim.error'>, error('ghi',))
diff --git a/src/testdir/test87.in b/src/testdir/test87.in
index 986565e..7a3d583 100644
--- a/src/testdir/test87.in
+++ b/src/testdir/test87.in
@@ -1036,13 +1036,13 @@
ee('vim.current.xxx = True')
EOF
:"
-:" Test import TODO: BROKEN
-:"py3 << EOF
-:"vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
-:"from module import dir as d
-:"from modulex import ddir
-:"cb.append(d + ',' + ddir)
-:"EOF
+:" Test import
+py3 << EOF
+vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
+from module import dir as d
+from modulex import ddir
+cb.append(d + ',' + ddir)
+EOF
:"
:" Test exceptions
:fun Exe(e)
diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok
index 01ff127..31c7df4 100644
--- a/src/testdir/test87.ok
+++ b/src/testdir/test87.ok
@@ -1092,6 +1092,7 @@
vim.current.window = True:(<class 'TypeError'>, TypeError('expected vim.Window object',))
vim.current.tabpage = True:(<class 'TypeError'>, TypeError('expected vim.TabPage object',))
vim.current.xxx = True:(<class 'AttributeError'>, AttributeError('xxx',))
+3,xx
vim.command("throw 'abc'"):(<class 'vim.error'>, error('abc',))
Exe("throw 'def'"):(<class 'vim.error'>, error('def',))
vim.eval("Exe('throw ''ghi''')"):(<class 'vim.error'>, error('ghi',))
diff --git a/src/version.c b/src/version.c
index 8480261..037b0a4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1166,
+/**/
1165,
/**/
1164,
