Loading ...
Sorry, an error occurred while loading the content.

Patch 7.3.1250

Expand Messages
  • Bram Moolenaar
    Patch 7.3.1250 Problem: Python tests fail on MS-Windows. Solution: Change backslashes to slashes. (Taro Muraoka) Files: src/testdir/test86.in,
    Message 1 of 1 , Jun 26, 2013
    • 0 Attachment
      Patch 7.3.1250
      Problem: Python tests fail on MS-Windows.
      Solution: Change backslashes to slashes. (Taro Muraoka)
      Files: src/testdir/test86.in, src/testdir/test87.in


      *** ../vim-7.3.1249/src/testdir/test86.in 2013-06-23 16:35:32.000000000 +0200
      --- src/testdir/test86.in 2013-06-26 21:43:04.000000000 +0200
      ***************
      *** 1221,1232 ****
      vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
      l = []
      def callback(path):
      ! l.append(path[-len('/testdir'):])
      vim.foreach_rtp(callback)
      cb.append(repr(l))
      del l
      def callback(path):
      ! return path[-len('/testdir'):]
      cb.append(repr(vim.foreach_rtp(callback)))
      del callback
      from module import dir as d
      --- 1221,1232 ----
      vim.options['rtp'] = os.getcwd().replace(',', '\\,').replace('\\', '\\\\')
      l = []
      def callback(path):
      ! 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'):].replace(os.path.sep, '/')
      cb.append(repr(vim.foreach_rtp(callback)))
      del callback
      from module import dir as d
      ***************
      *** 1239,1247 ****
      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'):])
      del before
      del after
      del d
      --- 1239,1247 ----
      import topmodule as tm
      import topmodule.submodule as tms
      import topmodule.submodule.subsubmodule.subsubsubmodule as tmsss
      ! 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
      *** ../vim-7.3.1249/src/testdir/test87.in 2013-06-23 16:35:32.000000000 +0200
      --- src/testdir/test87.in 2013-06-26 21:44:25.000000000 +0200
      ***************
      *** 1188,1196 ****
      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'):])
      del before
      del after
      del d
      --- 1188,1196 ----
      import topmodule as tm
      import topmodule.submodule as tms
      import topmodule.submodule.subsubmodule.subsubsubmodule as tmsss
      ! 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
      *** ../vim-7.3.1249/src/version.c 2013-06-26 20:04:28.000000000 +0200
      --- src/version.c 2013-06-26 21:44:00.000000000 +0200
      ***************
      *** 730,731 ****
      --- 730,733 ----
      { /* Add new patch number below this line */
      + /**/
      + 1250,
      /**/

      --
      You were lucky to have a LAKE! There were a hundred and sixty of
      us living in a small shoebox in the middle of the road.

      /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net \\\
      /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
      \\\ an exciting new programming language -- http://www.Zimbu.org ///
      \\\ help me help AIDS victims -- http://ICCF-Holland.org ///

      --
      --
      You received this message from the "vim_dev" maillist.
      Do not top-post! Type your reply below the text you are replying to.
      For more information, visit http://www.vim.org/maillist.php

      ---
      You received this message because you are subscribed to the Google Groups "vim_dev" group.
      To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+unsubscribe@....
      For more options, visit https://groups.google.com/groups/opt_out.
    Your message has been successfully submitted and would be delivered to recipients shortly.