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

Patch 7.3.1242

Expand Messages
  • Bram Moolenaar
    Patch 7.3.1242 Problem: No failure when trying to use a number as a string. Solution: Give an error when StringToLine() is called with an instance of the
    Message 1 of 1 , Jun 24, 2013
    • 0 Attachment
      Patch 7.3.1242
      Problem: No failure when trying to use a number as a string.
      Solution: Give an error when StringToLine() is called with an instance of
      the wrong type. (Jun Takimoto)
      Files: src/if_py_both.h


      *** ../vim-7.3.1241/src/if_py_both.h 2013-06-24 21:21:52.000000000 +0200
      --- src/if_py_both.h 2013-06-24 22:30:51.000000000 +0200
      ***************
      *** 3549,3561 ****
      if (!(bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL)))
      return NULL;

      ! if(PyBytes_AsStringAndSize(bytes, &str, &len) == -1
      || str == NULL)
      {
      Py_DECREF(bytes);
      return NULL;
      }
      }

      /*
      * Error checking: String must not contain newlines, as we
      --- 3549,3574 ----
      if (!(bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL)))
      return NULL;

      ! if (PyBytes_AsStringAndSize(bytes, &str, &len) == -1
      || str == NULL)
      {
      Py_DECREF(bytes);
      return NULL;
      }
      }
      + else
      + {
      + #if PY_MAJOR_VERSION < 3
      + PyErr_FORMAT(PyExc_TypeError,
      + N_("expected str() or unicode() instance, but got %s"),
      + Py_TYPE_NAME(obj));
      + #else
      + PyErr_FORMAT(PyExc_TypeError,
      + N_("expected bytes() or str() instance, but got %s"),
      + Py_TYPE_NAME(obj));
      + #endif
      + return NULL;
      + }

      /*
      * Error checking: String must not contain newlines, as we
      *** ../vim-7.3.1241/src/version.c 2013-06-24 22:23:51.000000000 +0200
      --- src/version.c 2013-06-24 22:32:19.000000000 +0200
      ***************
      *** 730,731 ****
      --- 730,733 ----
      { /* Add new patch number below this line */
      + /**/
      + 1242,
      /**/

      --
      A successful man is one who makes more money than his wife can spend.
      A successful woman is one who can find such a man.

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