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

Patch 7.3.1314

Expand Messages
  • Bram Moolenaar
    Patch 7.3.1314 Problem: Test 87 fails with Python 3.3. Solution: Filter the error messages. (Taro Muraoka) Files: src/testdir/test87.in ...
    Message 1 of 1 , Jul 6, 2013
    • 0 Attachment
      Patch 7.3.1314
      Problem: Test 87 fails with Python 3.3.
      Solution: Filter the error messages. (Taro Muraoka)
      Files: src/testdir/test87.in


      *** ../vim-7.3.1313/src/testdir/test87.in 2013-06-26 21:49:46.000000000 +0200
      --- src/testdir/test87.in 2013-07-06 13:41:30.000000000 +0200
      ***************
      *** 829,834 ****
      --- 829,838 ----
      :fun D()
      :endfun
      py3 << EOF
      + import re
      +
      + py33_type_error_pattern = re.compile('^__call__\(\) takes (\d+) positional argument but (\d+) were given$')
      +
      def ee(expr, g=globals(), l=locals()):
      try:
      try:
      ***************
      *** 836,841 ****
      --- 840,854 ----
      except Exception as e:
      if sys.version_info >= (3, 3) and e.__class__ is AttributeError and str(e).find('has no attribute')>=0 and not str(e).startswith("'vim."):
      cb.append(expr + ':' + repr((e.__class__, AttributeError(str(e)[str(e).rfind(" '") + 2:-1]))))
      + elif sys.version_info >= (3, 3) and e.__class__ is ImportError and str(e).find('No module named \'') >= 0:
      + cb.append(expr + ':' + repr((e.__class__, ImportError(str(e).replace("'", '')))))
      + elif sys.version_info >= (3, 3) and e.__class__ is TypeError:
      + m = py33_type_error_pattern.search(str(e))
      + if m:
      + msg = '__call__() takes exactly {0} positional argument ({1} given)'.format(m.group(1), m.group(2))
      + cb.append(expr + ':' + repr((e.__class__, TypeError(msg))))
      + else:
      + cb.append(expr + ':' + repr((e.__class__, e)))
      else:
      cb.append(expr + ':' + repr((e.__class__, e)))
      else:
      *** ../vim-7.3.1313/src/version.c 2013-07-06 13:35:04.000000000 +0200
      --- src/version.c 2013-07-06 13:42:50.000000000 +0200
      ***************
      *** 730,731 ****
      --- 730,733 ----
      { /* Add new patch number below this line */
      + /**/
      + 1314,
      /**/

      --
      BRIDGEKEEPER: What is your favorite editor?
      GAWAIN: Emacs ... No, Viiiiiiiiiiimmmmmmm!
      "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD

      /// 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.