home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.3 / 7.3.953 < prev    next >
Encoding:
Internet Message Format  |  2013-05-14  |  3.8 KB
  1. To: vim_dev@googlegroups.com
  2. Subject: Patch 7.3.953
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 7.3.953
  11. Problem:    Python: string exceptions are deprecated.
  12. Solution:   Make vim.error an Exception subclass. (ZyX)
  13. Files:        src/if_python.c, src/if_python3.c
  14.  
  15.  
  16. *** ../vim-7.3.952/src/if_python.c    2013-05-15 15:44:24.000000000 +0200
  17. --- src/if_python.c    2013-05-15 16:02:20.000000000 +0200
  18. ***************
  19. *** 149,154 ****
  20. --- 149,155 ----
  21.   # define PyMem_Malloc dll_PyMem_Malloc
  22.   # define PyDict_SetItemString dll_PyDict_SetItemString
  23.   # define PyErr_BadArgument dll_PyErr_BadArgument
  24. + # define PyErr_NewException dll_PyErr_NewException
  25.   # define PyErr_Clear dll_PyErr_Clear
  26.   # define PyErr_PrintEx dll_PyErr_PrintEx
  27.   # define PyErr_NoMemory dll_PyErr_NoMemory
  28. ***************
  29. *** 255,260 ****
  30. --- 256,262 ----
  31.   static void* (*dll_PyMem_Malloc)(size_t);
  32.   static int(*dll_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item);
  33.   static int(*dll_PyErr_BadArgument)(void);
  34. + static PyObject *(*dll_PyErr_NewException)(char *, PyObject *, PyObject *);
  35.   static void(*dll_PyErr_Clear)(void);
  36.   static void(*dll_PyErr_PrintEx)(int);
  37.   static PyObject*(*dll_PyErr_NoMemory)(void);
  38. ***************
  39. *** 391,396 ****
  40. --- 393,399 ----
  41.       {"PyMem_Malloc", (PYTHON_PROC*)&dll_PyMem_Malloc},
  42.       {"PyDict_SetItemString", (PYTHON_PROC*)&dll_PyDict_SetItemString},
  43.       {"PyErr_BadArgument", (PYTHON_PROC*)&dll_PyErr_BadArgument},
  44. +     {"PyErr_NewException", (PYTHON_PROC*)&dll_PyErr_NewException},
  45.       {"PyErr_Clear", (PYTHON_PROC*)&dll_PyErr_Clear},
  46.       {"PyErr_PrintEx", (PYTHON_PROC*)&dll_PyErr_PrintEx},
  47.       {"PyErr_NoMemory", (PYTHON_PROC*)&dll_PyErr_NoMemory},
  48. ***************
  49. *** 1304,1310 ****
  50.       mod = Py_InitModule4("vim", VimMethods, (char *)NULL, (PyObject *)NULL, PYTHON_API_VERSION);
  51.       dict = PyModule_GetDict(mod);
  52.   
  53. !     VimError = Py_BuildValue("s", "vim.error");
  54.   
  55.       PyDict_SetItemString(dict, "error", VimError);
  56.       PyDict_SetItemString(dict, "buffers", (PyObject *)(void *)&TheBufferMap);
  57. --- 1307,1313 ----
  58.       mod = Py_InitModule4("vim", VimMethods, (char *)NULL, (PyObject *)NULL, PYTHON_API_VERSION);
  59.       dict = PyModule_GetDict(mod);
  60.   
  61. !     VimError = PyErr_NewException("vim.error", NULL, NULL);
  62.   
  63.       PyDict_SetItemString(dict, "error", VimError);
  64.       PyDict_SetItemString(dict, "buffers", (PyObject *)(void *)&TheBufferMap);
  65. *** ../vim-7.3.952/src/if_python3.c    2013-05-15 15:44:24.000000000 +0200
  66. --- src/if_python3.c    2013-05-15 16:02:20.000000000 +0200
  67. ***************
  68. *** 1606,1613 ****
  69.       return NULL;
  70.   
  71.       VimError = PyErr_NewException("vim.error", NULL, NULL);
  72. -     Py_INCREF(VimError);
  73.   
  74.       PyModule_AddObject(mod, "error", VimError);
  75.       Py_INCREF((PyObject *)(void *)&TheBufferMap);
  76.       PyModule_AddObject(mod, "buffers", (PyObject *)(void *)&TheBufferMap);
  77. --- 1606,1613 ----
  78.       return NULL;
  79.   
  80.       VimError = PyErr_NewException("vim.error", NULL, NULL);
  81.   
  82. +     Py_INCREF(VimError);
  83.       PyModule_AddObject(mod, "error", VimError);
  84.       Py_INCREF((PyObject *)(void *)&TheBufferMap);
  85.       PyModule_AddObject(mod, "buffers", (PyObject *)(void *)&TheBufferMap);
  86. *** ../vim-7.3.952/src/version.c    2013-05-15 15:51:03.000000000 +0200
  87. --- src/version.c    2013-05-15 16:02:43.000000000 +0200
  88. ***************
  89. *** 730,731 ****
  90. --- 730,733 ----
  91.   {   /* Add new patch number below this line */
  92. + /**/
  93. +     953,
  94.   /**/
  95.  
  96. -- 
  97. The early bird gets the worm. If you want something else for
  98. breakfast, get up later.
  99.  
  100.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  101. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  102. \\\  an exciting new programming language -- http://www.Zimbu.org        ///
  103.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  104.