aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-06 05:44:14 -04:00
Code Activity

updated for version 7.3.1250

Browse Source 
Problem:    Python tests fail on MS-Windows.
Solution:   Change backslashes to slashes. (Taro Muraoka)
This commit is contained in:
Bram Moolenaar
2013-06-26 21:49:51 +02:00
parent c14621eafb
commit 877aa00811
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/testdir/test86.in
View File

@@ -1221,12 +1221,12 @@ sys.path.append(os.path.join(os.getcwd(), 'python_after'))
vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\') vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
l = [] l = []
def callback(path): def callback(path):
l.append(path[-len('/testdir'):]) l.append(path[-len('/testdir'):].replace(os.path.sep, '/'))
vim.foreach_rtp(callback) vim.foreach_rtp(callback)
cb.append(repr(l)) cb.append(repr(l))
del l del l
def callback(path): def callback(path):
return path[-len('/testdir'):] return path[-len('/testdir'):].replace(os.path.sep, '/')
cb.append(repr(vim.foreach_rtp(callback))) cb.append(repr(vim.foreach_rtp(callback)))
del callback del callback
from module import dir as d from module import dir as d
@@ -1239,9 +1239,9 @@ cb.append(after.dir)
import topmodule as tm import topmodule as tm
import topmodule.submodule as tms import topmodule.submodule as tms
import topmodule.submodule.subsubmodule.subsubsubmodule as tmsss import topmodule.submodule.subsubmodule.subsubsubmodule as tmsss
cb.append(tm.__file__.replace('.pyc', '.py')[-len('modulex/topmodule/__init__.py'):]) cb.append(tm.__file__.replace('.pyc', '.py').replace(os.path.sep, '/')[-len('modulex/topmodule/__init__.py'):])
cb.append(tms.__file__.replace('.pyc', '.py')[-len('modulex/topmodule/submodule/__init__.py'):]) cb.append(tms.__file__.replace('.pyc', '.py').replace(os.path.sep, '/')[-len('modulex/topmodule/submodule/__init__.py'):])
cb.append(tmsss.__file__.replace('.pyc', '.py')[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):]) cb.append(tmsss.__file__.replace('.pyc', '.py').replace(os.path.sep, '/')[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):])
del before del before
del after del after
del d del d

6
src/testdir/test87.in
View File

@@ -1188,9 +1188,9 @@ cb.append(after.dir)
import topmodule as tm import topmodule as tm
import topmodule.submodule as tms import topmodule.submodule as tms
import topmodule.submodule.subsubmodule.subsubsubmodule as tmsss import topmodule.submodule.subsubmodule.subsubsubmodule as tmsss
cb.append(tm.__file__[-len('modulex/topmodule/__init__.py'):]) cb.append(tm.__file__.replace(os.path.sep, '/')[-len('modulex/topmodule/__init__.py'):])
cb.append(tms.__file__[-len('modulex/topmodule/submodule/__init__.py'):]) cb.append(tms.__file__.replace(os.path.sep, '/')[-len('modulex/topmodule/submodule/__init__.py'):])
cb.append(tmsss.__file__[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):]) cb.append(tmsss.__file__.replace(os.path.sep, '/')[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):])
del before del before
del after del after
del d del d

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1250,
/**/ /**/
1249, 1249,
/**/ /**/