Mercurial > vim
annotate src/if_python3.c @ 4970:f5c822e5a0eb v7.3.1230
updated for version 7.3.1230
Problem: Python: Exception messages are not clear.
Solution: Make exception messages more verbose. (ZyX)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sun, 23 Jun 2013 13:46:40 +0200 |
| parents | b6e693e1f946 |
| children | 537bbfff0c5c |
| rev | line source |
|---|---|
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4: |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
2 * |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
3 * VIM - Vi IMproved by Bram Moolenaar |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
4 * |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
5 * Do ":help uganda" in Vim to read copying and usage conditions. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
6 * Do ":help credits" in Vim to see a list of people who contributed. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
7 * See README.txt for an overview of the Vim source code. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
8 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
9 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
10 * Python extensions by Paul Moore. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
11 * Changes for Unix by David Leonard. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
12 * |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
13 * This consists of four parts: |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
14 * 1. Python interpreter main program |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
15 * 2. Python output stream: writes output via [e]msg(). |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
16 * 3. Implementation of the Vim module for Python |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
17 * 4. Utility functions for handling the interface between Vim and Python. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
18 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
19 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
20 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
21 * Roland Puntaier 2009/sept/16: |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
22 * Adaptations to support both python3.x and python2.x |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
23 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
24 |
| 2716 | 25 /* uncomment this if used with the debug version of python */ |
| 26 /* #define Py_DEBUG */ | |
|
4823
46077370bc60
updated for version 7.3.1158
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
27 /* Note: most of time you can add -DPy_DEBUG to CFLAGS in place of uncommenting |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
28 */ |
|
4823
46077370bc60
updated for version 7.3.1158
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
29 /* uncomment this if used with the debug version of python, but without its |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
30 * allocator */ |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
31 /* #define Py_DEBUG_NO_PYMALLOC */ |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
32 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
33 #include "vim.h" |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
34 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
35 #include <limits.h> |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
36 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
37 /* Python.h defines _POSIX_THREADS itself (if needed) */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
38 #ifdef _POSIX_THREADS |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
39 # undef _POSIX_THREADS |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
40 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
41 |
|
2404
eb4718cb2a76
Include old Python changes in Python 3 interface.
Bram Moolenaar <bram@vim.org>
parents:
2399
diff
changeset
|
42 #if defined(_WIN32) && defined(HAVE_FCNTL_H) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
43 # undef HAVE_FCNTL_H |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
44 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
45 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
46 #ifdef _DEBUG |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
47 # undef _DEBUG |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
48 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
49 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
50 #ifdef F_BLANK |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
51 # undef F_BLANK |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
52 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
53 |
|
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
54 #ifdef HAVE_STDARG_H |
|
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
55 # undef HAVE_STDARG_H /* Python's config.h defines it as well. */ |
|
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
56 #endif |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
57 #ifdef _POSIX_C_SOURCE /* defined in feature.h */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
58 # undef _POSIX_C_SOURCE |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
59 #endif |
|
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
60 #ifdef _XOPEN_SOURCE |
|
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
61 # undef _XOPEN_SOURCE /* pyconfig.h defines it as well. */ |
|
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
62 #endif |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
63 |
|
4823
46077370bc60
updated for version 7.3.1158
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
64 #define PY_SSIZE_T_CLEAN |
|
46077370bc60
updated for version 7.3.1158
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
65 |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
66 #include <Python.h> |
|
4823
46077370bc60
updated for version 7.3.1158
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
67 |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
68 #if defined(MACOS) && !defined(MACOS_X_UNIX) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
69 # include "macglue.h" |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
70 # include <CodeFragments.h> |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
71 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
72 #undef main /* Defined in python.h - aargh */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
73 #undef HAVE_FCNTL_H /* Clash with os_win32.h */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
74 |
| 2955 | 75 /* The "surrogateescape" error handler is new in Python 3.1 */ |
| 76 #if PY_VERSION_HEX >= 0x030100f0 | |
| 77 # define CODEC_ERROR_HANDLER "surrogateescape" | |
| 78 #else | |
| 79 # define CODEC_ERROR_HANDLER NULL | |
| 80 #endif | |
| 81 | |
| 3638 | 82 /* Python 3 does not support CObjects, always use Capsules */ |
| 83 #define PY_USE_CAPSULE | |
| 84 | |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
85 #define PyInt Py_ssize_t |
|
2447
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2404
diff
changeset
|
86 #define PyString_Check(obj) PyUnicode_Check(obj) |
|
84d353762845
Move many more common Python items to if_py_both.c.
Bram Moolenaar <bram@vim.org>
parents:
2404
diff
changeset
|
87 #define PyString_FromString(repr) PyUnicode_FromString(repr) |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
88 #define PyString_FromFormat PyUnicode_FromFormat |
| 3826 | 89 #define PyInt_Check(obj) PyLong_Check(obj) |
| 90 #define PyInt_FromLong(i) PyLong_FromLong(i) | |
| 91 #define PyInt_AsLong(obj) PyLong_AsLong(obj) | |
| 4319 | 92 #define Py_ssize_t_fmt "n" |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
93 #define Py_bytes_fmt "y" |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
94 |
| 2716 | 95 #if defined(DYNAMIC_PYTHON3) || defined(PROTO) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
96 |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
97 # ifndef WIN3264 |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
98 # include <dlfcn.h> |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
99 # define FARPROC void* |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
100 # define HINSTANCE void* |
| 2641 | 101 # if defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL) |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
102 # define load_dll(n) dlopen((n), RTLD_LAZY) |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
103 # else |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
104 # define load_dll(n) dlopen((n), RTLD_LAZY|RTLD_GLOBAL) |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
105 # endif |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
106 # define close_dll dlclose |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
107 # define symbol_from_dll dlsym |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
108 # else |
| 2612 | 109 # define load_dll vimLoadLib |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
110 # define close_dll FreeLibrary |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
111 # define symbol_from_dll GetProcAddress |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
112 # endif |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
113 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
114 * Wrapper defines |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
115 */ |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
116 # undef PyArg_Parse |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
117 # define PyArg_Parse py3_PyArg_Parse |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
118 # undef PyArg_ParseTuple |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
119 # define PyArg_ParseTuple py3_PyArg_ParseTuple |
| 2894 | 120 # define PyMem_Free py3_PyMem_Free |
| 3618 | 121 # define PyMem_Malloc py3_PyMem_Malloc |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
122 # define PyDict_SetItemString py3_PyDict_SetItemString |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
123 # define PyErr_BadArgument py3_PyErr_BadArgument |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
124 # define PyErr_Clear py3_PyErr_Clear |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
125 # define PyErr_Format py3_PyErr_Format |
| 4145 | 126 # define PyErr_PrintEx py3_PyErr_PrintEx |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
127 # define PyErr_NoMemory py3_PyErr_NoMemory |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
128 # define PyErr_Occurred py3_PyErr_Occurred |
| 4417 | 129 # define PyErr_PrintEx py3_PyErr_PrintEx |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
130 # define PyErr_SetNone py3_PyErr_SetNone |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
131 # define PyErr_SetString py3_PyErr_SetString |
| 4403 | 132 # define PyErr_SetObject py3_PyErr_SetObject |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
133 # define PyErr_ExceptionMatches py3_PyErr_ExceptionMatches |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
134 # define PyEval_InitThreads py3_PyEval_InitThreads |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
135 # define PyEval_RestoreThread py3_PyEval_RestoreThread |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
136 # define PyEval_SaveThread py3_PyEval_SaveThread |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
137 # define PyGILState_Ensure py3_PyGILState_Ensure |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
138 # define PyGILState_Release py3_PyGILState_Release |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
139 # define PyLong_AsLong py3_PyLong_AsLong |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
140 # define PyLong_FromLong py3_PyLong_FromLong |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
141 # define PyList_GetItem py3_PyList_GetItem |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
142 # define PyList_Append py3_PyList_Append |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
143 # define PyList_Insert py3_PyList_Insert |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
144 # define PyList_New py3_PyList_New |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
145 # define PyList_SetItem py3_PyList_SetItem |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
146 # define PyList_Size py3_PyList_Size |
| 3618 | 147 # define PySequence_Check py3_PySequence_Check |
| 148 # define PySequence_Size py3_PySequence_Size | |
| 149 # define PySequence_GetItem py3_PySequence_GetItem | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
150 # define PySequence_Fast py3_PySequence_Fast |
| 3618 | 151 # define PyTuple_Size py3_PyTuple_Size |
| 152 # define PyTuple_GetItem py3_PyTuple_GetItem | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
153 # define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
154 # define PyImport_ImportModule py3_PyImport_ImportModule |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
155 # define PyObject_Init py3__PyObject_Init |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
156 # define PyDict_New py3_PyDict_New |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
157 # define PyDict_GetItemString py3_PyDict_GetItemString |
| 3618 | 158 # define PyDict_Next py3_PyDict_Next |
| 159 # define PyMapping_Check py3_PyMapping_Check | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
160 # define PyMapping_Keys py3_PyMapping_Keys |
| 3618 | 161 # define PyIter_Next py3_PyIter_Next |
| 162 # define PyObject_GetIter py3_PyObject_GetIter | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
163 # define PyObject_GetItem py3_PyObject_GetItem |
| 4399 | 164 # define PyObject_IsTrue py3_PyObject_IsTrue |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
165 # define PyModule_GetDict py3_PyModule_GetDict |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
166 #undef PyRun_SimpleString |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
167 # define PyRun_SimpleString py3_PyRun_SimpleString |
| 3618 | 168 #undef PyRun_String |
| 169 # define PyRun_String py3_PyRun_String | |
| 4417 | 170 # define PyObject_GetAttrString py3_PyObject_GetAttrString |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
171 # define PyObject_HasAttrString py3_PyObject_HasAttrString |
| 4417 | 172 # define PyObject_SetAttrString py3_PyObject_SetAttrString |
| 173 # define PyObject_CallFunctionObjArgs py3_PyObject_CallFunctionObjArgs | |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
174 # define _PyObject_CallFunction_SizeT py3__PyObject_CallFunction_SizeT |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4635
diff
changeset
|
175 # define PyObject_Call py3_PyObject_Call |
| 4417 | 176 # define PyEval_GetLocals py3_PyEval_GetLocals |
| 177 # define PyEval_GetGlobals py3_PyEval_GetGlobals | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
178 # define PySys_SetObject py3_PySys_SetObject |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
179 # define PySys_GetObject py3_PySys_GetObject |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
180 # define PySys_SetArgv py3_PySys_SetArgv |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
181 # define PyType_Ready py3_PyType_Ready |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
182 #undef Py_BuildValue |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
183 # define Py_BuildValue py3_Py_BuildValue |
| 2641 | 184 # define Py_SetPythonHome py3_Py_SetPythonHome |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
185 # define Py_Initialize py3_Py_Initialize |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
186 # define Py_Finalize py3_Py_Finalize |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
187 # define Py_IsInitialized py3_Py_IsInitialized |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
188 # define _Py_NoneStruct (*py3__Py_NoneStruct) |
| 3828 | 189 # define _Py_FalseStruct (*py3__Py_FalseStruct) |
| 190 # define _Py_TrueStruct (*py3__Py_TrueStruct) | |
| 3618 | 191 # define _PyObject_NextNotImplemented (*py3__PyObject_NextNotImplemented) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
192 # define PyModule_AddObject py3_PyModule_AddObject |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
193 # define PyImport_AppendInittab py3_PyImport_AppendInittab |
| 4417 | 194 # define PyImport_AddModule py3_PyImport_AddModule |
| 3863 | 195 # if PY_VERSION_HEX >= 0x030300f0 |
| 196 # undef _PyUnicode_AsString | |
| 3910 | 197 # define _PyUnicode_AsString py3_PyUnicode_AsUTF8 |
| 3863 | 198 # else |
| 199 # define _PyUnicode_AsString py3__PyUnicode_AsString | |
| 200 # endif | |
| 2894 | 201 # undef PyUnicode_AsEncodedString |
| 202 # define PyUnicode_AsEncodedString py3_PyUnicode_AsEncodedString | |
| 203 # undef PyBytes_AsString | |
| 204 # define PyBytes_AsString py3_PyBytes_AsString | |
| 3798 | 205 # define PyBytes_AsStringAndSize py3_PyBytes_AsStringAndSize |
| 3618 | 206 # undef PyBytes_FromString |
| 207 # define PyBytes_FromString py3_PyBytes_FromString | |
| 208 # define PyFloat_FromDouble py3_PyFloat_FromDouble | |
| 209 # define PyFloat_AsDouble py3_PyFloat_AsDouble | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
210 # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr |
| 3828 | 211 # define PyType_Type (*py3_PyType_Type) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
212 # define PySlice_Type (*py3_PySlice_Type) |
| 3618 | 213 # define PyFloat_Type (*py3_PyFloat_Type) |
| 3828 | 214 # define PyBool_Type (*py3_PyBool_Type) |
| 2894 | 215 # define PyErr_NewException py3_PyErr_NewException |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
216 # ifdef Py_DEBUG |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
217 # define _Py_NegativeRefcount py3__Py_NegativeRefcount |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
218 # define _Py_RefTotal (*py3__Py_RefTotal) |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
219 # define _Py_Dealloc py3__Py_Dealloc |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
220 # define PyModule_Create2TraceRefs py3_PyModule_Create2TraceRefs |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
221 # else |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
222 # define PyModule_Create2 py3_PyModule_Create2 |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
223 # endif |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
224 # if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
225 # define _PyObject_DebugMalloc py3__PyObject_DebugMalloc |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
226 # define _PyObject_DebugFree py3__PyObject_DebugFree |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
227 # else |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
228 # define PyObject_Malloc py3_PyObject_Malloc |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
229 # define PyObject_Free py3_PyObject_Free |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
230 # endif |
| 4500 | 231 # define _PyObject_GC_New py3__PyObject_GC_New |
| 232 # define PyObject_GC_Del py3_PyObject_GC_Del | |
| 233 # define PyObject_GC_UnTrack py3_PyObject_GC_UnTrack | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
234 # define PyType_GenericAlloc py3_PyType_GenericAlloc |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
235 # define PyType_GenericNew py3_PyType_GenericNew |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
236 # undef PyUnicode_FromString |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
237 # define PyUnicode_FromString py3_PyUnicode_FromString |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
238 # ifndef PyUnicode_FromFormat |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
239 # define PyUnicode_FromFormat py3_PyUnicode_FromFormat |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
240 # else |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
241 # define Py_UNICODE_USE_UCS_FUNCTIONS |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
242 # ifdef Py_UNICODE_WIDE |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
243 # define PyUnicodeUCS4_FromFormat py3_PyUnicodeUCS4_FromFormat |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
244 # else |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
245 # define PyUnicodeUCS2_FromFormat py3_PyUnicodeUCS2_FromFormat |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
246 # endif |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
247 # endif |
| 2894 | 248 # undef PyUnicode_Decode |
| 249 # define PyUnicode_Decode py3_PyUnicode_Decode | |
| 3618 | 250 # define PyType_IsSubtype py3_PyType_IsSubtype |
| 251 # define PyCapsule_New py3_PyCapsule_New | |
| 252 # define PyCapsule_GetPointer py3_PyCapsule_GetPointer | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
253 |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
254 # if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
255 # undef PyObject_NEW |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
256 # define PyObject_NEW(type, typeobj) \ |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
257 ( (type *) PyObject_Init( \ |
| 2330 | 258 (PyObject *) _PyObject_DebugMalloc( _PyObject_SIZE(typeobj) ), (typeobj)) ) |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
259 # endif |
|
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
260 |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
261 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
262 * Pointers for dynamic link |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
263 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
264 static int (*py3_PySys_SetArgv)(int, wchar_t **); |
| 2641 | 265 static void (*py3_Py_SetPythonHome)(wchar_t *home); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
266 static void (*py3_Py_Initialize)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
267 static PyObject* (*py3_PyList_New)(Py_ssize_t size); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
268 static PyGILState_STATE (*py3_PyGILState_Ensure)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
269 static void (*py3_PyGILState_Release)(PyGILState_STATE); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
270 static int (*py3_PySys_SetObject)(char *, PyObject *); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
271 static PyObject* (*py3_PySys_GetObject)(char *); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
272 static int (*py3_PyList_Append)(PyObject *, PyObject *); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
273 static int (*py3_PyList_Insert)(PyObject *, int, PyObject *); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
274 static Py_ssize_t (*py3_PyList_Size)(PyObject *); |
| 3618 | 275 static int (*py3_PySequence_Check)(PyObject *); |
| 276 static Py_ssize_t (*py3_PySequence_Size)(PyObject *); | |
| 277 static PyObject* (*py3_PySequence_GetItem)(PyObject *, Py_ssize_t); | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
278 static PyObject* (*py3_PySequence_Fast)(PyObject *, const char *); |
| 3618 | 279 static Py_ssize_t (*py3_PyTuple_Size)(PyObject *); |
| 280 static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t); | |
| 281 static int (*py3_PyMapping_Check)(PyObject *); | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
282 static PyObject* (*py3_PyMapping_Keys)(PyObject *); |
| 3083 | 283 static int (*py3_PySlice_GetIndicesEx)(PyObject *r, Py_ssize_t length, |
| 2330 | 284 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, Py_ssize_t *slicelength); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
285 static PyObject* (*py3_PyErr_NoMemory)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
286 static void (*py3_Py_Finalize)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
287 static void (*py3_PyErr_SetString)(PyObject *, const char *); |
| 4403 | 288 static void (*py3_PyErr_SetObject)(PyObject *, PyObject *); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
289 static int (*py3_PyErr_ExceptionMatches)(PyObject *); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
290 static int (*py3_PyRun_SimpleString)(char *); |
| 3618 | 291 static PyObject* (*py3_PyRun_String)(char *, int, PyObject *, PyObject *); |
| 4417 | 292 static PyObject* (*py3_PyObject_GetAttrString)(PyObject *, const char *); |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
293 static int (*py3_PyObject_HasAttrString)(PyObject *, const char *); |
| 4417 | 294 static PyObject* (*py3_PyObject_SetAttrString)(PyObject *, const char *, PyObject *); |
| 295 static PyObject* (*py3_PyObject_CallFunctionObjArgs)(PyObject *, ...); | |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
296 static PyObject* (*py3__PyObject_CallFunction_SizeT)(PyObject *, char *, ...); |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4635
diff
changeset
|
297 static PyObject* (*py3_PyObject_Call)(PyObject *, PyObject *, PyObject *); |
| 4417 | 298 static PyObject* (*py3_PyEval_GetGlobals)(); |
| 299 static PyObject* (*py3_PyEval_GetLocals)(); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
300 static PyObject* (*py3_PyList_GetItem)(PyObject *, Py_ssize_t); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
301 static PyObject* (*py3_PyImport_ImportModule)(const char *); |
| 3618 | 302 static PyObject* (*py3_PyImport_AddModule)(const char *); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
303 static int (*py3_PyErr_BadArgument)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
304 static PyObject* (*py3_PyErr_Occurred)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
305 static PyObject* (*py3_PyModule_GetDict)(PyObject *); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
306 static int (*py3_PyList_SetItem)(PyObject *, Py_ssize_t, PyObject *); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
307 static PyObject* (*py3_PyDict_GetItemString)(PyObject *, const char *); |
| 3618 | 308 static int (*py3_PyDict_Next)(PyObject *, Py_ssize_t *, PyObject **, PyObject **); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
309 static PyObject* (*py3_PyLong_FromLong)(long); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
310 static PyObject* (*py3_PyDict_New)(void); |
| 3618 | 311 static PyObject* (*py3_PyIter_Next)(PyObject *); |
| 312 static PyObject* (*py3_PyObject_GetIter)(PyObject *); | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
313 static PyObject* (*py3_PyObject_GetItem)(PyObject *, PyObject *); |
| 4399 | 314 static int (*py3_PyObject_IsTrue)(PyObject *); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
315 static PyObject* (*py3_Py_BuildValue)(char *, ...); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
316 static int (*py3_PyType_Ready)(PyTypeObject *type); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
317 static int (*py3_PyDict_SetItemString)(PyObject *dp, char *key, PyObject *item); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
318 static PyObject* (*py3_PyUnicode_FromString)(const char *u); |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
319 # ifndef Py_UNICODE_USE_UCS_FUNCTIONS |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
320 static PyObject* (*py3_PyUnicode_FromFormat)(const char *u, ...); |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
321 # else |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
322 # ifdef Py_UNICODE_WIDE |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
323 static PyObject* (*py3_PyUnicodeUCS4_FromFormat)(const char *u, ...); |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
324 # else |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
325 static PyObject* (*py3_PyUnicodeUCS2_FromFormat)(const char *u, ...); |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
326 # endif |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
327 # endif |
| 2894 | 328 static PyObject* (*py3_PyUnicode_Decode)(const char *u, Py_ssize_t size, |
| 329 const char *encoding, const char *errors); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
330 static long (*py3_PyLong_AsLong)(PyObject *); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
331 static void (*py3_PyErr_SetNone)(PyObject *); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
332 static void (*py3_PyEval_InitThreads)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
333 static void(*py3_PyEval_RestoreThread)(PyThreadState *); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
334 static PyThreadState*(*py3_PyEval_SaveThread)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
335 static int (*py3_PyArg_Parse)(PyObject *, char *, ...); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
336 static int (*py3_PyArg_ParseTuple)(PyObject *, char *, ...); |
| 2894 | 337 static int (*py3_PyMem_Free)(void *); |
| 3618 | 338 static void* (*py3_PyMem_Malloc)(size_t); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
339 static int (*py3_Py_IsInitialized)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
340 static void (*py3_PyErr_Clear)(void); |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
341 static PyObject* (*py3_PyErr_Format)(PyObject *, const char *, ...); |
| 4145 | 342 static void (*py3_PyErr_PrintEx)(int); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
343 static PyObject*(*py3__PyObject_Init)(PyObject *, PyTypeObject *); |
| 3618 | 344 static iternextfunc py3__PyObject_NextNotImplemented; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
345 static PyObject* py3__Py_NoneStruct; |
| 3828 | 346 static PyObject* py3__Py_FalseStruct; |
| 347 static PyObject* py3__Py_TrueStruct; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
348 static int (*py3_PyModule_AddObject)(PyObject *m, const char *name, PyObject *o); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
349 static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void)); |
| 3910 | 350 # if PY_VERSION_HEX >= 0x030300f0 |
| 351 static char* (*py3_PyUnicode_AsUTF8)(PyObject *unicode); | |
| 352 # else | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
353 static char* (*py3__PyUnicode_AsString)(PyObject *unicode); |
| 3910 | 354 # endif |
| 2894 | 355 static PyObject* (*py3_PyUnicode_AsEncodedString)(PyObject *unicode, const char* encoding, const char* errors); |
| 356 static char* (*py3_PyBytes_AsString)(PyObject *bytes); | |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4881
diff
changeset
|
357 static int (*py3_PyBytes_AsStringAndSize)(PyObject *bytes, char **buffer, Py_ssize_t *length); |
| 3618 | 358 static PyObject* (*py3_PyBytes_FromString)(char *str); |
| 359 static PyObject* (*py3_PyFloat_FromDouble)(double num); | |
| 360 static double (*py3_PyFloat_AsDouble)(PyObject *); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
361 static PyObject* (*py3_PyObject_GenericGetAttr)(PyObject *obj, PyObject *name); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
362 static PyObject* (*py3_PyType_GenericAlloc)(PyTypeObject *type, Py_ssize_t nitems); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
363 static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args, PyObject *kwds); |
| 3828 | 364 static PyTypeObject* py3_PyType_Type; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
365 static PyTypeObject* py3_PySlice_Type; |
| 3618 | 366 static PyTypeObject* py3_PyFloat_Type; |
| 3828 | 367 static PyTypeObject* py3_PyBool_Type; |
| 2894 | 368 static PyObject* (*py3_PyErr_NewException)(char *name, PyObject *base, PyObject *dict); |
| 3618 | 369 static PyObject* (*py3_PyCapsule_New)(void *, char *, PyCapsule_Destructor); |
| 370 static void* (*py3_PyCapsule_GetPointer)(PyObject *, char *); | |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
371 # ifdef Py_DEBUG |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
372 static void (*py3__Py_NegativeRefcount)(const char *fname, int lineno, PyObject *op); |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
373 static Py_ssize_t* py3__Py_RefTotal; |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
374 static void (*py3__Py_Dealloc)(PyObject *obj); |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
375 static PyObject* (*py3_PyModule_Create2TraceRefs)(struct PyModuleDef* module, int module_api_version); |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
376 # else |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
377 static PyObject* (*py3_PyModule_Create2)(struct PyModuleDef* module, int module_api_version); |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
378 # endif |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
379 # if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
380 static void (*py3__PyObject_DebugFree)(void*); |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
381 static void* (*py3__PyObject_DebugMalloc)(size_t); |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
382 # else |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
383 static void (*py3_PyObject_Free)(void*); |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
384 static void* (*py3_PyObject_Malloc)(size_t); |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
385 # endif |
| 4500 | 386 static PyObject*(*py3__PyObject_GC_New)(PyTypeObject *); |
| 387 static void(*py3_PyObject_GC_Del)(void *); | |
| 388 static void(*py3_PyObject_GC_UnTrack)(void *); | |
| 3618 | 389 static int (*py3_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
390 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
391 static HINSTANCE hinstPy3 = 0; /* Instance of python.dll */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
392 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
393 /* Imported exception objects */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
394 static PyObject *p3imp_PyExc_AttributeError; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
395 static PyObject *p3imp_PyExc_IndexError; |
| 4315 | 396 static PyObject *p3imp_PyExc_KeyError; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
397 static PyObject *p3imp_PyExc_KeyboardInterrupt; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
398 static PyObject *p3imp_PyExc_TypeError; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
399 static PyObject *p3imp_PyExc_ValueError; |
| 4405 | 400 static PyObject *p3imp_PyExc_RuntimeError; |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
401 static PyObject *p3imp_PyExc_ImportError; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
402 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
403 # define PyExc_AttributeError p3imp_PyExc_AttributeError |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
404 # define PyExc_IndexError p3imp_PyExc_IndexError |
| 4315 | 405 # define PyExc_KeyError p3imp_PyExc_KeyError |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
406 # define PyExc_KeyboardInterrupt p3imp_PyExc_KeyboardInterrupt |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
407 # define PyExc_TypeError p3imp_PyExc_TypeError |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
408 # define PyExc_ValueError p3imp_PyExc_ValueError |
| 4405 | 409 # define PyExc_RuntimeError p3imp_PyExc_RuntimeError |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
410 # define PyExc_ImportError p3imp_PyExc_ImportError |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
411 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
412 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
413 * Table of name to function pointer of python. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
414 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
415 # define PYTHON_PROC FARPROC |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
416 static struct |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
417 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
418 char *name; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
419 PYTHON_PROC *ptr; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
420 } py3_funcname_table[] = |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
421 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
422 {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv}, |
| 2641 | 423 {"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
424 {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize}, |
| 3806 | 425 {"_PyArg_ParseTuple_SizeT", (PYTHON_PROC*)&py3_PyArg_ParseTuple}, |
| 426 {"_Py_BuildValue_SizeT", (PYTHON_PROC*)&py3_Py_BuildValue}, | |
| 2894 | 427 {"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free}, |
| 3618 | 428 {"PyMem_Malloc", (PYTHON_PROC*)&py3_PyMem_Malloc}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
429 {"PyList_New", (PYTHON_PROC*)&py3_PyList_New}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
430 {"PyGILState_Ensure", (PYTHON_PROC*)&py3_PyGILState_Ensure}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
431 {"PyGILState_Release", (PYTHON_PROC*)&py3_PyGILState_Release}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
432 {"PySys_SetObject", (PYTHON_PROC*)&py3_PySys_SetObject}, |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
433 {"PySys_GetObject", (PYTHON_PROC*)&py3_PySys_GetObject}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
434 {"PyList_Append", (PYTHON_PROC*)&py3_PyList_Append}, |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
435 {"PyList_Insert", (PYTHON_PROC*)&py3_PyList_Insert}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
436 {"PyList_Size", (PYTHON_PROC*)&py3_PyList_Size}, |
| 3618 | 437 {"PySequence_Check", (PYTHON_PROC*)&py3_PySequence_Check}, |
| 438 {"PySequence_Size", (PYTHON_PROC*)&py3_PySequence_Size}, | |
| 439 {"PySequence_GetItem", (PYTHON_PROC*)&py3_PySequence_GetItem}, | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
440 {"PySequence_Fast", (PYTHON_PROC*)&py3_PySequence_Fast}, |
| 3618 | 441 {"PyTuple_Size", (PYTHON_PROC*)&py3_PyTuple_Size}, |
| 442 {"PyTuple_GetItem", (PYTHON_PROC*)&py3_PyTuple_GetItem}, | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
443 {"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
444 {"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
445 {"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
446 {"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString}, |
| 4403 | 447 {"PyErr_SetObject", (PYTHON_PROC*)&py3_PyErr_SetObject}, |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
448 {"PyErr_ExceptionMatches", (PYTHON_PROC*)&py3_PyErr_ExceptionMatches}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
449 {"PyRun_SimpleString", (PYTHON_PROC*)&py3_PyRun_SimpleString}, |
| 3618 | 450 {"PyRun_String", (PYTHON_PROC*)&py3_PyRun_String}, |
| 4417 | 451 {"PyObject_GetAttrString", (PYTHON_PROC*)&py3_PyObject_GetAttrString}, |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
452 {"PyObject_HasAttrString", (PYTHON_PROC*)&py3_PyObject_HasAttrString}, |
| 4417 | 453 {"PyObject_SetAttrString", (PYTHON_PROC*)&py3_PyObject_SetAttrString}, |
| 454 {"PyObject_CallFunctionObjArgs", (PYTHON_PROC*)&py3_PyObject_CallFunctionObjArgs}, | |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
455 {"_PyObject_CallFunction_SizeT", (PYTHON_PROC*)&py3__PyObject_CallFunction_SizeT}, |
|
4704
542af01979be
updated for version 7.3.1099
Bram Moolenaar <bram@vim.org>
parents:
4635
diff
changeset
|
456 {"PyObject_Call", (PYTHON_PROC*)&py3_PyObject_Call}, |
| 4417 | 457 {"PyEval_GetGlobals", (PYTHON_PROC*)&py3_PyEval_GetGlobals}, |
| 458 {"PyEval_GetLocals", (PYTHON_PROC*)&py3_PyEval_GetLocals}, | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
459 {"PyList_GetItem", (PYTHON_PROC*)&py3_PyList_GetItem}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
460 {"PyImport_ImportModule", (PYTHON_PROC*)&py3_PyImport_ImportModule}, |
| 3618 | 461 {"PyImport_AddModule", (PYTHON_PROC*)&py3_PyImport_AddModule}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
462 {"PyErr_BadArgument", (PYTHON_PROC*)&py3_PyErr_BadArgument}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
463 {"PyErr_Occurred", (PYTHON_PROC*)&py3_PyErr_Occurred}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
464 {"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
465 {"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
466 {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString}, |
| 3618 | 467 {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next}, |
| 468 {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check}, | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
469 {"PyMapping_Keys", (PYTHON_PROC*)&py3_PyMapping_Keys}, |
| 3618 | 470 {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next}, |
| 471 {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter}, | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
472 {"PyObject_GetItem", (PYTHON_PROC*)&py3_PyObject_GetItem}, |
| 4399 | 473 {"PyObject_IsTrue", (PYTHON_PROC*)&py3_PyObject_IsTrue}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
474 {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
475 {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
476 {"PyType_Ready", (PYTHON_PROC*)&py3_PyType_Ready}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
477 {"PyDict_SetItemString", (PYTHON_PROC*)&py3_PyDict_SetItemString}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
478 {"PyLong_AsLong", (PYTHON_PROC*)&py3_PyLong_AsLong}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
479 {"PyErr_SetNone", (PYTHON_PROC*)&py3_PyErr_SetNone}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
480 {"PyEval_InitThreads", (PYTHON_PROC*)&py3_PyEval_InitThreads}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
481 {"PyEval_RestoreThread", (PYTHON_PROC*)&py3_PyEval_RestoreThread}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
482 {"PyEval_SaveThread", (PYTHON_PROC*)&py3_PyEval_SaveThread}, |
|
4881
7b8991e084f9
updated for version 7.3.1186
Bram Moolenaar <bram@vim.org>
parents:
4855
diff
changeset
|
483 {"_PyArg_Parse_SizeT", (PYTHON_PROC*)&py3_PyArg_Parse}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
484 {"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized}, |
| 3618 | 485 {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&py3__PyObject_NextNotImplemented}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
486 {"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct}, |
| 3828 | 487 {"_Py_FalseStruct", (PYTHON_PROC*)&py3__Py_FalseStruct}, |
| 488 {"_Py_TrueStruct", (PYTHON_PROC*)&py3__Py_TrueStruct}, | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
489 {"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear}, |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
490 {"PyErr_Format", (PYTHON_PROC*)&py3_PyErr_Format}, |
| 4145 | 491 {"PyErr_PrintEx", (PYTHON_PROC*)&py3_PyErr_PrintEx}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
492 {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
493 {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
494 {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab}, |
| 3910 | 495 # if PY_VERSION_HEX >= 0x030300f0 |
| 496 {"PyUnicode_AsUTF8", (PYTHON_PROC*)&py3_PyUnicode_AsUTF8}, | |
| 497 # else | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
498 {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString}, |
| 3910 | 499 # endif |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
500 # ifndef Py_UNICODE_USE_UCS_FUNCTIONS |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
501 {"PyUnicode_FromFormat", (PYTHON_PROC*)&py3_PyUnicode_FromFormat}, |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
502 # else |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
503 # ifdef Py_UNICODE_WIDE |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
504 {"PyUnicodeUCS4_FromFormat", (PYTHON_PROC*)&py3_PyUnicodeUCS4_FromFormat}, |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
505 # else |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
506 {"PyUnicodeUCS2_FromFormat", (PYTHON_PROC*)&py3_PyUnicodeUCS2_FromFormat}, |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
507 # endif |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
508 # endif |
| 2894 | 509 {"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString}, |
| 3798 | 510 {"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize}, |
| 3618 | 511 {"PyBytes_FromString", (PYTHON_PROC*)&py3_PyBytes_FromString}, |
| 512 {"PyFloat_FromDouble", (PYTHON_PROC*)&py3_PyFloat_FromDouble}, | |
| 513 {"PyFloat_AsDouble", (PYTHON_PROC*)&py3_PyFloat_AsDouble}, | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
514 {"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
515 {"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
516 {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew}, |
| 3828 | 517 {"PyType_Type", (PYTHON_PROC*)&py3_PyType_Type}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
518 {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type}, |
| 3618 | 519 {"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type}, |
| 3828 | 520 {"PyBool_Type", (PYTHON_PROC*)&py3_PyBool_Type}, |
| 2894 | 521 {"PyErr_NewException", (PYTHON_PROC*)&py3_PyErr_NewException}, |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
522 # ifdef Py_DEBUG |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
523 {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
524 {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
525 {"_Py_Dealloc", (PYTHON_PROC*)&py3__Py_Dealloc}, |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
526 {"PyModule_Create2TraceRefs", (PYTHON_PROC*)&py3_PyModule_Create2TraceRefs}, |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
527 # else |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
528 {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2}, |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
529 # endif |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
530 # if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
531 {"_PyObject_DebugFree", (PYTHON_PROC*)&py3__PyObject_DebugFree}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
532 {"_PyObject_DebugMalloc", (PYTHON_PROC*)&py3__PyObject_DebugMalloc}, |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
533 # else |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
534 {"PyObject_Malloc", (PYTHON_PROC*)&py3_PyObject_Malloc}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
535 {"PyObject_Free", (PYTHON_PROC*)&py3_PyObject_Free}, |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
536 # endif |
| 4500 | 537 {"_PyObject_GC_New", (PYTHON_PROC*)&py3__PyObject_GC_New}, |
| 538 {"PyObject_GC_Del", (PYTHON_PROC*)&py3_PyObject_GC_Del}, | |
| 539 {"PyObject_GC_UnTrack", (PYTHON_PROC*)&py3_PyObject_GC_UnTrack}, | |
| 3618 | 540 {"PyType_IsSubtype", (PYTHON_PROC*)&py3_PyType_IsSubtype}, |
| 541 {"PyCapsule_New", (PYTHON_PROC*)&py3_PyCapsule_New}, | |
| 542 {"PyCapsule_GetPointer", (PYTHON_PROC*)&py3_PyCapsule_GetPointer}, | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
543 {"", NULL}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
544 }; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
545 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
546 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
547 * Free python.dll |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
548 */ |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
549 static void |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
550 end_dynamic_python3(void) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
551 { |
|
2384
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
552 if (hinstPy3 != 0) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
553 { |
| 2330 | 554 close_dll(hinstPy3); |
| 555 hinstPy3 = 0; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
556 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
557 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
558 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
559 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
560 * Load library and get all pointers. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
561 * Parameter 'libname' provides name of DLL. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
562 * Return OK or FAIL. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
563 */ |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
564 static int |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
565 py3_runtime_link_init(char *libname, int verbose) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
566 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
567 int i; |
| 2894 | 568 void *ucs_from_string, *ucs_decode, *ucs_as_encoded_string; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
569 |
| 2641 | 570 # if !(defined(PY_NO_RTLD_GLOBAL) && defined(PY3_NO_RTLD_GLOBAL)) && defined(UNIX) && defined(FEAT_PYTHON) |
|
2554
7abef60aca22
Add a configure check for RTLD_GLOBAL. (James Vega, Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
2528
diff
changeset
|
571 /* Can't have Python and Python3 loaded at the same time. |
|
7abef60aca22
Add a configure check for RTLD_GLOBAL. (James Vega, Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
2528
diff
changeset
|
572 * It cause a crash, because RTLD_GLOBAL is needed for |
|
7abef60aca22
Add a configure check for RTLD_GLOBAL. (James Vega, Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
2528
diff
changeset
|
573 * standard C extension libraries of one or both python versions. */ |
|
2384
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
574 if (python_loaded()) |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
575 { |
| 3032 | 576 if (verbose) |
| 577 EMSG(_("E837: This Vim cannot execute :py3 after using :python")); | |
|
2384
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
578 return FAIL; |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
579 } |
|
2528
8bc2e8390c11
When building with both Python 2 and Python 3 don't use RTLD_GLOBAL, so that
Bram Moolenaar <bram@vim.org>
parents:
2447
diff
changeset
|
580 # endif |
|
2384
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
581 |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
582 if (hinstPy3 != 0) |
| 2330 | 583 return OK; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
584 hinstPy3 = load_dll(libname); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
585 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
586 if (!hinstPy3) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
587 { |
| 2330 | 588 if (verbose) |
| 589 EMSG2(_(e_loadlib), libname); | |
| 590 return FAIL; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
591 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
592 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
593 for (i = 0; py3_funcname_table[i].ptr; ++i) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
594 { |
| 2330 | 595 if ((*py3_funcname_table[i].ptr = symbol_from_dll(hinstPy3, |
| 596 py3_funcname_table[i].name)) == NULL) | |
| 597 { | |
| 598 close_dll(hinstPy3); | |
| 599 hinstPy3 = 0; | |
| 600 if (verbose) | |
| 601 EMSG2(_(e_loadfunc), py3_funcname_table[i].name); | |
| 602 return FAIL; | |
| 603 } | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
604 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
605 |
|
2342
f6540762173d
Fixes and improvements for MS-Windows build.
Bram Moolenaar <bram@vim.org>
parents:
2340
diff
changeset
|
606 /* Load unicode functions separately as only the ucs2 or the ucs4 functions |
|
f6540762173d
Fixes and improvements for MS-Windows build.
Bram Moolenaar <bram@vim.org>
parents:
2340
diff
changeset
|
607 * will be present in the library. */ |
| 3910 | 608 # if PY_VERSION_HEX >= 0x030300f0 |
| 3863 | 609 ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicode_FromString"); |
| 610 ucs_decode = symbol_from_dll(hinstPy3, "PyUnicode_Decode"); | |
| 611 ucs_as_encoded_string = symbol_from_dll(hinstPy3, | |
| 612 "PyUnicode_AsEncodedString"); | |
| 3910 | 613 # else |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
614 ucs_from_string = symbol_from_dll(hinstPy3, "PyUnicodeUCS2_FromString"); |
| 2894 | 615 ucs_decode = symbol_from_dll(hinstPy3, |
| 616 "PyUnicodeUCS2_Decode"); | |
| 617 ucs_as_encoded_string = symbol_from_dll(hinstPy3, | |
| 618 "PyUnicodeUCS2_AsEncodedString"); | |
| 619 if (!ucs_from_string || !ucs_decode || !ucs_as_encoded_string) | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
620 { |
| 2330 | 621 ucs_from_string = symbol_from_dll(hinstPy3, |
| 622 "PyUnicodeUCS4_FromString"); | |
| 2894 | 623 ucs_decode = symbol_from_dll(hinstPy3, |
| 624 "PyUnicodeUCS4_Decode"); | |
| 625 ucs_as_encoded_string = symbol_from_dll(hinstPy3, | |
| 626 "PyUnicodeUCS4_AsEncodedString"); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
627 } |
| 3910 | 628 # endif |
| 2894 | 629 if (ucs_from_string && ucs_decode && ucs_as_encoded_string) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
630 { |
| 2330 | 631 py3_PyUnicode_FromString = ucs_from_string; |
| 2894 | 632 py3_PyUnicode_Decode = ucs_decode; |
| 633 py3_PyUnicode_AsEncodedString = ucs_as_encoded_string; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
634 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
635 else |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
636 { |
| 2330 | 637 close_dll(hinstPy3); |
| 638 hinstPy3 = 0; | |
| 639 if (verbose) | |
| 640 EMSG2(_(e_loadfunc), "PyUnicode_UCSX_*"); | |
| 641 return FAIL; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
642 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
643 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
644 return OK; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
645 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
646 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
647 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
648 * If python is enabled (there is installed python on Windows system) return |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
649 * TRUE, else FALSE. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
650 */ |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
651 int |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
652 python3_enabled(int verbose) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
653 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
654 return py3_runtime_link_init(DYNAMIC_PYTHON3_DLL, verbose) == OK; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
655 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
656 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
657 /* Load the standard Python exceptions - don't import the symbols from the |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
658 * DLL, as this can cause errors (importing data symbols is not reliable). |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
659 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
660 static void get_py3_exceptions __ARGS((void)); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
661 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
662 static void |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
663 get_py3_exceptions() |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
664 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
665 PyObject *exmod = PyImport_ImportModule("builtins"); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
666 PyObject *exdict = PyModule_GetDict(exmod); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
667 p3imp_PyExc_AttributeError = PyDict_GetItemString(exdict, "AttributeError"); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
668 p3imp_PyExc_IndexError = PyDict_GetItemString(exdict, "IndexError"); |
| 4315 | 669 p3imp_PyExc_KeyError = PyDict_GetItemString(exdict, "KeyError"); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
670 p3imp_PyExc_KeyboardInterrupt = PyDict_GetItemString(exdict, "KeyboardInterrupt"); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
671 p3imp_PyExc_TypeError = PyDict_GetItemString(exdict, "TypeError"); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
672 p3imp_PyExc_ValueError = PyDict_GetItemString(exdict, "ValueError"); |
| 4405 | 673 p3imp_PyExc_RuntimeError = PyDict_GetItemString(exdict, "RuntimeError"); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
674 p3imp_PyExc_ImportError = PyDict_GetItemString(exdict, "ImportError"); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
675 Py_XINCREF(p3imp_PyExc_AttributeError); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
676 Py_XINCREF(p3imp_PyExc_IndexError); |
| 4315 | 677 Py_XINCREF(p3imp_PyExc_KeyError); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
678 Py_XINCREF(p3imp_PyExc_KeyboardInterrupt); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
679 Py_XINCREF(p3imp_PyExc_TypeError); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
680 Py_XINCREF(p3imp_PyExc_ValueError); |
| 4405 | 681 Py_XINCREF(p3imp_PyExc_RuntimeError); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
682 Py_XINCREF(p3imp_PyExc_ImportError); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
683 Py_XDECREF(exmod); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
684 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
685 #endif /* DYNAMIC_PYTHON3 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
686 |
| 3618 | 687 static int py3initialised = 0; |
| 688 | |
| 689 #define PYINITIALISED py3initialised | |
| 690 | |
| 4500 | 691 #define DESTRUCTOR_FINISH(self) Py_TYPE(self)->tp_free((PyObject*)self) |
| 3618 | 692 |
| 4377 | 693 #define WIN_PYTHON_REF(win) win->w_python3_ref |
| 694 #define BUF_PYTHON_REF(buf) buf->b_python3_ref | |
| 4401 | 695 #define TAB_PYTHON_REF(tab) tab->tp_python3_ref |
| 4377 | 696 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
697 static void |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
698 call_PyObject_Free(void *p) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
699 { |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
700 #if defined(Py_DEBUG) && !defined(Py_DEBUG_NO_PYMALLOC) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
701 _PyObject_DebugFree(p); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
702 #else |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
703 PyObject_Free(p); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
704 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
705 } |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
706 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
707 static PyObject * |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
708 call_PyType_GenericNew(PyTypeObject *type, PyObject *args, PyObject *kwds) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
709 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
710 return PyType_GenericNew(type,args,kwds); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
711 } |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
712 |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
713 static PyObject * |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
714 call_PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
715 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
716 return PyType_GenericAlloc(type,nitems); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
717 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
718 |
| 4319 | 719 static PyObject *OutputGetattro(PyObject *, PyObject *); |
| 720 static int OutputSetattro(PyObject *, PyObject *, PyObject *); | |
| 721 static PyObject *BufferGetattro(PyObject *, PyObject *); | |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
722 static int BufferSetattro(PyObject *, PyObject *, PyObject *); |
| 4401 | 723 static PyObject *TabPageGetattro(PyObject *, PyObject *); |
| 4319 | 724 static PyObject *WindowGetattro(PyObject *, PyObject *); |
| 725 static int WindowSetattro(PyObject *, PyObject *, PyObject *); | |
| 726 static PyObject *RangeGetattro(PyObject *, PyObject *); | |
| 727 static PyObject *CurrentGetattro(PyObject *, PyObject *); | |
| 728 static int CurrentSetattro(PyObject *, PyObject *, PyObject *); | |
| 729 static PyObject *DictionaryGetattro(PyObject *, PyObject *); | |
| 730 static int DictionarySetattro(PyObject *, PyObject *, PyObject *); | |
| 731 static PyObject *ListGetattro(PyObject *, PyObject *); | |
| 732 static int ListSetattro(PyObject *, PyObject *, PyObject *); | |
| 733 static PyObject *FunctionGetattro(PyObject *, PyObject *); | |
| 734 | |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
735 static PyObject *VimPathHook(PyObject *, PyObject *); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
736 |
| 4319 | 737 static struct PyModuleDef vimmodule; |
| 738 | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
739 #define PY_CAN_RECURSE |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
740 |
| 4319 | 741 /* |
| 742 * Include the code shared with if_python.c | |
| 743 */ | |
| 744 #include "if_py_both.h" | |
| 745 | |
| 746 #define GET_ATTR_STRING(name, nameobj) \ | |
| 747 char *name = ""; \ | |
| 748 if (PyUnicode_Check(nameobj)) \ | |
| 749 name = _PyUnicode_AsString(nameobj) | |
| 750 | |
| 751 #define PY3OBJ_DELETED(obj) (obj->ob_base.ob_refcnt<=0) | |
| 752 | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
753 /****************************************************** |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
754 * Internal function prototypes. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
755 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
756 |
| 3951 | 757 static PyObject *Py3Init_vim(void); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
758 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
759 /****************************************************** |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
760 * 1. Python interpreter main program. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
761 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
762 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
763 void |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
764 python3_end() |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
765 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
766 static int recurse = 0; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
767 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
768 /* If a crash occurs while doing this, don't try again. */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
769 if (recurse != 0) |
| 2330 | 770 return; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
771 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
772 ++recurse; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
773 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
774 #ifdef DYNAMIC_PYTHON3 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
775 if (hinstPy3) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
776 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
777 if (Py_IsInitialized()) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
778 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
779 // acquire lock before finalizing |
| 4415 | 780 PyGILState_Ensure(); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
781 |
| 2330 | 782 Py_Finalize(); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
783 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
784 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
785 #ifdef DYNAMIC_PYTHON3 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
786 end_dynamic_python3(); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
787 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
788 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
789 --recurse; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
790 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
791 |
|
2384
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
792 #if (defined(DYNAMIC_PYTHON) && defined(FEAT_PYTHON)) || defined(PROTO) |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
793 int |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
794 python3_loaded() |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
795 { |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
796 return (hinstPy3 != 0); |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
797 } |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
798 #endif |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
799 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
800 static int |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
801 Python3_Init(void) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
802 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
803 if (!py3initialised) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
804 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
805 #ifdef DYNAMIC_PYTHON3 |
| 2330 | 806 if (!python3_enabled(TRUE)) |
| 807 { | |
| 808 EMSG(_("E263: Sorry, this command is disabled, the Python library could not be loaded.")); | |
| 809 goto fail; | |
| 810 } | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
811 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
812 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
813 init_structs(); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
814 |
| 2641 | 815 |
| 816 #ifdef PYTHON3_HOME | |
| 817 Py_SetPythonHome(PYTHON3_HOME); | |
| 818 #endif | |
| 819 | |
| 3863 | 820 PyImport_AppendInittab("vim", Py3Init_vim); |
| 821 | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
822 #if !defined(MACOS) || defined(MACOS_X_UNIX) |
| 2330 | 823 Py_Initialize(); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
824 #else |
| 2330 | 825 PyMac_Initialize(); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
826 #endif |
| 4109 | 827 /* Initialise threads, and below save the state using |
| 828 * PyEval_SaveThread. Without the call to PyEval_SaveThread, thread | |
| 829 * specific state (such as the system trace hook), will be lost | |
| 830 * between invocations of Python code. */ | |
| 2877 | 831 PyEval_InitThreads(); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
832 #ifdef DYNAMIC_PYTHON3 |
| 2330 | 833 get_py3_exceptions(); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
834 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
835 |
| 4494 | 836 if (PythonIO_Init_io()) |
| 2330 | 837 goto fail; |
| 838 | |
| 3618 | 839 globals = PyModule_GetDict(PyImport_AddModule("__main__")); |
| 840 | |
| 2330 | 841 /* Remove the element from sys.path that was added because of our |
| 842 * argv[0] value in Py3Init_vim(). Previously we used an empty | |
| 4352 | 843 * string, but depending on the OS we then get an empty entry or |
| 2894 | 844 * the current directory in sys.path. |
| 845 * Only after vim has been imported, the element does exist in | |
| 846 * sys.path. | |
| 847 */ | |
| 848 PyRun_SimpleString("import vim; import sys; sys.path = list(filter(lambda x: not x.endswith('must>not&exist'), sys.path))"); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
849 |
| 4109 | 850 /* lock is created and acquired in PyEval_InitThreads() and thread |
| 851 * state is created in Py_Initialize() | |
| 852 * there _PyGILState_NoteThreadState() also sets gilcounter to 1 | |
| 853 * (python must have threads enabled!) | |
| 854 * so the following does both: unlock GIL and save thread state in TLS | |
| 855 * without deleting thread state | |
| 856 */ | |
| 857 PyEval_SaveThread(); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
858 |
| 2330 | 859 py3initialised = 1; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
860 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
861 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
862 return 0; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
863 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
864 fail: |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
865 /* We call PythonIO_Flush() here to print any Python errors. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
866 * This is OK, as it is possible to call this function even |
| 4494 | 867 * if PythonIO_Init_io() has not completed successfully (it will |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
868 * not do anything in this case). |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
869 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
870 PythonIO_Flush(); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
871 return -1; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
872 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
873 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
874 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
875 * External interface |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
876 */ |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
877 static void |
| 4486 | 878 DoPyCommand(const char *cmd, rangeinitializer init_range, runner run, void *arg) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
879 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
880 #if defined(MACOS) && !defined(MACOS_X_UNIX) |
| 2330 | 881 GrafPtr oldPort; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
882 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
883 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
| 2330 | 884 char *saved_locale; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
885 #endif |
| 2894 | 886 PyObject *cmdstr; |
| 887 PyObject *cmdbytes; | |
| 4415 | 888 PyGILState_STATE pygilstate; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
889 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
890 #if defined(MACOS) && !defined(MACOS_X_UNIX) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
891 GetPort(&oldPort); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
892 /* Check if the Python library is available */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
893 if ((Ptr)PyMac_Initialize == (Ptr)kUnresolvedCFragSymbolAddress) |
| 2330 | 894 goto theend; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
895 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
896 if (Python3_Init()) |
| 2330 | 897 goto theend; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
898 |
| 4486 | 899 init_range(arg); |
| 900 | |
| 2330 | 901 Python_Release_Vim(); /* leave vim */ |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
902 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
903 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
904 /* Python only works properly when the LC_NUMERIC locale is "C". */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
905 saved_locale = setlocale(LC_NUMERIC, NULL); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
906 if (saved_locale == NULL || STRCMP(saved_locale, "C") == 0) |
| 2330 | 907 saved_locale = NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
908 else |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
909 { |
| 2330 | 910 /* Need to make a copy, value may change when setting new locale. */ |
| 911 saved_locale = (char *)vim_strsave((char_u *)saved_locale); | |
| 912 (void)setlocale(LC_NUMERIC, "C"); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
913 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
914 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
915 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
916 pygilstate = PyGILState_Ensure(); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
917 |
| 2894 | 918 /* PyRun_SimpleString expects a UTF-8 string. Wrong encoding may cause |
| 919 * SyntaxError (unicode error). */ | |
| 2955 | 920 cmdstr = PyUnicode_Decode(cmd, strlen(cmd), |
| 921 (char *)ENC_OPT, CODEC_ERROR_HANDLER); | |
| 922 cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", CODEC_ERROR_HANDLER); | |
| 2894 | 923 Py_XDECREF(cmdstr); |
| 3618 | 924 |
| 4486 | 925 run(PyBytes_AsString(cmdbytes), arg, &pygilstate); |
| 2894 | 926 Py_XDECREF(cmdbytes); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
927 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
928 PyGILState_Release(pygilstate); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
929 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
930 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
931 if (saved_locale != NULL) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
932 { |
| 2330 | 933 (void)setlocale(LC_NUMERIC, saved_locale); |
| 934 vim_free(saved_locale); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
935 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
936 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
937 |
| 2330 | 938 Python_Lock_Vim(); /* enter vim */ |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
939 PythonIO_Flush(); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
940 #if defined(MACOS) && !defined(MACOS_X_UNIX) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
941 SetPort(oldPort); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
942 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
943 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
944 theend: |
| 2330 | 945 return; /* keeps lint happy */ |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
946 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
947 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
948 /* |
|
2350
06feaf4fe36a
Rename some "python3" symbols to "py3", as the command name.
Bram Moolenaar <bram@vim.org>
parents:
2342
diff
changeset
|
949 * ":py3" |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
950 */ |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
951 void |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
952 ex_py3(exarg_T *eap) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
953 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
954 char_u *script; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
955 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
956 script = script_get(eap, eap->arg); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
957 if (!eap->skip) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
958 { |
| 4486 | 959 DoPyCommand(script == NULL ? (char *) eap->arg : (char *) script, |
| 960 (rangeinitializer) init_range_cmd, | |
| 961 (runner) run_cmd, | |
| 962 (void *) eap); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
963 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
964 vim_free(script); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
965 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
966 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
967 #define BUFFER_SIZE 2048 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
968 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
969 /* |
|
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
970 * ":py3file" |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
971 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
972 void |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
973 ex_py3file(exarg_T *eap) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
974 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
975 static char buffer[BUFFER_SIZE]; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
976 const char *file; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
977 char *p; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
978 int i; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
979 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
980 /* Have to do it like this. PyRun_SimpleFile requires you to pass a |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
981 * stdio file pointer, but Vim and the Python DLL are compiled with |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
982 * different options under Windows, meaning that stdio pointers aren't |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
983 * compatible between the two. Yuk. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
984 * |
| 2894 | 985 * construct: exec(compile(open('a_filename', 'rb').read(), 'a_filename', 'exec')) |
| 986 * | |
| 987 * Using bytes so that Python can detect the source encoding as it normally | |
| 988 * does. The doc does not say "compile" accept bytes, though. | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
989 * |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
990 * We need to escape any backslashes or single quotes in the file name, so that |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
991 * Python won't mangle the file name. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
992 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
993 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
994 strcpy(buffer, "exec(compile(open('"); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
995 p = buffer + 19; /* size of "exec(compile(open('" */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
996 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
997 for (i=0; i<2; ++i) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
998 { |
| 2330 | 999 file = (char *)eap->arg; |
| 1000 while (*file && p < buffer + (BUFFER_SIZE - 3)) | |
| 1001 { | |
| 1002 if (*file == '\\' || *file == '\'') | |
| 1003 *p++ = '\\'; | |
| 1004 *p++ = *file++; | |
| 1005 } | |
| 1006 /* If we didn't finish the file name, we hit a buffer overflow */ | |
| 1007 if (*file != '\0') | |
| 1008 return; | |
| 1009 if (i==0) | |
| 1010 { | |
| 2894 | 1011 strcpy(p,"','rb').read(),'"); |
| 1012 p += 16; | |
| 2330 | 1013 } |
| 1014 else | |
| 1015 { | |
| 1016 strcpy(p,"','exec'))"); | |
| 1017 p += 10; | |
| 1018 } | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1019 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1020 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1021 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1022 /* Execute the file */ |
| 4486 | 1023 DoPyCommand(buffer, |
| 1024 (rangeinitializer) init_range_cmd, | |
| 1025 (runner) run_cmd, | |
| 1026 (void *) eap); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1027 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1028 |
| 4421 | 1029 void |
| 1030 ex_py3do(exarg_T *eap) | |
| 4417 | 1031 { |
| 4486 | 1032 DoPyCommand((char *)eap->arg, |
| 1033 (rangeinitializer)init_range_cmd, | |
| 1034 (runner)run_do, | |
| 1035 (void *)eap); | |
| 4417 | 1036 } |
| 1037 | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1038 /****************************************************** |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1039 * 2. Python output stream: writes output via [e]msg(). |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1040 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1041 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1042 /* Implementation functions |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1043 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1044 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1045 static PyObject * |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1046 OutputGetattro(PyObject *self, PyObject *nameobj) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1047 { |
| 3826 | 1048 GET_ATTR_STRING(name, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1049 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1050 if (strcmp(name, "softspace") == 0) |
| 2330 | 1051 return PyLong_FromLong(((OutputObject *)(self))->softspace); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1052 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1053 return PyObject_GenericGetAttr(self, nameobj); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1054 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1055 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1056 static int |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1057 OutputSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1058 { |
| 3826 | 1059 GET_ATTR_STRING(name, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1060 |
| 4488 | 1061 return OutputSetattr((OutputObject *)(self), name, val); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1062 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1063 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1064 /****************************************************** |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1065 * 3. Implementation of the Vim module for Python |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1066 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1067 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1068 /* Window type - Implementation functions |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1069 * -------------------------------------- |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1070 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1071 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1072 #define WindowType_Check(obj) ((obj)->ob_base.ob_type == &WindowType) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1073 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1074 /* Buffer type - Implementation functions |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1075 * -------------------------------------- |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1076 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1077 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1078 #define BufferType_Check(obj) ((obj)->ob_base.ob_type == &BufferType) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1079 |
| 3070 | 1080 static PyObject* BufferSubscript(PyObject *self, PyObject *idx); |
| 1081 static Py_ssize_t BufferAsSubscript(PyObject *self, PyObject *idx, PyObject *val); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1082 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1083 /* Line range type - Implementation functions |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1084 * -------------------------------------- |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1085 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1086 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1087 #define RangeType_Check(obj) ((obj)->ob_base.ob_type == &RangeType) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1088 |
| 3070 | 1089 static PyObject* RangeSubscript(PyObject *self, PyObject *idx); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1090 static Py_ssize_t RangeAsItem(PyObject *, Py_ssize_t, PyObject *); |
| 3070 | 1091 static Py_ssize_t RangeAsSubscript(PyObject *self, PyObject *idx, PyObject *val); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1092 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1093 /* Current objects type - Implementation functions |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1094 * ----------------------------------------------- |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1095 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1096 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1097 static PySequenceMethods BufferAsSeq = { |
| 2330 | 1098 (lenfunc) BufferLength, /* sq_length, len(x) */ |
| 1099 (binaryfunc) 0, /* sq_concat, x+y */ | |
| 1100 (ssizeargfunc) 0, /* sq_repeat, x*n */ | |
| 1101 (ssizeargfunc) BufferItem, /* sq_item, x[i] */ | |
| 1102 0, /* was_sq_slice, x[i:j] */ | |
| 2894 | 1103 0, /* sq_ass_item, x[i]=v */ |
| 2330 | 1104 0, /* sq_ass_slice, x[i:j]=v */ |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1105 0, /* sq_contains */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1106 0, /* sq_inplace_concat */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1107 0, /* sq_inplace_repeat */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1108 }; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1109 |
| 4319 | 1110 static PyMappingMethods BufferAsMapping = { |
| 2330 | 1111 /* mp_length */ (lenfunc)BufferLength, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1112 /* mp_subscript */ (binaryfunc)BufferSubscript, |
| 2894 | 1113 /* mp_ass_subscript */ (objobjargproc)BufferAsSubscript, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1114 }; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1115 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1116 |
| 4377 | 1117 /* Buffer object |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1118 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1119 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1120 static PyObject * |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1121 BufferGetattro(PyObject *self, PyObject *nameobj) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1122 { |
| 4319 | 1123 PyObject *r; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1124 |
| 3826 | 1125 GET_ATTR_STRING(name, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1126 |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1127 if ((r = BufferAttrValid((BufferObject *)(self), name))) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1128 return r; |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1129 |
| 4319 | 1130 if (CheckBuffer((BufferObject *)(self))) |
| 2330 | 1131 return NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1132 |
| 4319 | 1133 r = BufferAttr((BufferObject *)(self), name); |
| 1134 if (r || PyErr_Occurred()) | |
| 1135 return r; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1136 else |
| 2330 | 1137 return PyObject_GenericGetAttr(self, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1138 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1139 |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1140 static int |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1141 BufferSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1142 { |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1143 GET_ATTR_STRING(name, nameobj); |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1144 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1145 return BufferSetattr((BufferObject *)(self), name, val); |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1146 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1147 |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1148 /******************/ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1149 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1150 static PyObject * |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1151 BufferSubscript(PyObject *self, PyObject* idx) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1152 { |
| 3618 | 1153 if (PyLong_Check(idx)) |
| 1154 { | |
| 2330 | 1155 long _idx = PyLong_AsLong(idx); |
| 4488 | 1156 return BufferItem((BufferObject *)(self), _idx); |
| 3618 | 1157 } else if (PySlice_Check(idx)) |
| 1158 { | |
| 2330 | 1159 Py_ssize_t start, stop, step, slicelen; |
| 1160 | |
| 4387 | 1161 if (CheckBuffer((BufferObject *) self)) |
| 1162 return NULL; | |
| 1163 | |
| 3074 | 1164 if (PySlice_GetIndicesEx((PyObject *)idx, |
| 4389 | 1165 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, |
| 2330 | 1166 &start, &stop, |
| 3618 | 1167 &step, &slicelen) < 0) |
| 1168 { | |
| 2330 | 1169 return NULL; |
| 1170 } | |
| 4488 | 1171 return BufferSlice((BufferObject *)(self), start, stop); |
| 3618 | 1172 } |
| 1173 else | |
| 1174 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1175 RAISE_INVALID_INDEX_TYPE(idx); |
| 2330 | 1176 return NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1177 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1178 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1179 |
| 2894 | 1180 static Py_ssize_t |
| 1181 BufferAsSubscript(PyObject *self, PyObject* idx, PyObject* val) | |
| 1182 { | |
| 3618 | 1183 if (PyLong_Check(idx)) |
| 1184 { | |
| 2894 | 1185 long n = PyLong_AsLong(idx); |
| 1186 return RBAsItem((BufferObject *)(self), n, val, 1, | |
| 1187 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, | |
| 1188 NULL); | |
| 3618 | 1189 } else if (PySlice_Check(idx)) |
| 1190 { | |
| 2894 | 1191 Py_ssize_t start, stop, step, slicelen; |
| 1192 | |
| 4387 | 1193 if (CheckBuffer((BufferObject *) self)) |
| 1194 return -1; | |
| 1195 | |
| 3074 | 1196 if (PySlice_GetIndicesEx((PyObject *)idx, |
| 4389 | 1197 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, |
| 2894 | 1198 &start, &stop, |
| 3618 | 1199 &step, &slicelen) < 0) |
| 1200 { | |
| 2894 | 1201 return -1; |
| 1202 } | |
| 1203 return RBAsSlice((BufferObject *)(self), start, stop, val, 1, | |
| 1204 (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count, | |
| 1205 NULL); | |
| 3618 | 1206 } |
| 1207 else | |
| 1208 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1209 RAISE_INVALID_INDEX_TYPE(idx); |
| 2894 | 1210 return -1; |
| 1211 } | |
| 1212 } | |
| 1213 | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1214 static PySequenceMethods RangeAsSeq = { |
| 2330 | 1215 (lenfunc) RangeLength, /* sq_length, len(x) */ |
| 1216 (binaryfunc) 0, /* RangeConcat, sq_concat, x+y */ | |
| 1217 (ssizeargfunc) 0, /* RangeRepeat, sq_repeat, x*n */ | |
| 1218 (ssizeargfunc) RangeItem, /* sq_item, x[i] */ | |
| 1219 0, /* was_sq_slice, x[i:j] */ | |
| 1220 (ssizeobjargproc) RangeAsItem, /* sq_as_item, x[i]=v */ | |
| 1221 0, /* sq_ass_slice, x[i:j]=v */ | |
| 1222 0, /* sq_contains */ | |
| 1223 0, /* sq_inplace_concat */ | |
| 1224 0, /* sq_inplace_repeat */ | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1225 }; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1226 |
| 4319 | 1227 static PyMappingMethods RangeAsMapping = { |
| 2330 | 1228 /* mp_length */ (lenfunc)RangeLength, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1229 /* mp_subscript */ (binaryfunc)RangeSubscript, |
| 3070 | 1230 /* mp_ass_subscript */ (objobjargproc)RangeAsSubscript, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1231 }; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1232 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1233 /* Line range object - Implementation |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1234 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1235 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1236 static PyObject * |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1237 RangeGetattro(PyObject *self, PyObject *nameobj) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1238 { |
| 3826 | 1239 GET_ATTR_STRING(name, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1240 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1241 if (strcmp(name, "start") == 0) |
| 2330 | 1242 return Py_BuildValue("n", ((RangeObject *)(self))->start - 1); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1243 else if (strcmp(name, "end") == 0) |
| 2330 | 1244 return Py_BuildValue("n", ((RangeObject *)(self))->end - 1); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1245 else |
| 2330 | 1246 return PyObject_GenericGetAttr(self, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1247 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1248 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1249 /****************/ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1250 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1251 static Py_ssize_t |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1252 RangeAsItem(PyObject *self, Py_ssize_t n, PyObject *val) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1253 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1254 return RBAsItem(((RangeObject *)(self))->buf, n, val, |
| 2330 | 1255 ((RangeObject *)(self))->start, |
| 1256 ((RangeObject *)(self))->end, | |
| 1257 &((RangeObject *)(self))->end); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1258 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1259 |
| 3070 | 1260 static Py_ssize_t |
| 1261 RangeAsSlice(PyObject *self, Py_ssize_t lo, Py_ssize_t hi, PyObject *val) | |
| 1262 { | |
| 1263 return RBAsSlice(((RangeObject *)(self))->buf, lo, hi, val, | |
| 1264 ((RangeObject *)(self))->start, | |
| 1265 ((RangeObject *)(self))->end, | |
| 1266 &((RangeObject *)(self))->end); | |
| 1267 } | |
| 1268 | |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1269 static PyObject * |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1270 RangeSubscript(PyObject *self, PyObject* idx) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1271 { |
| 3618 | 1272 if (PyLong_Check(idx)) |
| 1273 { | |
| 2330 | 1274 long _idx = PyLong_AsLong(idx); |
| 4488 | 1275 return RangeItem((RangeObject *)(self), _idx); |
| 3618 | 1276 } else if (PySlice_Check(idx)) |
| 1277 { | |
| 2330 | 1278 Py_ssize_t start, stop, step, slicelen; |
| 1279 | |
| 3074 | 1280 if (PySlice_GetIndicesEx((PyObject *)idx, |
| 2330 | 1281 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, |
| 1282 &start, &stop, | |
| 3618 | 1283 &step, &slicelen) < 0) |
| 1284 { | |
| 2330 | 1285 return NULL; |
| 1286 } | |
| 4488 | 1287 return RangeSlice((RangeObject *)(self), start, stop); |
| 3618 | 1288 } |
| 1289 else | |
| 1290 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1291 RAISE_INVALID_INDEX_TYPE(idx); |
| 2330 | 1292 return NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1293 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1294 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1295 |
| 3070 | 1296 static Py_ssize_t |
| 1297 RangeAsSubscript(PyObject *self, PyObject *idx, PyObject *val) | |
| 1298 { | |
| 3618 | 1299 if (PyLong_Check(idx)) |
| 1300 { | |
| 3070 | 1301 long n = PyLong_AsLong(idx); |
| 1302 return RangeAsItem(self, n, val); | |
| 3618 | 1303 } else if (PySlice_Check(idx)) |
| 1304 { | |
| 3070 | 1305 Py_ssize_t start, stop, step, slicelen; |
| 1306 | |
| 3074 | 1307 if (PySlice_GetIndicesEx((PyObject *)idx, |
| 3070 | 1308 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, |
| 1309 &start, &stop, | |
| 3618 | 1310 &step, &slicelen) < 0) |
| 1311 { | |
| 3070 | 1312 return -1; |
| 1313 } | |
| 1314 return RangeAsSlice(self, start, stop, val); | |
| 3618 | 1315 } |
| 1316 else | |
| 1317 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1318 RAISE_INVALID_INDEX_TYPE(idx); |
| 3070 | 1319 return -1; |
| 1320 } | |
| 1321 } | |
| 1322 | |
| 4401 | 1323 /* TabPage object - Implementation |
| 1324 */ | |
| 1325 | |
| 1326 static PyObject * | |
| 1327 TabPageGetattro(PyObject *self, PyObject *nameobj) | |
| 1328 { | |
| 1329 PyObject *r; | |
| 1330 | |
| 1331 GET_ATTR_STRING(name, nameobj); | |
| 1332 | |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1333 if ((r = TabPageAttrValid((TabPageObject *)(self), name))) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1334 return r; |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1335 |
| 4401 | 1336 if (CheckTabPage((TabPageObject *)(self))) |
| 1337 return NULL; | |
| 1338 | |
| 1339 r = TabPageAttr((TabPageObject *)(self), name); | |
| 1340 if (r || PyErr_Occurred()) | |
| 1341 return r; | |
| 1342 else | |
| 1343 return PyObject_GenericGetAttr(self, nameobj); | |
| 1344 } | |
| 1345 | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1346 /* Window object - Implementation |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1347 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1348 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1349 static PyObject * |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1350 WindowGetattro(PyObject *self, PyObject *nameobj) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1351 { |
| 4319 | 1352 PyObject *r; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1353 |
| 3826 | 1354 GET_ATTR_STRING(name, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1355 |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1356 if ((r = WindowAttrValid((WindowObject *)(self), name))) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1357 return r; |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1358 |
| 4319 | 1359 if (CheckWindow((WindowObject *)(self))) |
| 2330 | 1360 return NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1361 |
| 4319 | 1362 r = WindowAttr((WindowObject *)(self), name); |
| 1363 if (r || PyErr_Occurred()) | |
| 1364 return r; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1365 else |
| 2330 | 1366 return PyObject_GenericGetAttr(self, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1367 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1368 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1369 static int |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1370 WindowSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1371 { |
| 3826 | 1372 GET_ATTR_STRING(name, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1373 |
| 4488 | 1374 return WindowSetattr((WindowObject *)(self), name, val); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1375 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1376 |
| 4401 | 1377 /* Tab page list object - Definitions |
| 1378 */ | |
| 1379 | |
| 1380 static PySequenceMethods TabListAsSeq = { | |
| 1381 (lenfunc) TabListLength, /* sq_length, len(x) */ | |
| 1382 (binaryfunc) 0, /* sq_concat, x+y */ | |
| 1383 (ssizeargfunc) 0, /* sq_repeat, x*n */ | |
| 1384 (ssizeargfunc) TabListItem, /* sq_item, x[i] */ | |
| 1385 0, /* sq_slice, x[i:j] */ | |
| 1386 (ssizeobjargproc)0, /* sq_as_item, x[i]=v */ | |
| 1387 0, /* sq_ass_slice, x[i:j]=v */ | |
| 1388 0, /* sq_contains */ | |
| 1389 0, /* sq_inplace_concat */ | |
| 1390 0, /* sq_inplace_repeat */ | |
| 1391 }; | |
| 1392 | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1393 /* Window list object - Definitions |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1394 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1395 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1396 static PySequenceMethods WinListAsSeq = { |
| 2330 | 1397 (lenfunc) WinListLength, /* sq_length, len(x) */ |
| 1398 (binaryfunc) 0, /* sq_concat, x+y */ | |
| 1399 (ssizeargfunc) 0, /* sq_repeat, x*n */ | |
| 1400 (ssizeargfunc) WinListItem, /* sq_item, x[i] */ | |
| 1401 0, /* sq_slice, x[i:j] */ | |
| 1402 (ssizeobjargproc)0, /* sq_as_item, x[i]=v */ | |
| 1403 0, /* sq_ass_slice, x[i:j]=v */ | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1404 0, /* sq_contains */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1405 0, /* sq_inplace_concat */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1406 0, /* sq_inplace_repeat */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1407 }; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1408 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1409 /* Current items object - Implementation |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1410 */ |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1411 static PyObject * |
| 4319 | 1412 CurrentGetattro(PyObject *self, PyObject *nameobj) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1413 { |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1414 PyObject *r; |
| 3826 | 1415 GET_ATTR_STRING(name, nameobj); |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1416 if (!(r = CurrentGetattr(self, name))) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1417 return PyObject_GenericGetAttr(self, nameobj); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1418 return r; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1419 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1420 |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1421 static int |
| 4319 | 1422 CurrentSetattro(PyObject *self, PyObject *nameobj, PyObject *value) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1423 { |
| 4319 | 1424 GET_ATTR_STRING(name, nameobj); |
| 1425 return CurrentSetattr(self, name, value); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1426 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1427 |
| 3618 | 1428 /* Dictionary object - Definitions |
| 1429 */ | |
| 1430 | |
| 3828 | 1431 static PyObject * |
| 1432 DictionaryGetattro(PyObject *self, PyObject *nameobj) | |
| 1433 { | |
| 1434 DictionaryObject *this = ((DictionaryObject *) (self)); | |
| 1435 | |
| 1436 GET_ATTR_STRING(name, nameobj); | |
| 1437 | |
| 1438 if (strcmp(name, "locked") == 0) | |
| 1439 return PyLong_FromLong(this->dict->dv_lock); | |
| 1440 else if (strcmp(name, "scope") == 0) | |
| 1441 return PyLong_FromLong(this->dict->dv_scope); | |
| 1442 | |
| 1443 return PyObject_GenericGetAttr(self, nameobj); | |
| 1444 } | |
| 1445 | |
| 1446 static int | |
| 1447 DictionarySetattro(PyObject *self, PyObject *nameobj, PyObject *val) | |
| 1448 { | |
| 1449 GET_ATTR_STRING(name, nameobj); | |
| 4488 | 1450 return DictionarySetattr((DictionaryObject *)(self), name, val); |
| 3618 | 1451 } |
| 1452 | |
| 1453 /* List object - Definitions | |
| 1454 */ | |
| 1455 | |
| 1456 static PySequenceMethods ListAsSeq = { | |
| 1457 (lenfunc) ListLength, /* sq_length, len(x) */ | |
| 1458 (binaryfunc) 0, /* RangeConcat, sq_concat, x+y */ | |
| 1459 (ssizeargfunc) 0, /* RangeRepeat, sq_repeat, x*n */ | |
| 1460 (ssizeargfunc) ListItem, /* sq_item, x[i] */ | |
| 1461 (void *) 0, /* was_sq_slice, x[i:j] */ | |
| 1462 (ssizeobjargproc) ListAssItem, /* sq_as_item, x[i]=v */ | |
| 1463 (void *) 0, /* was_sq_ass_slice, x[i:j]=v */ | |
| 1464 0, /* sq_contains */ | |
| 1465 (binaryfunc) ListConcatInPlace,/* sq_inplace_concat */ | |
| 1466 0, /* sq_inplace_repeat */ | |
| 1467 }; | |
| 1468 | |
| 1469 static PyObject *ListSubscript(PyObject *, PyObject *); | |
| 1470 static Py_ssize_t ListAsSubscript(PyObject *, PyObject *, PyObject *); | |
| 1471 | |
| 1472 static PyMappingMethods ListAsMapping = { | |
| 1473 /* mp_length */ (lenfunc) ListLength, | |
| 1474 /* mp_subscript */ (binaryfunc) ListSubscript, | |
| 1475 /* mp_ass_subscript */ (objobjargproc) ListAsSubscript, | |
| 1476 }; | |
| 1477 | |
| 1478 static PyObject * | |
| 4488 | 1479 ListSubscript(PyObject *self, PyObject* idx) |
| 3618 | 1480 { |
| 4488 | 1481 if (PyLong_Check(idx)) |
| 3618 | 1482 { |
| 4488 | 1483 long _idx = PyLong_AsLong(idx); |
| 1484 return ListItem((ListObject *)(self), _idx); | |
| 3618 | 1485 } |
| 4488 | 1486 else if (PySlice_Check(idx)) |
| 3618 | 1487 { |
| 1488 Py_ssize_t start, stop, step, slicelen; | |
| 1489 | |
| 4488 | 1490 if (PySlice_GetIndicesEx(idx, ListLength((ListObject *)(self)), |
| 1491 &start, &stop, &step, &slicelen) < 0) | |
| 3618 | 1492 return NULL; |
| 4488 | 1493 return ListSlice((ListObject *)(self), start, stop); |
| 3618 | 1494 } |
| 1495 else | |
| 1496 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1497 RAISE_INVALID_INDEX_TYPE(idx); |
| 3618 | 1498 return NULL; |
| 1499 } | |
| 1500 } | |
| 1501 | |
| 1502 static Py_ssize_t | |
| 4488 | 1503 ListAsSubscript(PyObject *self, PyObject *idx, PyObject *obj) |
| 3618 | 1504 { |
| 4488 | 1505 if (PyLong_Check(idx)) |
| 3618 | 1506 { |
| 4488 | 1507 long _idx = PyLong_AsLong(idx); |
| 1508 return ListAssItem((ListObject *)(self), _idx, obj); | |
| 3618 | 1509 } |
| 4488 | 1510 else if (PySlice_Check(idx)) |
| 3618 | 1511 { |
| 1512 Py_ssize_t start, stop, step, slicelen; | |
| 1513 | |
| 4488 | 1514 if (PySlice_GetIndicesEx(idx, ListLength((ListObject *)(self)), |
| 1515 &start, &stop, &step, &slicelen) < 0) | |
| 3618 | 1516 return -1; |
| 4488 | 1517 return ListAssSlice((ListObject *)(self), start, stop, obj); |
| 3618 | 1518 } |
| 1519 else | |
| 1520 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1521 RAISE_INVALID_INDEX_TYPE(idx); |
| 3618 | 1522 return -1; |
| 1523 } | |
| 1524 } | |
| 1525 | |
| 3828 | 1526 static PyObject * |
| 1527 ListGetattro(PyObject *self, PyObject *nameobj) | |
| 1528 { | |
| 1529 GET_ATTR_STRING(name, nameobj); | |
| 1530 | |
| 1531 if (strcmp(name, "locked") == 0) | |
| 1532 return PyLong_FromLong(((ListObject *) (self))->list->lv_lock); | |
| 1533 | |
| 1534 return PyObject_GenericGetAttr(self, nameobj); | |
| 1535 } | |
| 1536 | |
| 1537 static int | |
| 1538 ListSetattro(PyObject *self, PyObject *nameobj, PyObject *val) | |
| 1539 { | |
| 1540 GET_ATTR_STRING(name, nameobj); | |
| 4488 | 1541 return ListSetattr((ListObject *)(self), name, val); |
| 3618 | 1542 } |
| 1543 | |
| 1544 /* Function object - Definitions | |
| 1545 */ | |
| 1546 | |
| 1547 static PyObject * | |
| 1548 FunctionGetattro(PyObject *self, PyObject *nameobj) | |
| 1549 { | |
| 1550 FunctionObject *this = (FunctionObject *)(self); | |
| 3826 | 1551 |
| 1552 GET_ATTR_STRING(name, nameobj); | |
| 3618 | 1553 |
| 1554 if (strcmp(name, "name") == 0) | |
| 1555 return PyUnicode_FromString((char *)(this->name)); | |
| 1556 | |
| 1557 return PyObject_GenericGetAttr(self, nameobj); | |
| 1558 } | |
| 1559 | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1560 /* External interface |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1561 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1562 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1563 void |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1564 python3_buffer_free(buf_T *buf) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1565 { |
| 4377 | 1566 if (BUF_PYTHON_REF(buf) != NULL) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1567 { |
| 4377 | 1568 BufferObject *bp = BUF_PYTHON_REF(buf); |
| 2330 | 1569 bp->buf = INVALID_BUFFER_VALUE; |
| 4377 | 1570 BUF_PYTHON_REF(buf) = NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1571 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1572 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1573 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1574 #if defined(FEAT_WINDOWS) || defined(PROTO) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1575 void |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1576 python3_window_free(win_T *win) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1577 { |
| 4377 | 1578 if (WIN_PYTHON_REF(win) != NULL) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1579 { |
| 4377 | 1580 WindowObject *wp = WIN_PYTHON_REF(win); |
| 2330 | 1581 wp->win = INVALID_WINDOW_VALUE; |
| 4377 | 1582 WIN_PYTHON_REF(win) = NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1583 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1584 } |
| 4401 | 1585 |
| 1586 void | |
| 1587 python3_tabpage_free(tabpage_T *tab) | |
| 1588 { | |
| 1589 if (TAB_PYTHON_REF(tab) != NULL) | |
| 1590 { | |
| 1591 TabPageObject *tp = TAB_PYTHON_REF(tab); | |
| 1592 tp->tab = INVALID_TABPAGE_VALUE; | |
| 1593 TAB_PYTHON_REF(tab) = NULL; | |
| 1594 } | |
| 1595 } | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1596 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1597 |
| 3951 | 1598 static PyObject * |
| 1599 Py3Init_vim(void) | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1600 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1601 /* The special value is removed from sys.path in Python3_Init(). */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1602 static wchar_t *(argv[2]) = {L"/must>not&exist/foo", NULL}; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1603 |
| 4494 | 1604 if (init_types()) |
| 1605 return NULL; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1606 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1607 /* Set sys.argv[] to avoid a crash in warn(). */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1608 PySys_SetArgv(1, argv); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1609 |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1610 if ((vim_module = PyModule_Create(&vimmodule)) == NULL) |
| 2894 | 1611 return NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1612 |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1613 if (populate_module(vim_module, PyModule_AddObject, PyObject_GetAttrString)) |
| 2330 | 1614 return NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1615 |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1616 if (init_sys_path()) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1617 return NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1618 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1619 return vim_module; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1620 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1621 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1622 /************************************************************************* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1623 * 4. Utility functions for handling the interface between Vim and Python. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1624 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1625 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1626 /* Convert a Vim line into a Python string. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1627 * All internal newlines are replaced by null characters. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1628 * |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1629 * On errors, the Python exception data is set, and NULL is returned. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1630 */ |
|
2399
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1631 static PyObject * |
|
76f0c4918f5c
Move some common code from if_python.c and if_python3.c to if_py_both.h.
Bram Moolenaar <bram@vim.org>
parents:
2384
diff
changeset
|
1632 LineToString(const char *str) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1633 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1634 PyObject *result; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1635 Py_ssize_t len = strlen(str); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1636 char *tmp,*p; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1637 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1638 tmp = (char *)alloc((unsigned)(len+1)); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1639 p = tmp; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1640 if (p == NULL) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1641 { |
| 2330 | 1642 PyErr_NoMemory(); |
| 1643 return NULL; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1644 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1645 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1646 while (*str) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1647 { |
| 2330 | 1648 if (*str == '\n') |
| 1649 *p = '\0'; | |
| 1650 else | |
| 1651 *p = *str; | |
| 1652 | |
| 1653 ++p; | |
| 1654 ++str; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1655 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1656 *p = '\0'; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1657 |
| 2955 | 1658 result = PyUnicode_Decode(tmp, len, (char *)ENC_OPT, CODEC_ERROR_HANDLER); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1659 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1660 vim_free(tmp); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1661 return result; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1662 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1663 |
| 3618 | 1664 void |
| 1665 do_py3eval (char_u *str, typval_T *rettv) | |
| 1666 { | |
| 4486 | 1667 DoPyCommand((char *) str, |
| 1668 (rangeinitializer) init_range_eval, | |
| 1669 (runner) run_eval, | |
| 1670 (void *) rettv); | |
| 3618 | 1671 switch(rettv->v_type) |
| 1672 { | |
| 1673 case VAR_DICT: ++rettv->vval.v_dict->dv_refcount; break; | |
| 1674 case VAR_LIST: ++rettv->vval.v_list->lv_refcount; break; | |
| 1675 case VAR_FUNC: func_ref(rettv->vval.v_string); break; | |
| 3796 | 1676 case VAR_UNKNOWN: |
| 1677 rettv->v_type = VAR_NUMBER; | |
| 1678 rettv->vval.v_number = 0; | |
| 1679 break; | |
| 3618 | 1680 } |
| 1681 } | |
| 1682 | |
| 1683 void | |
| 1684 set_ref_in_python3 (int copyID) | |
| 1685 { | |
| 1686 set_ref_in_py(copyID); | |
| 1687 } |