comparison src/if_python3.c @ 4635:07c534fe9b6c v7.3.1065

updated for version 7.3.1065 Problem: Python: key mapping is not standard. Solution: Puthon patch 24: use PyMapping_Keys. (ZyX)
author Bram Moolenaar <bram@vim.org>
date Thu, 30 May 2013 13:22:13 +0200
parents 18ba89e06fab
children 542af01979be
comparison
equal deleted inserted replaced
4634:18c8af5790e9 4635:07c534fe9b6c
158 # define PyObject_Init py3__PyObject_Init 158 # define PyObject_Init py3__PyObject_Init
159 # define PyDict_New py3_PyDict_New 159 # define PyDict_New py3_PyDict_New
160 # define PyDict_GetItemString py3_PyDict_GetItemString 160 # define PyDict_GetItemString py3_PyDict_GetItemString
161 # define PyDict_Next py3_PyDict_Next 161 # define PyDict_Next py3_PyDict_Next
162 # define PyMapping_Check py3_PyMapping_Check 162 # define PyMapping_Check py3_PyMapping_Check
163 # define PyMapping_Items py3_PyMapping_Items 163 # define PyMapping_Keys py3_PyMapping_Keys
164 # define PyIter_Next py3_PyIter_Next 164 # define PyIter_Next py3_PyIter_Next
165 # define PyObject_GetIter py3_PyObject_GetIter 165 # define PyObject_GetIter py3_PyObject_GetIter
166 # define PyObject_GetItem py3_PyObject_GetItem
166 # define PyObject_IsTrue py3_PyObject_IsTrue 167 # define PyObject_IsTrue py3_PyObject_IsTrue
167 # define PyModule_GetDict py3_PyModule_GetDict 168 # define PyModule_GetDict py3_PyModule_GetDict
168 #undef PyRun_SimpleString 169 #undef PyRun_SimpleString
169 # define PyRun_SimpleString py3_PyRun_SimpleString 170 # define PyRun_SimpleString py3_PyRun_SimpleString
170 #undef PyRun_String 171 #undef PyRun_String
274 static PyObject* (*py3_PySequence_GetItem)(PyObject *, Py_ssize_t); 275 static PyObject* (*py3_PySequence_GetItem)(PyObject *, Py_ssize_t);
275 static PyObject* (*py3_PySequence_Fast)(PyObject *, const char *); 276 static PyObject* (*py3_PySequence_Fast)(PyObject *, const char *);
276 static Py_ssize_t (*py3_PyTuple_Size)(PyObject *); 277 static Py_ssize_t (*py3_PyTuple_Size)(PyObject *);
277 static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t); 278 static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
278 static int (*py3_PyMapping_Check)(PyObject *); 279 static int (*py3_PyMapping_Check)(PyObject *);
279 static PyObject* (*py3_PyMapping_Items)(PyObject *); 280 static PyObject* (*py3_PyMapping_Keys)(PyObject *);
280 static int (*py3_PySlice_GetIndicesEx)(PyObject *r, Py_ssize_t length, 281 static int (*py3_PySlice_GetIndicesEx)(PyObject *r, Py_ssize_t length,
281 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, Py_ssize_t *slicelength); 282 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, Py_ssize_t *slicelength);
282 static PyObject* (*py3_PyErr_NoMemory)(void); 283 static PyObject* (*py3_PyErr_NoMemory)(void);
283 static void (*py3_Py_Finalize)(void); 284 static void (*py3_Py_Finalize)(void);
284 static void (*py3_PyErr_SetString)(PyObject *, const char *); 285 static void (*py3_PyErr_SetString)(PyObject *, const char *);
302 static int (*py3_PyDict_Next)(PyObject *, Py_ssize_t *, PyObject **, PyObject **); 303 static int (*py3_PyDict_Next)(PyObject *, Py_ssize_t *, PyObject **, PyObject **);
303 static PyObject* (*py3_PyLong_FromLong)(long); 304 static PyObject* (*py3_PyLong_FromLong)(long);
304 static PyObject* (*py3_PyDict_New)(void); 305 static PyObject* (*py3_PyDict_New)(void);
305 static PyObject* (*py3_PyIter_Next)(PyObject *); 306 static PyObject* (*py3_PyIter_Next)(PyObject *);
306 static PyObject* (*py3_PyObject_GetIter)(PyObject *); 307 static PyObject* (*py3_PyObject_GetIter)(PyObject *);
308 static PyObject* (*py3_PyObject_GetItem)(PyObject *, PyObject *);
307 static int (*py3_PyObject_IsTrue)(PyObject *); 309 static int (*py3_PyObject_IsTrue)(PyObject *);
308 static PyObject* (*py3_Py_BuildValue)(char *, ...); 310 static PyObject* (*py3_Py_BuildValue)(char *, ...);
309 static int (*py3_PyType_Ready)(PyTypeObject *type); 311 static int (*py3_PyType_Ready)(PyTypeObject *type);
310 static int (*py3_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item); 312 static int (*py3_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item);
311 static PyObject* (*py3_PyUnicode_FromString)(const char *u); 313 static PyObject* (*py3_PyUnicode_FromString)(const char *u);
454 {"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict}, 456 {"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict},
455 {"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem}, 457 {"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem},
456 {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString}, 458 {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString},
457 {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next}, 459 {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next},
458 {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check}, 460 {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check},
459 {"PyMapping_Items", (PYTHON_PROC*)&py3_PyMapping_Items}, 461 {"PyMapping_Keys", (PYTHON_PROC*)&py3_PyMapping_Keys},
460 {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next}, 462 {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next},
461 {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter}, 463 {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter},
464 {"PyObject_GetItem", (PYTHON_PROC*)&py3_PyObject_GetItem},
462 {"PyObject_IsTrue", (PYTHON_PROC*)&py3_PyObject_IsTrue}, 465 {"PyObject_IsTrue", (PYTHON_PROC*)&py3_PyObject_IsTrue},
463 {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong}, 466 {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong},
464 {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New}, 467 {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New},
465 {"PyType_Ready", (PYTHON_PROC*)&py3_PyType_Ready}, 468 {"PyType_Ready", (PYTHON_PROC*)&py3_PyType_Ready},
466 {"PyDict_SetItemString", (PYTHON_PROC*)&py3_PyDict_SetItemString}, 469 {"PyDict_SetItemString", (PYTHON_PROC*)&py3_PyDict_SetItemString},