diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-06-26 21:49:51 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-06-26 21:49:51 +0200 |
| commit | 877aa0081151a11c7a7f783038e949a8a4e0b2bb (patch) | |
| tree | 0e8c632d18daa56df5763391eaf724f772ffca7a | |
| parent | c14621eafb1e14cd41a77c69893b417abcf60e1a (diff) | |
| download | vim-git-877aa0081151a11c7a7f783038e949a8a4e0b2bb.tar.gz | |
updated for version 7.3.1250v7.3.1250
Problem: Python tests fail on MS-Windows.
Solution: Change backslashes to slashes. (Taro Muraoka)
| -rw-r--r-- | src/testdir/test86.in | 10 | ||||
| -rw-r--r-- | src/testdir/test87.in | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/testdir/test86.in b/src/testdir/test86.in index 61b24ac8c..8b4a4c153 100644 --- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -1221,12 +1221,12 @@ sys.path.append(os.path.join(os.getcwd(), 'python_after')) 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 diff --git a/src/testdir/test87.in b/src/testdir/test87.in index 88a8d88a4..89b0ecb06 100644 --- 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 diff --git a/src/version.c b/src/version.c index 0d851206f..365deedfa 100644 --- 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, |