Mercurial > vim

changeset 5012:6aecf486bb34 v7.3.1250

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.1250 Problem: Python tests fail on MS-Windows. Solution: Change backslashes to slashes. (Taro Muraoka)
author Bram Moolenaar <bram@vim.org>
date Wed, 26 Jun 2013 21:49:51 +0200
parents 65c893c97211
children d7b7f80dccfd
files src/testdir/test86.in src/testdir/test87.in src/version.c
diffstat 3 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test86.in
+++ b/src/testdir/test86.in
@@ -1221,12 +1221,12 @@ sys.path.append(os.path.join(os.getcwd()
 vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
 l = []
 def callback(path):
-    l.append(path[-len('/testdir'):])
+    l.append(path[-len('/testdir'):].replace(os.path.sep, '/'))
 vim.foreach_rtp(callback)
 cb.append(repr(l))
 del l
 def callback(path):
-    return path[-len('/testdir'):]
+    return path[-len('/testdir'):].replace(os.path.sep, '/')
 cb.append(repr(vim.foreach_rtp(callback)))
 del callback
 from module import dir as d
@@ -1239,9 +1239,9 @@ cb.append(after.dir)
 import topmodule as tm
 import topmodule.submodule as tms
 import topmodule.submodule.subsubmodule.subsubsubmodule as tmsss
-cb.append(tm.__file__.replace('.pyc', '.py')[-len('modulex/topmodule/__init__.py'):])
-cb.append(tms.__file__.replace('.pyc', '.py')[-len('modulex/topmodule/submodule/__init__.py'):])
-cb.append(tmsss.__file__.replace('.pyc', '.py')[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):])
+cb.append(tm.__file__.replace('.pyc', '.py').replace(os.path.sep, '/')[-len('modulex/topmodule/__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').replace(os.path.sep, '/')[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):])
 del before
 del after
 del d
--- a/src/testdir/test87.in
+++ b/src/testdir/test87.in
@@ -1188,9 +1188,9 @@ cb.append(after.dir)
 import topmodule as tm
 import topmodule.submodule as tms
 import topmodule.submodule.subsubmodule.subsubsubmodule as tmsss
-cb.append(tm.__file__[-len('modulex/topmodule/__init__.py'):])
-cb.append(tms.__file__[-len('modulex/topmodule/submodule/__init__.py'):])
-cb.append(tmsss.__file__[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):])
+cb.append(tm.__file__.replace(os.path.sep, '/')[-len('modulex/topmodule/__init__.py'):])
+cb.append(tms.__file__.replace(os.path.sep, '/')[-len('modulex/topmodule/submodule/__init__.py'):])
+cb.append(tmsss.__file__.replace(os.path.sep, '/')[-len('modulex/topmodule/submodule/subsubmodule/subsubsubmodule.py'):])
 del before
 del after
 del d
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1250,
+/**/
     1249,
 /**/
     1248,