Mercurial > vim

comparison src/if_python.c @ 4409:7b789d337820 v7.3.953

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.953 Problem: Python: string exceptions are deprecated. Solution: Make vim.error an Exception subclass. (ZyX)
author Bram Moolenaar <bram@vim.org>
date Wed, 15 May 2013 16:04:40 +0200
parents 907b1f035ee7
children 0bbacb6a83bd
comparison
equal deleted inserted replaced
4408:27b1cb7a9e12 4409:7b789d337820
147 # define PyArg_ParseTuple dll_PyArg_ParseTuple 147 # define PyArg_ParseTuple dll_PyArg_ParseTuple
148 # define PyMem_Free dll_PyMem_Free 148 # define PyMem_Free dll_PyMem_Free
149 # define PyMem_Malloc dll_PyMem_Malloc 149 # define PyMem_Malloc dll_PyMem_Malloc
150 # define PyDict_SetItemString dll_PyDict_SetItemString 150 # define PyDict_SetItemString dll_PyDict_SetItemString
151 # define PyErr_BadArgument dll_PyErr_BadArgument 151 # define PyErr_BadArgument dll_PyErr_BadArgument
152 # define PyErr_NewException dll_PyErr_NewException
152 # define PyErr_Clear dll_PyErr_Clear 153 # define PyErr_Clear dll_PyErr_Clear
153 # define PyErr_PrintEx dll_PyErr_PrintEx 154 # define PyErr_PrintEx dll_PyErr_PrintEx
154 # define PyErr_NoMemory dll_PyErr_NoMemory 155 # define PyErr_NoMemory dll_PyErr_NoMemory
155 # define PyErr_Occurred dll_PyErr_Occurred 156 # define PyErr_Occurred dll_PyErr_Occurred
156 # define PyErr_SetNone dll_PyErr_SetNone 157 # define PyErr_SetNone dll_PyErr_SetNone
253 static int(*dll_PyArg_ParseTuple)(PyObject *, char *, ...); 254 static int(*dll_PyArg_ParseTuple)(PyObject *, char *, ...);
254 static int(*dll_PyMem_Free)(void *); 255 static int(*dll_PyMem_Free)(void *);
255 static void* (*dll_PyMem_Malloc)(size_t); 256 static void* (*dll_PyMem_Malloc)(size_t);
256 static int(*dll_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item); 257 static int(*dll_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item);
257 static int(*dll_PyErr_BadArgument)(void); 258 static int(*dll_PyErr_BadArgument)(void);
259 static PyObject *(*dll_PyErr_NewException)(char *, PyObject *, PyObject *);
258 static void(*dll_PyErr_Clear)(void); 260 static void(*dll_PyErr_Clear)(void);
259 static void(*dll_PyErr_PrintEx)(int); 261 static void(*dll_PyErr_PrintEx)(int);
260 static PyObject*(*dll_PyErr_NoMemory)(void); 262 static PyObject*(*dll_PyErr_NoMemory)(void);
261 static PyObject*(*dll_PyErr_Occurred)(void); 263 static PyObject*(*dll_PyErr_Occurred)(void);
262 static void(*dll_PyErr_SetNone)(PyObject *); 264 static void(*dll_PyErr_SetNone)(PyObject *);
389 #endif 391 #endif
390 {"PyMem_Free", (PYTHON_PROC*)&dll_PyMem_Free}, 392 {"PyMem_Free", (PYTHON_PROC*)&dll_PyMem_Free},
391 {"PyMem_Malloc", (PYTHON_PROC*)&dll_PyMem_Malloc}, 393 {"PyMem_Malloc", (PYTHON_PROC*)&dll_PyMem_Malloc},
392 {"PyDict_SetItemString", (PYTHON_PROC*)&dll_PyDict_SetItemString}, 394 {"PyDict_SetItemString", (PYTHON_PROC*)&dll_PyDict_SetItemString},
393 {"PyErr_BadArgument", (PYTHON_PROC*)&dll_PyErr_BadArgument}, 395 {"PyErr_BadArgument", (PYTHON_PROC*)&dll_PyErr_BadArgument},
396 {"PyErr_NewException", (PYTHON_PROC*)&dll_PyErr_NewException},
394 {"PyErr_Clear", (PYTHON_PROC*)&dll_PyErr_Clear}, 397 {"PyErr_Clear", (PYTHON_PROC*)&dll_PyErr_Clear},
395 {"PyErr_PrintEx", (PYTHON_PROC*)&dll_PyErr_PrintEx}, 398 {"PyErr_PrintEx", (PYTHON_PROC*)&dll_PyErr_PrintEx},
396 {"PyErr_NoMemory", (PYTHON_PROC*)&dll_PyErr_NoMemory}, 399 {"PyErr_NoMemory", (PYTHON_PROC*)&dll_PyErr_NoMemory},
397 {"PyErr_Occurred", (PYTHON_PROC*)&dll_PyErr_Occurred}, 400 {"PyErr_Occurred", (PYTHON_PROC*)&dll_PyErr_Occurred},
398 {"PyErr_SetNone", (PYTHON_PROC*)&dll_PyErr_SetNone}, 401 {"PyErr_SetNone", (PYTHON_PROC*)&dll_PyErr_SetNone},
1302 PySys_SetArgv(1, argv); 1305 PySys_SetArgv(1, argv);
1303 1306
1304 mod = Py_InitModule4("vim", VimMethods, (char *)NULL, (PyObject *)NULL, PYTHON_API_VERSION); 1307 mod = Py_InitModule4("vim", VimMethods, (char *)NULL, (PyObject *)NULL, PYTHON_API_VERSION);
1305 dict = PyModule_GetDict(mod); 1308 dict = PyModule_GetDict(mod);
1306 1309
1307 VimError = Py_BuildValue("s", "vim.error"); 1310 VimError = PyErr_NewException("vim.error", NULL, NULL);
1308 1311
1309 PyDict_SetItemString(dict, "error", VimError); 1312 PyDict_SetItemString(dict, "error", VimError);
1310 PyDict_SetItemString(dict, "buffers", (PyObject *)(void *)&TheBufferMap); 1313 PyDict_SetItemString(dict, "buffers", (PyObject *)(void *)&TheBufferMap);
1311 PyDict_SetItemString(dict, "current", (PyObject *)(void *)&TheCurrent); 1314 PyDict_SetItemString(dict, "current", (PyObject *)(void *)&TheCurrent);
1312 PyDict_SetItemString(dict, "windows", (PyObject *)(void *)&TheWindowList); 1315 PyDict_SetItemString(dict, "windows", (PyObject *)(void *)&TheWindowList);