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