Mercurial > vim
annotate src/if_python3.c @ 32743:df63fa700fc6 v9.0.1691
patch 9.0.1691: wrong viewport restored for incsearch and smoothscroll
Commit: https://github.com/vim/vim/commit/7b7b4cb6f274e7bace127107b0d2752133c4020b
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri Aug 11 23:48:27 2023 +0200
patch 9.0.1691: wrong viewport restored for incsearch and smoothscroll
Problem: wrong viewport restored for incsearch and smoothscroll
Solution: Save and restore skipcol as well
closes: #12713
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 12 Aug 2023 00:00:05 +0200 |
| parents | 078630443def |
| children | bad5868957e4 |
| 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 |
|
30992
c207a462320a
patch 9.0.0831: compiler warning for redefining HAVE_DUP
Bram Moolenaar <Bram@vim.org>
parents:
29303
diff
changeset
|
48 #ifdef HAVE_DUP |
|
c207a462320a
patch 9.0.0831: compiler warning for redefining HAVE_DUP
Bram Moolenaar <Bram@vim.org>
parents:
29303
diff
changeset
|
49 # undef HAVE_DUP |
|
c207a462320a
patch 9.0.0831: compiler warning for redefining HAVE_DUP
Bram Moolenaar <Bram@vim.org>
parents:
29303
diff
changeset
|
50 #endif |
|
8080
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
51 #ifdef HAVE_STRFTIME |
|
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
52 # undef HAVE_STRFTIME |
|
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_STRING_H |
|
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
55 # undef HAVE_STRING_H |
|
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
56 #endif |
|
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
57 #ifdef HAVE_PUTENV |
|
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
58 # undef HAVE_PUTENV |
|
b6cb94ad97a4
commit https://github.com/vim/vim/commit/6aa2cd4be287f35f95f35c2cec6d5a24f53c4d3c
Christian Brabandt <cb@256bit.org>
parents:
8041
diff
changeset
|
59 #endif |
|
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
60 #ifdef HAVE_STDARG_H |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
61 # 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
|
62 #endif |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
63 #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
|
64 # undef _POSIX_C_SOURCE |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
65 #endif |
|
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
66 #ifdef _XOPEN_SOURCE |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
67 # 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
|
68 #endif |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
69 |
|
4823
46077370bc60
updated for version 7.3.1158
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
70 #define PY_SSIZE_T_CLEAN |
|
46077370bc60
updated for version 7.3.1158
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
71 |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
72 #include <Python.h> |
|
4823
46077370bc60
updated for version 7.3.1158
Bram Moolenaar <bram@vim.org>
parents:
4704
diff
changeset
|
73 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
74 #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
|
75 #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
|
76 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
77 // The "surrogateescape" error handler is new in Python 3.1 |
| 2955 | 78 #if PY_VERSION_HEX >= 0x030100f0 |
| 79 # define CODEC_ERROR_HANDLER "surrogateescape" | |
| 80 #else | |
| 81 # define CODEC_ERROR_HANDLER NULL | |
| 82 #endif | |
| 83 | |
|
30994
dfc507ccfaa5
patch 9.0.0832: deprecation warning causes build failure
Bram Moolenaar <Bram@vim.org>
parents:
30992
diff
changeset
|
84 // Suppress Python 3.11 depreciations to see useful warnings |
|
32730
078630443def
patch 9.0.1685: silence Python 3.11 depreciations for gcc
Christian Brabandt <cb@256bit.org>
parents:
31804
diff
changeset
|
85 #ifdef __GNUC__ |
|
078630443def
patch 9.0.1685: silence Python 3.11 depreciations for gcc
Christian Brabandt <cb@256bit.org>
parents:
31804
diff
changeset
|
86 # pragma GCC diagnostic push |
|
078630443def
patch 9.0.1685: silence Python 3.11 depreciations for gcc
Christian Brabandt <cb@256bit.org>
parents:
31804
diff
changeset
|
87 # pragma GCC diagnostic ignored "-Wdeprecated-declarations" |
|
30994
dfc507ccfaa5
patch 9.0.0832: deprecation warning causes build failure
Bram Moolenaar <Bram@vim.org>
parents:
30992
diff
changeset
|
88 #endif |
|
dfc507ccfaa5
patch 9.0.0832: deprecation warning causes build failure
Bram Moolenaar <Bram@vim.org>
parents:
30992
diff
changeset
|
89 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
90 // Python 3 does not support CObjects, always use Capsules |
| 3638 | 91 #define PY_USE_CAPSULE |
| 92 | |
|
23264
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
93 #define ERRORS_DECODE_ARG CODEC_ERROR_HANDLER |
|
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
94 #define ERRORS_ENCODE_ARG ERRORS_DECODE_ARG |
|
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
95 |
|
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
|
96 #define PyInt Py_ssize_t |
|
5112
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
97 #ifndef PyString_Check |
|
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
98 # define PyString_Check(obj) PyUnicode_Check(obj) |
|
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
99 #endif |
|
5164
b3bd43ef012d
updated for version 7.4a.008
Bram Moolenaar <bram@vim.org>
parents:
5112
diff
changeset
|
100 #define PyString_FromString(repr) \ |
|
23264
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
101 PyUnicode_Decode(repr, STRLEN(repr), ENC_OPT, ERRORS_DECODE_ARG) |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
102 #define PyString_FromFormat PyUnicode_FromFormat |
|
5112
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
103 #ifndef PyInt_Check |
|
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
104 # define PyInt_Check(obj) PyLong_Check(obj) |
|
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
105 #endif |
| 3826 | 106 #define PyInt_FromLong(i) PyLong_FromLong(i) |
| 107 #define PyInt_AsLong(obj) PyLong_AsLong(obj) | |
| 4319 | 108 #define Py_ssize_t_fmt "n" |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
109 #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
|
110 |
| 5608 | 111 #define PyIntArgFunc ssizeargfunc |
| 112 #define PyIntObjArgProc ssizeobjargproc | |
| 113 | |
| 5768 | 114 /* |
| 115 * PySlice_GetIndicesEx(): first argument type changed from PySliceObject | |
| 116 * to PyObject in Python 3.2 or later. | |
| 117 */ | |
| 118 #if PY_VERSION_HEX >= 0x030200f0 | |
| 119 typedef PyObject PySliceObject_T; | |
| 120 #else | |
| 121 typedef PySliceObject PySliceObject_T; | |
| 122 #endif | |
| 123 | |
|
27581
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
124 #ifndef MSWIN |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
125 # define HINSTANCE void * |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
126 #endif |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
127 #if defined(DYNAMIC_PYTHON3) || defined(MSWIN) |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
128 static HINSTANCE hinstPy3 = 0; // Instance of python.dll |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
129 #endif |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
130 |
| 2716 | 131 #if defined(DYNAMIC_PYTHON3) || defined(PROTO) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
132 |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15470
diff
changeset
|
133 # 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
|
134 # 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
|
135 # define FARPROC void* |
| 2641 | 136 # 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
|
137 # 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
|
138 # 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
|
139 # 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
|
140 # 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
|
141 # 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
|
142 # define symbol_from_dll dlsym |
|
25342
c4298ed56ffa
patch 8.2.3208: dynamic library load error does not mention why it failed
Bram Moolenaar <Bram@vim.org>
parents:
24916
diff
changeset
|
143 # define load_dll_error dlerror |
|
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
|
144 # else |
| 2612 | 145 # 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
|
146 # 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
|
147 # define symbol_from_dll GetProcAddress |
|
25342
c4298ed56ffa
patch 8.2.3208: dynamic library load error does not mention why it failed
Bram Moolenaar <Bram@vim.org>
parents:
24916
diff
changeset
|
148 # define load_dll_error GetWin32Error |
|
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
|
149 # endif |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
150 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
151 * Wrapper defines |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
152 */ |
|
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
|
153 # undef PyArg_Parse |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
154 # 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
|
155 # undef PyArg_ParseTuple |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
156 # define PyArg_ParseTuple py3_PyArg_ParseTuple |
| 2894 | 157 # define PyMem_Free py3_PyMem_Free |
| 3618 | 158 # define PyMem_Malloc py3_PyMem_Malloc |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
159 # define PyDict_SetItemString py3_PyDict_SetItemString |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
160 # define PyErr_BadArgument py3_PyErr_BadArgument |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
161 # define PyErr_Clear py3_PyErr_Clear |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
162 # define PyErr_Format py3_PyErr_Format |
| 4145 | 163 # define PyErr_PrintEx py3_PyErr_PrintEx |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
164 # define PyErr_NoMemory py3_PyErr_NoMemory |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
165 # define PyErr_Occurred py3_PyErr_Occurred |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
166 # define PyErr_SetNone py3_PyErr_SetNone |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
167 # define PyErr_SetString py3_PyErr_SetString |
| 4403 | 168 # define PyErr_SetObject py3_PyErr_SetObject |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
169 # define PyErr_ExceptionMatches py3_PyErr_ExceptionMatches |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
170 # define PyEval_InitThreads py3_PyEval_InitThreads |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
171 # define PyEval_RestoreThread py3_PyEval_RestoreThread |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
172 # define PyEval_SaveThread py3_PyEval_SaveThread |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
173 # define PyGILState_Ensure py3_PyGILState_Ensure |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
174 # define PyGILState_Release py3_PyGILState_Release |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
175 # define PyLong_AsLong py3_PyLong_AsLong |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
176 # define PyLong_FromLong py3_PyLong_FromLong |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
177 # define PyList_GetItem py3_PyList_GetItem |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
178 # define PyList_Append py3_PyList_Append |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
179 # define PyList_Insert py3_PyList_Insert |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
180 # define PyList_New py3_PyList_New |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
181 # define PyList_SetItem py3_PyList_SetItem |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
182 # define PyList_Size py3_PyList_Size |
| 3618 | 183 # define PySequence_Check py3_PySequence_Check |
| 184 # define PySequence_Size py3_PySequence_Size | |
| 185 # define PySequence_GetItem py3_PySequence_GetItem | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
186 # define PySequence_Fast py3_PySequence_Fast |
| 3618 | 187 # define PyTuple_Size py3_PyTuple_Size |
| 188 # 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
|
189 # 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
|
190 # 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
|
191 # 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
|
192 # endif |
|
281c1e6e17ea
patch 8.1.0147: compiler warning when building with Python 3.7
Christian Brabandt <cb@256bit.org>
parents:
13952
diff
changeset
|
193 # undef PySlice_GetIndicesEx |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
194 # define PySlice_GetIndicesEx py3_PySlice_GetIndicesEx |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
195 # define PyImport_ImportModule py3_PyImport_ImportModule |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
196 # define PyObject_Init py3__PyObject_Init |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
197 # define PyDict_New py3_PyDict_New |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
198 # define PyDict_GetItemString py3_PyDict_GetItemString |
| 3618 | 199 # define PyDict_Next py3_PyDict_Next |
| 200 # define PyMapping_Check py3_PyMapping_Check | |
|
5112
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
201 # ifndef PyMapping_Keys |
|
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
202 # define PyMapping_Keys py3_PyMapping_Keys |
|
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
203 # endif |
|
24916
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
204 # if PY_VERSION_HEX >= 0x030a00b2 |
|
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
205 # define PyIter_Check py3_PyIter_Check |
|
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
206 # endif |
| 3618 | 207 # define PyIter_Next py3_PyIter_Next |
| 208 # define PyObject_GetIter py3_PyObject_GetIter | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
209 # define PyObject_Repr py3_PyObject_Repr |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
210 # define PyObject_GetItem py3_PyObject_GetItem |
| 4399 | 211 # define PyObject_IsTrue py3_PyObject_IsTrue |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
212 # define PyModule_GetDict py3_PyModule_GetDict |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
213 #undef PyRun_SimpleString |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
214 # define PyRun_SimpleString py3_PyRun_SimpleString |
| 3618 | 215 #undef PyRun_String |
| 216 # define PyRun_String py3_PyRun_String | |
| 4417 | 217 # define PyObject_GetAttrString py3_PyObject_GetAttrString |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
218 # define PyObject_HasAttrString py3_PyObject_HasAttrString |
| 4417 | 219 # define PyObject_SetAttrString py3_PyObject_SetAttrString |
| 220 # define PyObject_CallFunctionObjArgs py3_PyObject_CallFunctionObjArgs | |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
221 # 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
|
222 # define PyObject_Call py3_PyObject_Call |
| 4417 | 223 # define PyEval_GetLocals py3_PyEval_GetLocals |
| 224 # define PyEval_GetGlobals py3_PyEval_GetGlobals | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
225 # define PySys_SetObject py3_PySys_SetObject |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
226 # define PySys_GetObject py3_PySys_GetObject |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
227 # define PySys_SetArgv py3_PySys_SetArgv |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
228 # 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
|
229 # 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
|
230 # 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
|
231 # endif |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
232 #undef Py_BuildValue |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
233 # define Py_BuildValue py3_Py_BuildValue |
| 2641 | 234 # define Py_SetPythonHome py3_Py_SetPythonHome |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
235 # define Py_Initialize py3_Py_Initialize |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
236 # define Py_Finalize py3_Py_Finalize |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
237 # define Py_IsInitialized py3_Py_IsInitialized |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
238 # define _Py_NoneStruct (*py3__Py_NoneStruct) |
| 3828 | 239 # define _Py_FalseStruct (*py3__Py_FalseStruct) |
| 240 # define _Py_TrueStruct (*py3__Py_TrueStruct) | |
| 3618 | 241 # define _PyObject_NextNotImplemented (*py3__PyObject_NextNotImplemented) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
242 # define PyModule_AddObject py3_PyModule_AddObject |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
243 # define PyImport_AppendInittab py3_PyImport_AppendInittab |
| 4417 | 244 # define PyImport_AddModule py3_PyImport_AddModule |
| 3863 | 245 # if PY_VERSION_HEX >= 0x030300f0 |
| 246 # undef _PyUnicode_AsString | |
| 3910 | 247 # define _PyUnicode_AsString py3_PyUnicode_AsUTF8 |
| 3863 | 248 # else |
| 249 # define _PyUnicode_AsString py3__PyUnicode_AsString | |
| 250 # endif | |
| 2894 | 251 # undef PyUnicode_AsEncodedString |
| 252 # define PyUnicode_AsEncodedString py3_PyUnicode_AsEncodedString | |
| 253 # undef PyBytes_AsString | |
| 254 # define PyBytes_AsString py3_PyBytes_AsString | |
|
5112
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
255 # ifndef PyBytes_AsStringAndSize |
|
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
256 # define PyBytes_AsStringAndSize py3_PyBytes_AsStringAndSize |
|
f063be86b632
updated for version 7.3.1299
Bram Moolenaar <bram@vim.org>
parents:
5088
diff
changeset
|
257 # endif |
| 3618 | 258 # undef PyBytes_FromString |
| 259 # 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
|
260 # undef PyBytes_FromStringAndSize |
|
1d2b5c016f17
patch 8.1.0735: cannot handle binary data
Bram Moolenaar <Bram@vim.org>
parents:
14862
diff
changeset
|
261 # 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
|
262 # 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
|
263 # 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
|
264 # endif |
| 3618 | 265 # define PyFloat_FromDouble py3_PyFloat_FromDouble |
| 266 # define PyFloat_AsDouble py3_PyFloat_AsDouble | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
267 # define PyObject_GenericGetAttr py3_PyObject_GenericGetAttr |
| 3828 | 268 # 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
|
269 # define PyStdPrinter_Type (*py3_PyStdPrinter_Type) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
270 # define PySlice_Type (*py3_PySlice_Type) |
| 3618 | 271 # define PyFloat_Type (*py3_PyFloat_Type) |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
272 # define PyNumber_Check (*py3_PyNumber_Check) |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
273 # define PyNumber_Long (*py3_PyNumber_Long) |
| 3828 | 274 # define PyBool_Type (*py3_PyBool_Type) |
| 2894 | 275 # 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
|
276 # 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
|
277 # 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
|
278 # define _Py_RefTotal (*py3__Py_RefTotal) |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
279 # define PyModule_Create2TraceRefs py3_PyModule_Create2TraceRefs |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
280 # else |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
281 # define PyModule_Create2 py3_PyModule_Create2 |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
282 # endif |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
283 # 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
|
284 # 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
|
285 # 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
|
286 # 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
|
287 # 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
|
288 # 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
|
289 # endif |
| 4500 | 290 # define _PyObject_GC_New py3__PyObject_GC_New |
| 291 # define PyObject_GC_Del py3_PyObject_GC_Del | |
| 292 # 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
|
293 # define PyType_GenericAlloc py3_PyType_GenericAlloc |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
294 # 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
|
295 # undef PyUnicode_FromString |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
296 # define PyUnicode_FromString py3_PyUnicode_FromString |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
297 # ifndef PyUnicode_FromFormat |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
298 # define PyUnicode_FromFormat py3_PyUnicode_FromFormat |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
299 # else |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
300 # define Py_UNICODE_USE_UCS_FUNCTIONS |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
301 # ifdef Py_UNICODE_WIDE |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
302 # define PyUnicodeUCS4_FromFormat py3_PyUnicodeUCS4_FromFormat |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
303 # else |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
304 # define PyUnicodeUCS2_FromFormat py3_PyUnicodeUCS2_FromFormat |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
305 # endif |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
306 # endif |
| 2894 | 307 # undef PyUnicode_Decode |
| 308 # define PyUnicode_Decode py3_PyUnicode_Decode | |
| 3618 | 309 # define PyType_IsSubtype py3_PyType_IsSubtype |
| 310 # define PyCapsule_New py3_PyCapsule_New | |
| 311 # define PyCapsule_GetPointer py3_PyCapsule_GetPointer | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
312 |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
313 # 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
|
314 # 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
|
315 # define PyObject_NEW(type, typeobj) \ |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
316 ( (type *) PyObject_Init( \ |
| 2330 | 317 (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
|
318 # 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
|
319 # 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
|
320 # 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
|
321 ((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
|
322 # 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
|
323 |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
324 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
325 * Pointers for dynamic link |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
326 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
327 static int (*py3_PySys_SetArgv)(int, wchar_t **); |
| 2641 | 328 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
|
329 static void (*py3_Py_Initialize)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
330 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
|
331 static PyGILState_STATE (*py3_PyGILState_Ensure)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
332 static void (*py3_PyGILState_Release)(PyGILState_STATE); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
333 static int (*py3_PySys_SetObject)(char *, PyObject *); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
334 static PyObject* (*py3_PySys_GetObject)(char *); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
335 static int (*py3_PyList_Append)(PyObject *, PyObject *); |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
336 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
|
337 static Py_ssize_t (*py3_PyList_Size)(PyObject *); |
| 3618 | 338 static int (*py3_PySequence_Check)(PyObject *); |
| 339 static Py_ssize_t (*py3_PySequence_Size)(PyObject *); | |
| 340 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
|
341 static PyObject* (*py3_PySequence_Fast)(PyObject *, const char *); |
| 3618 | 342 static Py_ssize_t (*py3_PyTuple_Size)(PyObject *); |
| 343 static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t); | |
| 344 static int (*py3_PyMapping_Check)(PyObject *); | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
345 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
|
346 # 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
|
347 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
|
348 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
|
349 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
|
350 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
|
351 # endif |
| 5768 | 352 static int (*py3_PySlice_GetIndicesEx)(PySliceObject_T *r, Py_ssize_t length, |
| 5608 | 353 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, |
| 354 Py_ssize_t *slicelen); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
355 static PyObject* (*py3_PyErr_NoMemory)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
356 static void (*py3_Py_Finalize)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
357 static void (*py3_PyErr_SetString)(PyObject *, const char *); |
| 4403 | 358 static void (*py3_PyErr_SetObject)(PyObject *, PyObject *); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
359 static int (*py3_PyErr_ExceptionMatches)(PyObject *); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
360 static int (*py3_PyRun_SimpleString)(char *); |
| 3618 | 361 static PyObject* (*py3_PyRun_String)(char *, int, PyObject *, PyObject *); |
| 4417 | 362 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
|
363 static int (*py3_PyObject_HasAttrString)(PyObject *, const char *); |
| 5419 | 364 static int (*py3_PyObject_SetAttrString)(PyObject *, const char *, PyObject *); |
| 4417 | 365 static PyObject* (*py3_PyObject_CallFunctionObjArgs)(PyObject *, ...); |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
366 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
|
367 static PyObject* (*py3_PyObject_Call)(PyObject *, PyObject *, PyObject *); |
| 4417 | 368 static PyObject* (*py3_PyEval_GetGlobals)(); |
| 369 static PyObject* (*py3_PyEval_GetLocals)(); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
370 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
|
371 static PyObject* (*py3_PyImport_ImportModule)(const char *); |
| 3618 | 372 static PyObject* (*py3_PyImport_AddModule)(const char *); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
373 static int (*py3_PyErr_BadArgument)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
374 static PyObject* (*py3_PyErr_Occurred)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
375 static PyObject* (*py3_PyModule_GetDict)(PyObject *); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
376 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
|
377 static PyObject* (*py3_PyDict_GetItemString)(PyObject *, const char *); |
| 3618 | 378 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
|
379 static PyObject* (*py3_PyLong_FromLong)(long); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
380 static PyObject* (*py3_PyDict_New)(void); |
|
24916
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
381 # if PY_VERSION_HEX >= 0x030a00b2 |
|
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
382 static int (*py3_PyIter_Check)(PyObject *o); |
|
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
383 # endif |
| 3618 | 384 static PyObject* (*py3_PyIter_Next)(PyObject *); |
| 385 static PyObject* (*py3_PyObject_GetIter)(PyObject *); | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
386 static PyObject* (*py3_PyObject_Repr)(PyObject *); |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
387 static PyObject* (*py3_PyObject_GetItem)(PyObject *, PyObject *); |
| 4399 | 388 static int (*py3_PyObject_IsTrue)(PyObject *); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
389 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
|
390 # 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
|
391 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
|
392 # endif |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
393 static int (*py3_PyType_Ready)(PyTypeObject *type); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
394 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
|
395 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
|
396 # ifndef Py_UNICODE_USE_UCS_FUNCTIONS |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
397 static PyObject* (*py3_PyUnicode_FromFormat)(const char *u, ...); |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
398 # else |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
399 # ifdef Py_UNICODE_WIDE |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
400 static PyObject* (*py3_PyUnicodeUCS4_FromFormat)(const char *u, ...); |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
401 # else |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
402 static PyObject* (*py3_PyUnicodeUCS2_FromFormat)(const char *u, ...); |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
403 # endif |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
404 # endif |
| 2894 | 405 static PyObject* (*py3_PyUnicode_Decode)(const char *u, Py_ssize_t size, |
| 406 const char *encoding, const char *errors); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
407 static long (*py3_PyLong_AsLong)(PyObject *); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
408 static void (*py3_PyErr_SetNone)(PyObject *); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
409 static void (*py3_PyEval_InitThreads)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
410 static void(*py3_PyEval_RestoreThread)(PyThreadState *); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
411 static PyThreadState*(*py3_PyEval_SaveThread)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
412 static int (*py3_PyArg_Parse)(PyObject *, char *, ...); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
413 static int (*py3_PyArg_ParseTuple)(PyObject *, char *, ...); |
| 2894 | 414 static int (*py3_PyMem_Free)(void *); |
| 3618 | 415 static void* (*py3_PyMem_Malloc)(size_t); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
416 static int (*py3_Py_IsInitialized)(void); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
417 static void (*py3_PyErr_Clear)(void); |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
418 static PyObject* (*py3_PyErr_Format)(PyObject *, const char *, ...); |
| 4145 | 419 static void (*py3_PyErr_PrintEx)(int); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
420 static PyObject*(*py3__PyObject_Init)(PyObject *, PyTypeObject *); |
| 3618 | 421 static iternextfunc py3__PyObject_NextNotImplemented; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
422 static PyObject* py3__Py_NoneStruct; |
| 3828 | 423 static PyObject* py3__Py_FalseStruct; |
| 424 static PyObject* py3__Py_TrueStruct; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
425 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
|
426 static int (*py3_PyImport_AppendInittab)(const char *name, PyObject* (*initfunc)(void)); |
| 3910 | 427 # if PY_VERSION_HEX >= 0x030300f0 |
| 428 static char* (*py3_PyUnicode_AsUTF8)(PyObject *unicode); | |
| 429 # else | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
430 static char* (*py3__PyUnicode_AsString)(PyObject *unicode); |
| 3910 | 431 # endif |
| 2894 | 432 static PyObject* (*py3_PyUnicode_AsEncodedString)(PyObject *unicode, const char* encoding, const char* errors); |
| 433 static char* (*py3_PyBytes_AsString)(PyObject *bytes); | |
|
4966
620d9b59d4ed
updated for version 7.3.1228
Bram Moolenaar <bram@vim.org>
parents:
4881
diff
changeset
|
434 static int (*py3_PyBytes_AsStringAndSize)(PyObject *bytes, char **buffer, Py_ssize_t *length); |
| 3618 | 435 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
|
436 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
|
437 # 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
|
438 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
|
439 # endif |
|
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
440 # 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
|
441 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
|
442 # endif |
| 3618 | 443 static PyObject* (*py3_PyFloat_FromDouble)(double num); |
| 444 static double (*py3_PyFloat_AsDouble)(PyObject *); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
445 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
|
446 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
|
447 static PyObject* (*py3_PyType_GenericNew)(PyTypeObject *type, PyObject *args, PyObject *kwds); |
| 3828 | 448 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
|
449 static PyTypeObject* py3_PyStdPrinter_Type; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
450 static PyTypeObject* py3_PySlice_Type; |
| 3618 | 451 static PyTypeObject* py3_PyFloat_Type; |
| 3828 | 452 static PyTypeObject* py3_PyBool_Type; |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
453 static int (*py3_PyNumber_Check)(PyObject *); |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
454 static PyObject* (*py3_PyNumber_Long)(PyObject *); |
| 2894 | 455 static PyObject* (*py3_PyErr_NewException)(char *name, PyObject *base, PyObject *dict); |
| 3618 | 456 static PyObject* (*py3_PyCapsule_New)(void *, char *, PyCapsule_Destructor); |
| 457 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
|
458 # ifdef Py_DEBUG |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
459 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
|
460 static Py_ssize_t* py3__Py_RefTotal; |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
461 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
|
462 # else |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
463 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
|
464 # endif |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
465 # 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
|
466 static void (*py3__PyObject_DebugFree)(void*); |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
467 static void* (*py3__PyObject_DebugMalloc)(size_t); |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
468 # else |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
469 static void (*py3_PyObject_Free)(void*); |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
470 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
|
471 # endif |
| 4500 | 472 static PyObject*(*py3__PyObject_GC_New)(PyTypeObject *); |
| 473 static void(*py3_PyObject_GC_Del)(void *); | |
| 474 static void(*py3_PyObject_GC_UnTrack)(void *); | |
| 3618 | 475 static int (*py3_PyType_IsSubtype)(PyTypeObject *, PyTypeObject *); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
476 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
477 // Imported exception objects |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
478 static PyObject *p3imp_PyExc_AttributeError; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
479 static PyObject *p3imp_PyExc_IndexError; |
| 4315 | 480 static PyObject *p3imp_PyExc_KeyError; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
481 static PyObject *p3imp_PyExc_KeyboardInterrupt; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
482 static PyObject *p3imp_PyExc_TypeError; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
483 static PyObject *p3imp_PyExc_ValueError; |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
484 static PyObject *p3imp_PyExc_SystemExit; |
| 4405 | 485 static PyObject *p3imp_PyExc_RuntimeError; |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
486 static PyObject *p3imp_PyExc_ImportError; |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
487 static PyObject *p3imp_PyExc_OverflowError; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
488 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
489 # define PyExc_AttributeError p3imp_PyExc_AttributeError |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
490 # define PyExc_IndexError p3imp_PyExc_IndexError |
| 4315 | 491 # define PyExc_KeyError p3imp_PyExc_KeyError |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
492 # define PyExc_KeyboardInterrupt p3imp_PyExc_KeyboardInterrupt |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
493 # define PyExc_TypeError p3imp_PyExc_TypeError |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
494 # define PyExc_ValueError p3imp_PyExc_ValueError |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
495 # define PyExc_SystemExit p3imp_PyExc_SystemExit |
| 4405 | 496 # define PyExc_RuntimeError p3imp_PyExc_RuntimeError |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
497 # define PyExc_ImportError p3imp_PyExc_ImportError |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
498 # define PyExc_OverflowError p3imp_PyExc_OverflowError |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
499 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
500 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
501 * Table of name to function pointer of python. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
502 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
503 # define PYTHON_PROC FARPROC |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
504 static struct |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
505 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
506 char *name; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
507 PYTHON_PROC *ptr; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
508 } py3_funcname_table[] = |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
509 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
510 {"PySys_SetArgv", (PYTHON_PROC*)&py3_PySys_SetArgv}, |
| 2641 | 511 {"Py_SetPythonHome", (PYTHON_PROC*)&py3_Py_SetPythonHome}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
512 {"Py_Initialize", (PYTHON_PROC*)&py3_Py_Initialize}, |
| 3806 | 513 {"_PyArg_ParseTuple_SizeT", (PYTHON_PROC*)&py3_PyArg_ParseTuple}, |
| 514 {"_Py_BuildValue_SizeT", (PYTHON_PROC*)&py3_Py_BuildValue}, | |
| 2894 | 515 {"PyMem_Free", (PYTHON_PROC*)&py3_PyMem_Free}, |
| 3618 | 516 {"PyMem_Malloc", (PYTHON_PROC*)&py3_PyMem_Malloc}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
517 {"PyList_New", (PYTHON_PROC*)&py3_PyList_New}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
518 {"PyGILState_Ensure", (PYTHON_PROC*)&py3_PyGILState_Ensure}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
519 {"PyGILState_Release", (PYTHON_PROC*)&py3_PyGILState_Release}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
520 {"PySys_SetObject", (PYTHON_PROC*)&py3_PySys_SetObject}, |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
521 {"PySys_GetObject", (PYTHON_PROC*)&py3_PySys_GetObject}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
522 {"PyList_Append", (PYTHON_PROC*)&py3_PyList_Append}, |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
523 {"PyList_Insert", (PYTHON_PROC*)&py3_PyList_Insert}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
524 {"PyList_Size", (PYTHON_PROC*)&py3_PyList_Size}, |
| 3618 | 525 {"PySequence_Check", (PYTHON_PROC*)&py3_PySequence_Check}, |
| 526 {"PySequence_Size", (PYTHON_PROC*)&py3_PySequence_Size}, | |
| 527 {"PySequence_GetItem", (PYTHON_PROC*)&py3_PySequence_GetItem}, | |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
528 {"PySequence_Fast", (PYTHON_PROC*)&py3_PySequence_Fast}, |
| 3618 | 529 {"PyTuple_Size", (PYTHON_PROC*)&py3_PyTuple_Size}, |
| 530 {"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
|
531 # 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
|
532 {"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
|
533 {"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
|
534 # endif |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
535 {"PySlice_GetIndicesEx", (PYTHON_PROC*)&py3_PySlice_GetIndicesEx}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
536 {"PyErr_NoMemory", (PYTHON_PROC*)&py3_PyErr_NoMemory}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
537 {"Py_Finalize", (PYTHON_PROC*)&py3_Py_Finalize}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
538 {"PyErr_SetString", (PYTHON_PROC*)&py3_PyErr_SetString}, |
| 4403 | 539 {"PyErr_SetObject", (PYTHON_PROC*)&py3_PyErr_SetObject}, |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
540 {"PyErr_ExceptionMatches", (PYTHON_PROC*)&py3_PyErr_ExceptionMatches}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
541 {"PyRun_SimpleString", (PYTHON_PROC*)&py3_PyRun_SimpleString}, |
| 3618 | 542 {"PyRun_String", (PYTHON_PROC*)&py3_PyRun_String}, |
| 4417 | 543 {"PyObject_GetAttrString", (PYTHON_PROC*)&py3_PyObject_GetAttrString}, |
|
4627
18ba89e06fab
updated for version 7.3.1061
Bram Moolenaar <bram@vim.org>
parents:
4623
diff
changeset
|
544 {"PyObject_HasAttrString", (PYTHON_PROC*)&py3_PyObject_HasAttrString}, |
| 4417 | 545 {"PyObject_SetAttrString", (PYTHON_PROC*)&py3_PyObject_SetAttrString}, |
| 546 {"PyObject_CallFunctionObjArgs", (PYTHON_PROC*)&py3_PyObject_CallFunctionObjArgs}, | |
|
4855
52850ef928f8
updated for version 7.3.1174
Bram Moolenaar <bram@vim.org>
parents:
4833
diff
changeset
|
547 {"_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
|
548 {"PyObject_Call", (PYTHON_PROC*)&py3_PyObject_Call}, |
| 4417 | 549 {"PyEval_GetGlobals", (PYTHON_PROC*)&py3_PyEval_GetGlobals}, |
| 550 {"PyEval_GetLocals", (PYTHON_PROC*)&py3_PyEval_GetLocals}, | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
551 {"PyList_GetItem", (PYTHON_PROC*)&py3_PyList_GetItem}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
552 {"PyImport_ImportModule", (PYTHON_PROC*)&py3_PyImport_ImportModule}, |
| 3618 | 553 {"PyImport_AddModule", (PYTHON_PROC*)&py3_PyImport_AddModule}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
554 {"PyErr_BadArgument", (PYTHON_PROC*)&py3_PyErr_BadArgument}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
555 {"PyErr_Occurred", (PYTHON_PROC*)&py3_PyErr_Occurred}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
556 {"PyModule_GetDict", (PYTHON_PROC*)&py3_PyModule_GetDict}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
557 {"PyList_SetItem", (PYTHON_PROC*)&py3_PyList_SetItem}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
558 {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString}, |
| 3618 | 559 {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next}, |
| 560 {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check}, | |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
561 {"PyMapping_Keys", (PYTHON_PROC*)&py3_PyMapping_Keys}, |
|
24916
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
562 # if PY_VERSION_HEX >= 0x030a00b2 |
|
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
563 {"PyIter_Check", (PYTHON_PROC*)&py3_PyIter_Check}, |
|
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
564 # endif |
| 3618 | 565 {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next}, |
| 566 {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter}, | |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
567 {"PyObject_Repr", (PYTHON_PROC*)&py3_PyObject_Repr}, |
|
4635
07c534fe9b6c
updated for version 7.3.1065
Bram Moolenaar <bram@vim.org>
parents:
4627
diff
changeset
|
568 {"PyObject_GetItem", (PYTHON_PROC*)&py3_PyObject_GetItem}, |
| 4399 | 569 {"PyObject_IsTrue", (PYTHON_PROC*)&py3_PyObject_IsTrue}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
570 {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
571 {"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
|
572 # 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
|
573 {"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
|
574 # endif |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
575 {"PyType_Ready", (PYTHON_PROC*)&py3_PyType_Ready}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
576 {"PyDict_SetItemString", (PYTHON_PROC*)&py3_PyDict_SetItemString}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
577 {"PyLong_AsLong", (PYTHON_PROC*)&py3_PyLong_AsLong}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
578 {"PyErr_SetNone", (PYTHON_PROC*)&py3_PyErr_SetNone}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
579 {"PyEval_InitThreads", (PYTHON_PROC*)&py3_PyEval_InitThreads}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
580 {"PyEval_RestoreThread", (PYTHON_PROC*)&py3_PyEval_RestoreThread}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
581 {"PyEval_SaveThread", (PYTHON_PROC*)&py3_PyEval_SaveThread}, |
|
4881
7b8991e084f9
updated for version 7.3.1186
Bram Moolenaar <bram@vim.org>
parents:
4855
diff
changeset
|
582 {"_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
|
583 {"Py_IsInitialized", (PYTHON_PROC*)&py3_Py_IsInitialized}, |
| 3618 | 584 {"_PyObject_NextNotImplemented", (PYTHON_PROC*)&py3__PyObject_NextNotImplemented}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
585 {"_Py_NoneStruct", (PYTHON_PROC*)&py3__Py_NoneStruct}, |
| 3828 | 586 {"_Py_FalseStruct", (PYTHON_PROC*)&py3__Py_FalseStruct}, |
| 587 {"_Py_TrueStruct", (PYTHON_PROC*)&py3__Py_TrueStruct}, | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
588 {"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear}, |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
589 {"PyErr_Format", (PYTHON_PROC*)&py3_PyErr_Format}, |
| 4145 | 590 {"PyErr_PrintEx", (PYTHON_PROC*)&py3_PyErr_PrintEx}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
591 {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
592 {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
593 {"PyImport_AppendInittab", (PYTHON_PROC*)&py3_PyImport_AppendInittab}, |
| 3910 | 594 # if PY_VERSION_HEX >= 0x030300f0 |
| 595 {"PyUnicode_AsUTF8", (PYTHON_PROC*)&py3_PyUnicode_AsUTF8}, | |
| 596 # else | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
597 {"_PyUnicode_AsString", (PYTHON_PROC*)&py3__PyUnicode_AsString}, |
| 3910 | 598 # endif |
|
4623
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
599 # ifndef Py_UNICODE_USE_UCS_FUNCTIONS |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
600 {"PyUnicode_FromFormat", (PYTHON_PROC*)&py3_PyUnicode_FromFormat}, |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
601 # else |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
602 # ifdef Py_UNICODE_WIDE |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
603 {"PyUnicodeUCS4_FromFormat", (PYTHON_PROC*)&py3_PyUnicodeUCS4_FromFormat}, |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
604 # else |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
605 {"PyUnicodeUCS2_FromFormat", (PYTHON_PROC*)&py3_PyUnicodeUCS2_FromFormat}, |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
606 # endif |
|
548b889fe3cf
updated for version 7.3.1059
Bram Moolenaar <bram@vim.org>
parents:
4599
diff
changeset
|
607 # endif |
| 2894 | 608 {"PyBytes_AsString", (PYTHON_PROC*)&py3_PyBytes_AsString}, |
| 3798 | 609 {"PyBytes_AsStringAndSize", (PYTHON_PROC*)&py3_PyBytes_AsStringAndSize}, |
| 3618 | 610 {"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
|
611 {"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
|
612 # 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
|
613 {"_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
|
614 # endif |
|
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
615 # 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
|
616 {"_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
|
617 # endif |
| 3618 | 618 {"PyFloat_FromDouble", (PYTHON_PROC*)&py3_PyFloat_FromDouble}, |
| 619 {"PyFloat_AsDouble", (PYTHON_PROC*)&py3_PyFloat_AsDouble}, | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
620 {"PyObject_GenericGetAttr", (PYTHON_PROC*)&py3_PyObject_GenericGetAttr}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
621 {"PyType_GenericAlloc", (PYTHON_PROC*)&py3_PyType_GenericAlloc}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
622 {"PyType_GenericNew", (PYTHON_PROC*)&py3_PyType_GenericNew}, |
| 3828 | 623 {"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
|
624 {"PyStdPrinter_Type", (PYTHON_PROC*)&py3_PyStdPrinter_Type}, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
625 {"PySlice_Type", (PYTHON_PROC*)&py3_PySlice_Type}, |
| 3618 | 626 {"PyFloat_Type", (PYTHON_PROC*)&py3_PyFloat_Type}, |
| 3828 | 627 {"PyBool_Type", (PYTHON_PROC*)&py3_PyBool_Type}, |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
628 {"PyNumber_Check", (PYTHON_PROC*)&py3_PyNumber_Check}, |
|
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
629 {"PyNumber_Long", (PYTHON_PROC*)&py3_PyNumber_Long}, |
| 2894 | 630 {"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
|
631 # ifdef Py_DEBUG |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
632 {"_Py_NegativeRefcount", (PYTHON_PROC*)&py3__Py_NegativeRefcount}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
633 {"_Py_RefTotal", (PYTHON_PROC*)&py3__Py_RefTotal}, |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
634 {"PyModule_Create2TraceRefs", (PYTHON_PROC*)&py3_PyModule_Create2TraceRefs}, |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
635 # else |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
636 {"PyModule_Create2", (PYTHON_PROC*)&py3_PyModule_Create2}, |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
637 # endif |
|
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
638 # 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
|
639 {"_PyObject_DebugFree", (PYTHON_PROC*)&py3__PyObject_DebugFree}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
640 {"_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
|
641 # else |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
642 {"PyObject_Malloc", (PYTHON_PROC*)&py3_PyObject_Malloc}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
643 {"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
|
644 # endif |
| 4500 | 645 {"_PyObject_GC_New", (PYTHON_PROC*)&py3__PyObject_GC_New}, |
| 646 {"PyObject_GC_Del", (PYTHON_PROC*)&py3_PyObject_GC_Del}, | |
| 647 {"PyObject_GC_UnTrack", (PYTHON_PROC*)&py3_PyObject_GC_UnTrack}, | |
| 3618 | 648 {"PyType_IsSubtype", (PYTHON_PROC*)&py3_PyType_IsSubtype}, |
| 649 {"PyCapsule_New", (PYTHON_PROC*)&py3_PyCapsule_New}, | |
| 650 {"PyCapsule_GetPointer", (PYTHON_PROC*)&py3_PyCapsule_GetPointer}, | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
651 {"", NULL}, |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
652 }; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
653 |
|
18414
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
654 # 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
|
655 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
|
656 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
|
657 { |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
658 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
|
659 { |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
660 # 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
|
661 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
|
662 { |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
663 _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
|
664 } |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
665 # endif |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
666 } |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
667 else |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
668 { |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
669 _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
|
670 } |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
671 } |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
672 |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
673 # 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
|
674 # 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
|
675 |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
676 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
|
677 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
|
678 { |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
679 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
|
680 { |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
681 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
|
682 } |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
683 } |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
684 |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
685 # 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
|
686 # 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
|
687 # endif |
|
6b8508ea90d7
patch 8.1.2201: cannot build with dynamically linked Python 3.8
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
688 |
|
21349
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
689 # 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
|
690 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
|
691 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
|
692 { |
|
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
693 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
|
694 } |
|
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
695 # 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
|
696 # endif |
|
8488d9cc3ccd
patch 8.2.1225: linker errors when building with dynamic Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
21190
diff
changeset
|
697 |
|
24916
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
698 # if PY_VERSION_HEX >= 0x030a00b2 |
|
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
699 static inline int |
|
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
700 py3__PyObject_TypeCheck(PyObject *ob, PyTypeObject *type) |
|
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
701 { |
|
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
702 return Py_IS_TYPE(ob, type) || PyType_IsSubtype(Py_TYPE(ob), type); |
|
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
703 } |
|
29303
b15485413b9a
patch 8.2.5168: cannot build with Python 3.11
Bram Moolenaar <Bram@vim.org>
parents:
27581
diff
changeset
|
704 # if PY_VERSION_HEX >= 0x030b00b3 |
|
b15485413b9a
patch 8.2.5168: cannot build with Python 3.11
Bram Moolenaar <Bram@vim.org>
parents:
27581
diff
changeset
|
705 # undef PyObject_TypeCheck |
|
b15485413b9a
patch 8.2.5168: cannot build with Python 3.11
Bram Moolenaar <Bram@vim.org>
parents:
27581
diff
changeset
|
706 # define PyObject_TypeCheck(o,t) py3__PyObject_TypeCheck(o,t) |
|
b15485413b9a
patch 8.2.5168: cannot build with Python 3.11
Bram Moolenaar <Bram@vim.org>
parents:
27581
diff
changeset
|
707 # else |
|
b15485413b9a
patch 8.2.5168: cannot build with Python 3.11
Bram Moolenaar <Bram@vim.org>
parents:
27581
diff
changeset
|
708 # define _PyObject_TypeCheck(o,t) py3__PyObject_TypeCheck(o,t) |
|
b15485413b9a
patch 8.2.5168: cannot build with Python 3.11
Bram Moolenaar <Bram@vim.org>
parents:
27581
diff
changeset
|
709 # endif |
|
24916
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
710 # endif |
|
275a8ced3ba2
patch 8.2.2995: linker errors with dynamic Python 3.10
Bram Moolenaar <Bram@vim.org>
parents:
23336
diff
changeset
|
711 |
|
23336
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
712 # ifdef MSWIN |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
713 /* |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
714 * Look up the library "libname" using the InstallPath registry key. |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
715 * Return NULL when failed. Return an allocated string when successful. |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
716 */ |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
717 static char * |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
718 py3_get_system_libname(const char *libname) |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
719 { |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
720 const char *cp = libname; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
721 char subkey[128]; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
722 HKEY hKey; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
723 char installpath[MAXPATHL]; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
724 LONG len = sizeof(installpath); |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
725 LSTATUS rc; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
726 size_t sysliblen; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
727 char *syslibname; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
728 |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
729 while (*cp != '\0') |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
730 { |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
731 if (*cp == ':' || *cp == '\\' || *cp == '/') |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
732 { |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
733 // Bail out if "libname" contains path separator, assume it is |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
734 // an absolute path. |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
735 return NULL; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
736 } |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
737 ++cp; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
738 } |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
739 vim_snprintf(subkey, sizeof(subkey), |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
740 # ifdef _WIN64 |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
741 "Software\\Python\\PythonCore\\%d.%d\\InstallPath", |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
742 # else |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
743 "Software\\Python\\PythonCore\\%d.%d-32\\InstallPath", |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
744 # endif |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
745 PY_MAJOR_VERSION, PY_MINOR_VERSION); |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
746 if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, subkey, 0, KEY_QUERY_VALUE, &hKey) |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
747 != ERROR_SUCCESS) |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
748 return NULL; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
749 rc = RegQueryValueA(hKey, NULL, installpath, &len); |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
750 RegCloseKey(hKey); |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
751 if (ERROR_SUCCESS != rc) |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
752 return NULL; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
753 cp = installpath + len; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
754 // Just in case registry value contains null terminators. |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
755 while (cp > installpath && *(cp-1) == '\0') |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
756 --cp; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
757 // Remove trailing path separators. |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
758 while (cp > installpath && (*(cp-1) == '\\' || *(cp-1) == '/')) |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
759 --cp; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
760 // Ignore if InstallPath is effectively empty. |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
761 if (cp <= installpath) |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
762 return NULL; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
763 sysliblen = (cp - installpath) + 1 + STRLEN(libname) + 1; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
764 syslibname = alloc(sysliblen); |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
765 vim_snprintf(syslibname, sysliblen, "%.*s\\%s", |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
766 (int)(cp - installpath), installpath, libname); |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
767 return syslibname; |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
768 } |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
769 # endif |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
770 |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
771 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
772 * Load library and get all pointers. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
773 * Parameter 'libname' provides name of DLL. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
774 * Return OK or FAIL. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
775 */ |
|
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
|
776 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
|
777 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
|
778 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
779 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
|
780 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
|
781 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
|
782 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
|
783 (PYTHON_PROC *)&py3_PyUnicode_AsEncodedString; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
784 |
| 2641 | 785 # 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
|
786 // Can't have Python and Python3 loaded at the same time. |
|
26771
fc859aea8cec
patch 8.2.3914: various spelling mistakes in comments
Bram Moolenaar <Bram@vim.org>
parents:
25342
diff
changeset
|
787 // It causes a crash, because RTLD_GLOBAL is needed for |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
788 // 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
|
789 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
|
790 { |
| 3032 | 791 if (verbose) |
|
26962
85866e069c24
patch 8.2.4010: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26897
diff
changeset
|
792 emsg(_(e_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
|
793 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
|
794 } |
|
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
|
795 # 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
|
796 |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
797 if (hinstPy3 != 0) |
| 2330 | 798 return OK; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
799 hinstPy3 = load_dll(libname); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
800 |
|
23336
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
801 # ifdef MSWIN |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
802 if (!hinstPy3) |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
803 { |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
804 // Attempt to use the path from InstallPath as stored in the registry. |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
805 char *syslibname = py3_get_system_libname(libname); |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
806 |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
807 if (syslibname != NULL) |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
808 { |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
809 hinstPy3 = load_dll(syslibname); |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
810 vim_free(syslibname); |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
811 } |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
812 } |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
813 # endif |
|
9c8353f58076
patch 8.2.2211: MS-Windows: can't load Python dll if not in the path
Bram Moolenaar <Bram@vim.org>
parents:
23264
diff
changeset
|
814 |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
815 if (!hinstPy3) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
816 { |
| 2330 | 817 if (verbose) |
|
26877
06a137af96f8
patch 8.2.3967: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
818 semsg(_(e_could_not_load_library_str_str), libname, load_dll_error()); |
| 2330 | 819 return FAIL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
820 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
821 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
822 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
|
823 { |
| 2330 | 824 if ((*py3_funcname_table[i].ptr = symbol_from_dll(hinstPy3, |
| 825 py3_funcname_table[i].name)) == NULL) | |
| 826 { | |
| 827 close_dll(hinstPy3); | |
| 828 hinstPy3 = 0; | |
| 829 if (verbose) | |
|
26877
06a137af96f8
patch 8.2.3967: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
830 semsg(_(e_could_not_load_library_function_str), py3_funcname_table[i].name); |
| 2330 | 831 return FAIL; |
| 832 } | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
833 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
834 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
835 // 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
|
836 // will be present in the library. |
| 3910 | 837 # 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
|
838 *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
|
839 *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
|
840 *ucs_as_encoded_string = symbol_from_dll(hinstPy3, |
| 3863 | 841 "PyUnicode_AsEncodedString"); |
| 3910 | 842 # else |
|
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
843 *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
|
844 *ucs_decode = symbol_from_dll(hinstPy3, |
| 2894 | 845 "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
|
846 *ucs_as_encoded_string = symbol_from_dll(hinstPy3, |
| 2894 | 847 "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
|
848 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
|
849 || *ucs_as_encoded_string == NULL) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
850 { |
|
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
851 *ucs_from_string = symbol_from_dll(hinstPy3, |
| 2330 | 852 "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
|
853 *ucs_decode = symbol_from_dll(hinstPy3, |
| 2894 | 854 "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
|
855 *ucs_as_encoded_string = symbol_from_dll(hinstPy3, |
| 2894 | 856 "PyUnicodeUCS4_AsEncodedString"); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
857 } |
| 3910 | 858 # endif |
|
13561
417a01a1aaaa
patch 8.0.1654: warnings for conversion of void to function pointer
Christian Brabandt <cb@256bit.org>
parents:
13523
diff
changeset
|
859 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
|
860 || *ucs_as_encoded_string == NULL) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
861 { |
| 2330 | 862 close_dll(hinstPy3); |
| 863 hinstPy3 = 0; | |
| 864 if (verbose) | |
|
26877
06a137af96f8
patch 8.2.3967: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26771
diff
changeset
|
865 semsg(_(e_could_not_load_library_function_str), "PyUnicode_UCSX_*"); |
| 2330 | 866 return FAIL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
867 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
868 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
869 return OK; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
870 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
871 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
872 /* |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
873 * 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
|
874 * TRUE, else FALSE. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
875 */ |
|
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
|
876 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
|
877 python3_enabled(int verbose) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
878 { |
|
7528
53163e4d9e4f
commit https://github.com/vim/vim/commit/25e4fcde767084d1a79e0926bc301c92987c0cce
Christian Brabandt <cb@256bit.org>
parents:
7416
diff
changeset
|
879 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
|
880 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
881 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
882 /* |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
883 * 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
|
884 * 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
|
885 */ |
|
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
|
886 static void |
|
7823
bcef391c101c
commit https://github.com/vim/vim/commit/68c2f638e65d914dc6e84eb7ce2624f08af525c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
887 get_py3_exceptions(void) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
888 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
889 PyObject *exmod = PyImport_ImportModule("builtins"); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
890 PyObject *exdict = PyModule_GetDict(exmod); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
891 p3imp_PyExc_AttributeError = PyDict_GetItemString(exdict, "AttributeError"); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
892 p3imp_PyExc_IndexError = PyDict_GetItemString(exdict, "IndexError"); |
| 4315 | 893 p3imp_PyExc_KeyError = PyDict_GetItemString(exdict, "KeyError"); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
894 p3imp_PyExc_KeyboardInterrupt = PyDict_GetItemString(exdict, "KeyboardInterrupt"); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
895 p3imp_PyExc_TypeError = PyDict_GetItemString(exdict, "TypeError"); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
896 p3imp_PyExc_ValueError = PyDict_GetItemString(exdict, "ValueError"); |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
897 p3imp_PyExc_SystemExit = PyDict_GetItemString(exdict, "SystemExit"); |
| 4405 | 898 p3imp_PyExc_RuntimeError = PyDict_GetItemString(exdict, "RuntimeError"); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
899 p3imp_PyExc_ImportError = PyDict_GetItemString(exdict, "ImportError"); |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
900 p3imp_PyExc_OverflowError = PyDict_GetItemString(exdict, "OverflowError"); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
901 Py_XINCREF(p3imp_PyExc_AttributeError); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
902 Py_XINCREF(p3imp_PyExc_IndexError); |
| 4315 | 903 Py_XINCREF(p3imp_PyExc_KeyError); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
904 Py_XINCREF(p3imp_PyExc_KeyboardInterrupt); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
905 Py_XINCREF(p3imp_PyExc_TypeError); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
906 Py_XINCREF(p3imp_PyExc_ValueError); |
|
5088
34c629c3b4ba
updated for version 7.3.1287
Bram Moolenaar <bram@vim.org>
parents:
4982
diff
changeset
|
907 Py_XINCREF(p3imp_PyExc_SystemExit); |
| 4405 | 908 Py_XINCREF(p3imp_PyExc_RuntimeError); |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
909 Py_XINCREF(p3imp_PyExc_ImportError); |
|
4972
537bbfff0c5c
updated for version 7.3.1231
Bram Moolenaar <bram@vim.org>
parents:
4970
diff
changeset
|
910 Py_XINCREF(p3imp_PyExc_OverflowError); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
911 Py_XDECREF(exmod); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
912 } |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
913 #endif // DYNAMIC_PYTHON3 |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
914 |
| 3618 | 915 static int py3initialised = 0; |
| 916 #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
|
917 static int python_end_called = FALSE; |
| 3618 | 918 |
| 4500 | 919 #define DESTRUCTOR_FINISH(self) Py_TYPE(self)->tp_free((PyObject*)self) |
| 3618 | 920 |
| 4377 | 921 #define WIN_PYTHON_REF(win) win->w_python3_ref |
| 922 #define BUF_PYTHON_REF(buf) buf->b_python3_ref | |
| 4401 | 923 #define TAB_PYTHON_REF(tab) tab->tp_python3_ref |
| 4377 | 924 |
|
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
|
925 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
|
926 call_PyObject_Free(void *p) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
927 { |
|
4585
b9f87487d935
updated for version 7.3.1040
Bram Moolenaar <bram@vim.org>
parents:
4511
diff
changeset
|
928 #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
|
929 _PyObject_DebugFree(p); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
930 #else |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
931 PyObject_Free(p); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
932 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
933 } |
|
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
|
934 |
|
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
|
935 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
|
936 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
|
937 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
938 return PyType_GenericNew(type,args,kwds); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
939 } |
|
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
|
940 |
|
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
|
941 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
|
942 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
|
943 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
944 return PyType_GenericAlloc(type,nitems); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
945 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
946 |
| 4319 | 947 static PyObject *OutputGetattro(PyObject *, PyObject *); |
| 948 static int OutputSetattro(PyObject *, PyObject *, PyObject *); | |
| 949 static PyObject *BufferGetattro(PyObject *, PyObject *); | |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
950 static int BufferSetattro(PyObject *, PyObject *, PyObject *); |
| 4401 | 951 static PyObject *TabPageGetattro(PyObject *, PyObject *); |
| 4319 | 952 static PyObject *WindowGetattro(PyObject *, PyObject *); |
| 953 static int WindowSetattro(PyObject *, PyObject *, PyObject *); | |
| 954 static PyObject *RangeGetattro(PyObject *, PyObject *); | |
| 955 static PyObject *CurrentGetattro(PyObject *, PyObject *); | |
| 956 static int CurrentSetattro(PyObject *, PyObject *, PyObject *); | |
| 957 static PyObject *DictionaryGetattro(PyObject *, PyObject *); | |
| 958 static int DictionarySetattro(PyObject *, PyObject *, PyObject *); | |
| 959 static PyObject *ListGetattro(PyObject *, PyObject *); | |
| 960 static int ListSetattro(PyObject *, PyObject *, PyObject *); | |
| 961 static PyObject *FunctionGetattro(PyObject *, PyObject *); | |
| 962 | |
| 963 static struct PyModuleDef vimmodule; | |
| 964 | |
|
4511
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
965 #define PY_CAN_RECURSE |
|
ce94a870b59b
updated for version 7.3.1003
Bram Moolenaar <bram@vim.org>
parents:
4500
diff
changeset
|
966 |
| 4319 | 967 /* |
| 968 * Include the code shared with if_python.c | |
| 969 */ | |
| 970 #include "if_py_both.h" | |
| 971 | |
|
16030
6694659c6ad6
patch 8.1.1020: compiler warning for Python3 interface
Bram Moolenaar <Bram@vim.org>
parents:
15888
diff
changeset
|
972 // NOTE: Must always be used at the start of a block, since it declares "name". |
| 4319 | 973 #define GET_ATTR_STRING(name, nameobj) \ |
| 974 char *name = ""; \ | |
| 975 if (PyUnicode_Check(nameobj)) \ | |
|
16030
6694659c6ad6
patch 8.1.1020: compiler warning for Python3 interface
Bram Moolenaar <Bram@vim.org>
parents:
15888
diff
changeset
|
976 name = (char *)_PyUnicode_AsString(nameobj) |
| 4319 | 977 |
| 978 #define PY3OBJ_DELETED(obj) (obj->ob_base.ob_refcnt<=0) | |
| 979 | |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
980 /////////////////////////////////////////////////////// |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
981 // Internal function prototypes. |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
982 |
| 3951 | 983 static PyObject *Py3Init_vim(void); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
984 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
985 /////////////////////////////////////////////////////// |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
986 // 1. Python interpreter main program. |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
987 |
|
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
|
988 void |
|
7823
bcef391c101c
commit https://github.com/vim/vim/commit/68c2f638e65d914dc6e84eb7ce2624f08af525c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
989 python3_end(void) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
990 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
991 static int recurse = 0; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
992 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
993 // 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
|
994 if (recurse != 0) |
| 2330 | 995 return; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
996 |
|
11631
3b53bb2a0e39
patch 8.0.0698: crash on exit when using Python function in timer.
Christian Brabandt <cb@256bit.org>
parents:
10722
diff
changeset
|
997 python_end_called = TRUE; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
998 ++recurse; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
999 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1000 #ifdef DYNAMIC_PYTHON3 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1001 if (hinstPy3) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1002 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1003 if (Py_IsInitialized()) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1004 { |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1005 // acquire lock before finalizing |
| 4415 | 1006 PyGILState_Ensure(); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1007 |
| 2330 | 1008 Py_Finalize(); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1009 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1010 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1011 --recurse; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1012 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1013 |
|
7158
43ac8dc380c7
commit https://github.com/vim/vim/commit/094454fa708d3297db744f095cd2b7b155a8b6ad
Christian Brabandt <cb@256bit.org>
parents:
6569
diff
changeset
|
1014 #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
|
1015 int |
|
7823
bcef391c101c
commit https://github.com/vim/vim/commit/68c2f638e65d914dc6e84eb7ce2624f08af525c0
Christian Brabandt <cb@256bit.org>
parents:
7803
diff
changeset
|
1016 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
|
1017 { |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
1018 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
|
1019 } |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
1020 #endif |
|
aeea25941392
Temporary solution for crashing when using both :py and :py3: disallow both in
Bram Moolenaar <bram@vim.org>
parents:
2374
diff
changeset
|
1021 |
|
13154
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
1022 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
|
1023 |
|
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
|
1024 #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
|
1025 /* |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1026 * 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
|
1027 */ |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1028 static BOOL |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1029 is_stdin_readable(void) |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1030 { |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1031 DWORD mode, eventnum; |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1032 struct _stat st; |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1033 int fd = fileno(stdin); |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1034 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
|
1035 |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1036 // 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
|
1037 if (GetConsoleMode(hstdin, &mode)) |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1038 // 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
|
1039 return GetNumberOfConsoleInputEvents(hstdin, &eventnum); |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1040 |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1041 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
|
1042 } |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1043 |
|
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1044 // 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
|
1045 // 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
|
1046 // 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
|
1047 // 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
|
1048 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
|
1049 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
|
1050 { |
|
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
|
1051 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
|
1052 FILE *(*pyfreopen)(const char *, const char *, FILE *) = NULL; |
|
27581
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1053 HINSTANCE hinst = hinstPy3; |
|
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
|
1054 |
|
22563
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1055 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
|
1056 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
|
1057 |
|
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
|
1058 // 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
|
1059 // "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
|
1060 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
|
1061 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
|
1062 { |
|
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
|
1063 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
|
1064 "__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
|
1065 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
|
1066 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
|
1067 } |
|
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
|
1068 |
|
22563
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1069 // 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
|
1070 if (pyfreopen != NULL) |
|
22563
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1071 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
|
1072 else |
|
22563
48454576b23c
patch 8.2.1830: MS-Windows: Python3 issue with stdin
Bram Moolenaar <Bram@vim.org>
parents:
22516
diff
changeset
|
1073 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
|
1074 } |
|
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
|
1075 #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
|
1076 # 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
|
1077 #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
|
1078 |
|
27581
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1079 // Python 3.2 or later will abort inside Py_Initialize() when mandatory |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1080 // modules cannot be loaded (e.g. 'pythonthreehome' is wrongly set.). |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1081 // Install a hook to python dll's exit() and recover from it. |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1082 #if defined(MSWIN) && (PY_VERSION_HEX >= 0x030200f0) |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1083 # define HOOK_EXIT |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1084 # include <setjmp.h> |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1085 |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1086 static jmp_buf exit_hook_jump_buf; |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1087 static void *orig_exit = NULL; |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1088 |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1089 /* |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1090 * Function that replaces exit() while calling Py_Initialize(). |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1091 */ |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1092 static void |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1093 hooked_exit(int ret) |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1094 { |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1095 // Recover from exit. |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1096 longjmp(exit_hook_jump_buf, 1); |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1097 } |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1098 |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1099 /* |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1100 * Install a hook to python dll's exit(). |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1101 */ |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1102 static void |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1103 hook_py_exit(void) |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1104 { |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1105 HINSTANCE hinst = hinstPy3; |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1106 |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1107 if (hinst == NULL || orig_exit != NULL) |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1108 return; |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1109 |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1110 orig_exit = hook_dll_import_func(hinst, "exit", (void *)hooked_exit); |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1111 } |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1112 |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1113 /* |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1114 * Remove the hook installed by hook_py_exit(). |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1115 */ |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1116 static void |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1117 restore_py_exit(void) |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1118 { |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1119 HINSTANCE hinst = hinstPy3; |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1120 |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1121 if (hinst == NULL) |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1122 return; |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1123 |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1124 if (orig_exit != NULL) |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1125 hook_dll_import_func(hinst, "exit", orig_exit); |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1126 orig_exit = NULL; |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1127 } |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1128 #endif |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1129 |
|
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
|
1130 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
|
1131 Python3_Init(void) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1132 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1133 if (!py3initialised) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1134 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1135 #ifdef DYNAMIC_PYTHON3 |
| 2330 | 1136 if (!python3_enabled(TRUE)) |
| 1137 { | |
|
26897
d02d40f0261c
patch 8.2.3977: error messages are spread out
Bram Moolenaar <Bram@vim.org>
parents:
26877
diff
changeset
|
1138 emsg(_(e_sorry_this_command_is_disabled_python_library_could_not_be_found)); |
| 2330 | 1139 goto fail; |
| 1140 } | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1141 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1142 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1143 init_structs(); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1144 |
|
13154
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
1145 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
|
1146 { |
|
53cc7ea77c54
patch 8.0.1451: difficult to set the python home directories properly
Christian Brabandt <cb@256bit.org>
parents:
12716
diff
changeset
|
1147 size_t len = mbstowcs(NULL, (char *)p_py3home, 0) + 1; |
| 2641 | 1148 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1149 // 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
|
1150 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
|
1151 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
|
1152 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
|
1153 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
|
1154 } |
| 2641 | 1155 #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
|
1156 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
|
1157 Py_SetPythonHome(PYTHON3_HOME); |
| 2641 | 1158 #endif |
| 1159 | |
| 3863 | 1160 PyImport_AppendInittab("vim", Py3Init_vim); |
| 1161 | |
|
27581
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1162 #if !defined(DYNAMIC_PYTHON3) && defined(MSWIN) |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1163 hinstPy3 = GetModuleHandle(PYTHON3_DLL); |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1164 #endif |
|
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
|
1165 reset_stdin(); |
|
27581
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1166 |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1167 #ifdef HOOK_EXIT |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1168 // Catch exit() called in Py_Initialize(). |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1169 hook_py_exit(); |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1170 if (setjmp(exit_hook_jump_buf) == 0) |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1171 { |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1172 Py_Initialize(); |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1173 restore_py_exit(); |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1174 } |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1175 else |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1176 { |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1177 // exit() was called in Py_Initialize(). |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1178 restore_py_exit(); |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1179 emsg(_(e_critical_error_in_python3_initialization_check_your_installation)); |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1180 goto fail; |
|
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1181 } |
|
31539
a337bd6f7603
patch 9.0.1102: complicated use of #ifdef
Bram Moolenaar <Bram@vim.org>
parents:
31091
diff
changeset
|
1182 #else |
|
a337bd6f7603
patch 9.0.1102: complicated use of #ifdef
Bram Moolenaar <Bram@vim.org>
parents:
31091
diff
changeset
|
1183 Py_Initialize(); |
|
27581
78e3b38b0d33
patch 8.2.4317: MS-Windows: Vim exits when Python 3 initialisation fails
Bram Moolenaar <Bram@vim.org>
parents:
26962
diff
changeset
|
1184 #endif |
|
12716
351cf7c67bbe
patch 8.0.1236: Mac features are confusing
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1185 |
|
22572
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1186 #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
|
1187 // Initialise threads. This is deprecated since Python 3.9. |
| 2877 | 1188 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
|
1189 #endif |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1190 #ifdef DYNAMIC_PYTHON3 |
| 2330 | 1191 get_py3_exceptions(); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1192 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1193 |
| 4494 | 1194 if (PythonIO_Init_io()) |
| 2330 | 1195 goto fail; |
| 1196 | |
| 3618 | 1197 globals = PyModule_GetDict(PyImport_AddModule("__main__")); |
| 1198 | |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1199 // 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
|
1200 // 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
|
1201 // 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
|
1202 // 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
|
1203 // 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
|
1204 // sys.path. |
| 2894 | 1205 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
|
1206 |
|
22572
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1207 // 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
|
1208 // 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
|
1209 // Python code. |
|
0fd4d7548b07
patch 8.2.1834: PyEval_InitThreads() is deprecated in Python 3.9
Bram Moolenaar <Bram@vim.org>
parents:
22563
diff
changeset
|
1210 // 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
|
1211 // 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
|
1212 // _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
|
1213 // 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
|
1214 // save thread state in TLS without deleting thread state |
| 4109 | 1215 PyEval_SaveThread(); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1216 |
| 2330 | 1217 py3initialised = 1; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1218 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1219 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1220 return 0; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1221 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1222 fail: |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1223 // 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
|
1224 // 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
|
1225 // 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
|
1226 // not do anything in this case). |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1227 PythonIO_Flush(); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1228 return -1; |
|
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 |
|
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 * External interface |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1233 */ |
|
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
|
1234 static void |
| 4486 | 1235 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
|
1236 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1237 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
| 2330 | 1238 char *saved_locale; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1239 #endif |
| 2894 | 1240 PyObject *cmdstr; |
| 1241 PyObject *cmdbytes; | |
| 4415 | 1242 PyGILState_STATE pygilstate; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1243 |
|
11631
3b53bb2a0e39
patch 8.0.0698: crash on exit when using Python function in timer.
Christian Brabandt <cb@256bit.org>
parents:
10722
diff
changeset
|
1244 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
|
1245 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
|
1246 |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1247 if (Python3_Init()) |
| 2330 | 1248 goto theend; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1249 |
| 4486 | 1250 init_range(arg); |
| 1251 | |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1252 Python_Release_Vim(); // leave Vim |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1253 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1254 #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
|
1255 // 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
|
1256 saved_locale = setlocale(LC_NUMERIC, NULL); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1257 if (saved_locale == NULL || STRCMP(saved_locale, "C") == 0) |
| 2330 | 1258 saved_locale = NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1259 else |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1260 { |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1261 // Need to make a copy, value may change when setting new locale. |
| 2330 | 1262 saved_locale = (char *)vim_strsave((char_u *)saved_locale); |
| 1263 (void)setlocale(LC_NUMERIC, "C"); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1264 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1265 #endif |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1266 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1267 pygilstate = PyGILState_Ensure(); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1268 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1269 // 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
|
1270 // SyntaxError (unicode error). |
| 2955 | 1271 cmdstr = PyUnicode_Decode(cmd, strlen(cmd), |
|
23264
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
1272 (char *)ENC_OPT, ERRORS_DECODE_ARG); |
|
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
1273 cmdbytes = PyUnicode_AsEncodedString(cmdstr, "utf-8", ERRORS_ENCODE_ARG); |
| 2894 | 1274 Py_XDECREF(cmdstr); |
| 3618 | 1275 |
| 4486 | 1276 run(PyBytes_AsString(cmdbytes), arg, &pygilstate); |
| 2894 | 1277 Py_XDECREF(cmdbytes); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1278 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1279 PyGILState_Release(pygilstate); |
|
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 #if defined(HAVE_LOCALE_H) || defined(X_LOCALE) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1282 if (saved_locale != NULL) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1283 { |
| 2330 | 1284 (void)setlocale(LC_NUMERIC, saved_locale); |
| 1285 vim_free(saved_locale); | |
|
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 #endif |
|
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 Python_Lock_Vim(); // enter Vim |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1290 PythonIO_Flush(); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1291 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1292 theend: |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1293 return; // keeps lint happy |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1294 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1295 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1296 /* |
|
2350
06feaf4fe36a
Rename some "python3" symbols to "py3", as the command name.
Bram Moolenaar <bram@vim.org>
parents:
2342
diff
changeset
|
1297 * ":py3" |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1298 */ |
|
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
|
1299 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
|
1300 ex_py3(exarg_T *eap) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1301 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1302 char_u *script; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1303 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1304 script = script_get(eap, eap->arg); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1305 if (!eap->skip) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1306 { |
|
15888
a83c4b1f8ea2
patch 8.1.0950: using :python sets 'pyxversion' even when not executed
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
1307 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
|
1308 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
|
1309 |
| 4486 | 1310 DoPyCommand(script == NULL ? (char *) eap->arg : (char *) script, |
| 1311 (rangeinitializer) init_range_cmd, | |
| 1312 (runner) run_cmd, | |
| 1313 (void *) eap); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1314 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1315 vim_free(script); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1316 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1317 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1318 #define BUFFER_SIZE 2048 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1319 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1320 /* |
|
2340
99c1eba60b2d
Make automatic prototype generation work with more interfaces.
Bram Moolenaar <bram@vim.org>
parents:
2330
diff
changeset
|
1321 * ":py3file" |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1322 */ |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1323 void |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1324 ex_py3file(exarg_T *eap) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1325 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1326 static char buffer[BUFFER_SIZE]; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1327 const char *file; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1328 char *p; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1329 int i; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1330 |
|
10722
7598ce51bf2a
patch 8.0.0251: not easy to select Python 2 or 3
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1331 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
|
1332 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
|
1333 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1334 // 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
|
1335 // 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
|
1336 // 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
|
1337 // compatible between the two. Yuk. |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1338 // |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1339 // 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
|
1340 // |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1341 // 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
|
1342 // 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
|
1343 // |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1344 // 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
|
1345 // Python won't mangle the file name. |
|
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 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
|
1348 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
|
1349 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1350 for (i=0; i<2; ++i) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1351 { |
| 2330 | 1352 file = (char *)eap->arg; |
| 1353 while (*file && p < buffer + (BUFFER_SIZE - 3)) | |
| 1354 { | |
| 1355 if (*file == '\\' || *file == '\'') | |
| 1356 *p++ = '\\'; | |
| 1357 *p++ = *file++; | |
| 1358 } | |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1359 // If we didn't finish the file name, we hit a buffer overflow |
| 2330 | 1360 if (*file != '\0') |
| 1361 return; | |
| 1362 if (i==0) | |
| 1363 { | |
| 2894 | 1364 strcpy(p,"','rb').read(),'"); |
| 1365 p += 16; | |
| 2330 | 1366 } |
| 1367 else | |
| 1368 { | |
| 1369 strcpy(p,"','exec'))"); | |
| 1370 p += 10; | |
| 1371 } | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1372 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1373 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1374 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1375 // Execute the file |
| 4486 | 1376 DoPyCommand(buffer, |
| 1377 (rangeinitializer) init_range_cmd, | |
| 1378 (runner) run_cmd, | |
| 1379 (void *) eap); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1380 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1381 |
| 4421 | 1382 void |
| 1383 ex_py3do(exarg_T *eap) | |
| 4417 | 1384 { |
|
10722
7598ce51bf2a
patch 8.0.0251: not easy to select Python 2 or 3
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
1385 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
|
1386 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
|
1387 |
| 4486 | 1388 DoPyCommand((char *)eap->arg, |
| 1389 (rangeinitializer)init_range_cmd, | |
| 1390 (runner)run_do, | |
| 1391 (void *)eap); | |
| 4417 | 1392 } |
| 1393 | |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1394 /////////////////////////////////////////////////////// |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1395 // 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
|
1396 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1397 // Implementation functions |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1398 |
|
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
|
1399 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
|
1400 OutputGetattro(PyObject *self, PyObject *nameobj) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1401 { |
| 3826 | 1402 GET_ATTR_STRING(name, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1403 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1404 if (strcmp(name, "softspace") == 0) |
| 2330 | 1405 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
|
1406 else if (strcmp(name, "errors") == 0) |
|
df5f9284fcba
commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
Christian Brabandt <cb@256bit.org>
parents:
8889
diff
changeset
|
1407 return PyString_FromString("strict"); |
|
df5f9284fcba
commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
Christian Brabandt <cb@256bit.org>
parents:
8889
diff
changeset
|
1408 else if (strcmp(name, "encoding") == 0) |
|
df5f9284fcba
commit https://github.com/vim/vim/commit/6d4431e7b675ba7a0194c0b8eb84b7d92e4e7953
Christian Brabandt <cb@256bit.org>
parents:
8889
diff
changeset
|
1409 return PyString_FromString(ENC_OPT); |
|
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 return PyObject_GenericGetAttr(self, nameobj); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1412 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1413 |
|
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
|
1414 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
|
1415 OutputSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1416 { |
| 3826 | 1417 GET_ATTR_STRING(name, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1418 |
| 4488 | 1419 return OutputSetattr((OutputObject *)(self), name, val); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1420 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1421 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1422 /////////////////////////////////////////////////////// |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1423 // 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
|
1424 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1425 // Window type - Implementation functions |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1426 // -------------------------------------- |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1427 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1428 #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
|
1429 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1430 // Buffer type - Implementation functions |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1431 // -------------------------------------- |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1432 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1433 #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
|
1434 |
| 3070 | 1435 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
|
1436 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
|
1437 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1438 // Line range type - Implementation functions |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1439 // -------------------------------------- |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1440 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1441 #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
|
1442 |
| 3070 | 1443 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
|
1444 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
|
1445 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
|
1446 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1447 // Current objects type - Implementation functions |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1448 // ----------------------------------------------- |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1449 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1450 static PySequenceMethods BufferAsSeq = { |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1451 (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
|
1452 (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
|
1453 (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
|
1454 (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
|
1455 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
|
1456 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
|
1457 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
|
1458 0, // sq_contains |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1459 0, // sq_inplace_concat |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1460 0, // sq_inplace_repeat |
|
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 |
| 4319 | 1463 static PyMappingMethods BufferAsMapping = { |
| 2330 | 1464 /* mp_length */ (lenfunc)BufferLength, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1465 /* mp_subscript */ (binaryfunc)BufferSubscript, |
| 2894 | 1466 /* mp_ass_subscript */ (objobjargproc)BufferAsSubscript, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1467 }; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1468 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1469 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1470 // Buffer object |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1471 |
|
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
|
1472 static PyObject * |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1473 BufferGetattro(PyObject *self, PyObject *nameobj) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1474 { |
| 4319 | 1475 PyObject *r; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1476 |
| 3826 | 1477 GET_ATTR_STRING(name, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1478 |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1479 if ((r = BufferAttrValid((BufferObject *)(self), name))) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1480 return r; |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1481 |
| 4319 | 1482 if (CheckBuffer((BufferObject *)(self))) |
| 2330 | 1483 return NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1484 |
| 4319 | 1485 r = BufferAttr((BufferObject *)(self), name); |
| 1486 if (r || PyErr_Occurred()) | |
| 1487 return r; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1488 else |
| 2330 | 1489 return PyObject_GenericGetAttr(self, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1490 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1491 |
|
4589
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1492 static int |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1493 BufferSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1494 { |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1495 GET_ATTR_STRING(name, nameobj); |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1496 |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1497 return BufferSetattr((BufferObject *)(self), name, val); |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1498 } |
|
fa39483a1363
updated for version 7.3.1042
Bram Moolenaar <bram@vim.org>
parents:
4585
diff
changeset
|
1499 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1500 ////////////////// |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1501 |
|
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
|
1502 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
|
1503 BufferSubscript(PyObject *self, PyObject* idx) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1504 { |
| 3618 | 1505 if (PyLong_Check(idx)) |
| 1506 { | |
| 2330 | 1507 long _idx = PyLong_AsLong(idx); |
| 4488 | 1508 return BufferItem((BufferObject *)(self), _idx); |
|
31804
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31702
diff
changeset
|
1509 } |
|
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31702
diff
changeset
|
1510 else if (PySlice_Check(idx)) |
| 3618 | 1511 { |
| 2330 | 1512 Py_ssize_t start, stop, step, slicelen; |
| 1513 | |
| 4387 | 1514 if (CheckBuffer((BufferObject *) self)) |
| 1515 return NULL; | |
| 1516 | |
| 5768 | 1517 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, |
| 4389 | 1518 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, |
| 2330 | 1519 &start, &stop, |
| 3618 | 1520 &step, &slicelen) < 0) |
| 2330 | 1521 return NULL; |
| 4488 | 1522 return BufferSlice((BufferObject *)(self), start, stop); |
| 3618 | 1523 } |
| 1524 else | |
| 1525 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1526 RAISE_INVALID_INDEX_TYPE(idx); |
| 2330 | 1527 return NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1528 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1529 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1530 |
|
22669
3ceb24835183
patch 8.2.1883: compiler warnings when using Python
Bram Moolenaar <Bram@vim.org>
parents:
22572
diff
changeset
|
1531 static int |
| 2894 | 1532 BufferAsSubscript(PyObject *self, PyObject* idx, PyObject* val) |
| 1533 { | |
| 3618 | 1534 if (PyLong_Check(idx)) |
| 1535 { | |
| 2894 | 1536 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
|
1537 |
|
10eb6c38938c
patch 8.2.1146: not enough testing for Python
Bram Moolenaar <Bram@vim.org>
parents:
19846
diff
changeset
|
1538 if (CheckBuffer((BufferObject *) self)) |
|
10eb6c38938c
patch 8.2.1146: not enough testing for Python
Bram Moolenaar <Bram@vim.org>
parents:
19846
diff
changeset
|
1539 return -1; |
|
10eb6c38938c
patch 8.2.1146: not enough testing for Python
Bram Moolenaar <Bram@vim.org>
parents:
19846
diff
changeset
|
1540 |
| 2894 | 1541 return RBAsItem((BufferObject *)(self), n, val, 1, |
| 1542 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, | |
| 1543 NULL); | |
|
31804
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31702
diff
changeset
|
1544 } |
|
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31702
diff
changeset
|
1545 else if (PySlice_Check(idx)) |
| 3618 | 1546 { |
| 2894 | 1547 Py_ssize_t start, stop, step, slicelen; |
| 1548 | |
| 4387 | 1549 if (CheckBuffer((BufferObject *) self)) |
| 1550 return -1; | |
| 1551 | |
| 5768 | 1552 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, |
| 4389 | 1553 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, |
| 2894 | 1554 &start, &stop, |
| 3618 | 1555 &step, &slicelen) < 0) |
| 2894 | 1556 return -1; |
| 1557 return RBAsSlice((BufferObject *)(self), start, stop, val, 1, | |
| 1558 (PyInt)((BufferObject *)(self))->buf->b_ml.ml_line_count, | |
| 1559 NULL); | |
| 3618 | 1560 } |
| 1561 else | |
| 1562 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1563 RAISE_INVALID_INDEX_TYPE(idx); |
| 2894 | 1564 return -1; |
| 1565 } | |
| 1566 } | |
| 1567 | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1568 static PySequenceMethods RangeAsSeq = { |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1569 (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
|
1570 (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
|
1571 (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
|
1572 (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
|
1573 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
|
1574 (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
|
1575 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
|
1576 0, // sq_contains |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1577 0, // sq_inplace_concat |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1578 0, // sq_inplace_repeat |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1579 }; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1580 |
| 4319 | 1581 static PyMappingMethods RangeAsMapping = { |
| 2330 | 1582 /* mp_length */ (lenfunc)RangeLength, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1583 /* mp_subscript */ (binaryfunc)RangeSubscript, |
| 3070 | 1584 /* mp_ass_subscript */ (objobjargproc)RangeAsSubscript, |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1585 }; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1586 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1587 // Line range object - Implementation |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1588 |
|
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
|
1589 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
|
1590 RangeGetattro(PyObject *self, PyObject *nameobj) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1591 { |
| 3826 | 1592 GET_ATTR_STRING(name, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1593 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1594 if (strcmp(name, "start") == 0) |
| 2330 | 1595 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
|
1596 else if (strcmp(name, "end") == 0) |
| 2330 | 1597 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
|
1598 else |
| 2330 | 1599 return PyObject_GenericGetAttr(self, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1600 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1601 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1602 //////////////// |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1603 |
|
22669
3ceb24835183
patch 8.2.1883: compiler warnings when using Python
Bram Moolenaar <Bram@vim.org>
parents:
22572
diff
changeset
|
1604 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
|
1605 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
|
1606 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1607 return RBAsItem(((RangeObject *)(self))->buf, n, val, |
| 2330 | 1608 ((RangeObject *)(self))->start, |
| 1609 ((RangeObject *)(self))->end, | |
| 1610 &((RangeObject *)(self))->end); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1611 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1612 |
| 3070 | 1613 static Py_ssize_t |
| 1614 RangeAsSlice(PyObject *self, Py_ssize_t lo, Py_ssize_t hi, PyObject *val) | |
| 1615 { | |
| 1616 return RBAsSlice(((RangeObject *)(self))->buf, lo, hi, val, | |
| 1617 ((RangeObject *)(self))->start, | |
| 1618 ((RangeObject *)(self))->end, | |
| 1619 &((RangeObject *)(self))->end); | |
| 1620 } | |
| 1621 | |
|
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
|
1622 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
|
1623 RangeSubscript(PyObject *self, PyObject* idx) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1624 { |
| 3618 | 1625 if (PyLong_Check(idx)) |
| 1626 { | |
| 2330 | 1627 long _idx = PyLong_AsLong(idx); |
| 4488 | 1628 return RangeItem((RangeObject *)(self), _idx); |
|
31804
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31702
diff
changeset
|
1629 } |
|
50555279168b
patch 9.0.1234: the code style has to be checked manually
Bram Moolenaar <Bram@vim.org>
parents:
31702
diff
changeset
|
1630 else if (PySlice_Check(idx)) |
| 3618 | 1631 { |
| 2330 | 1632 Py_ssize_t start, stop, step, slicelen; |
| 1633 | |
| 5768 | 1634 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, |
| 2330 | 1635 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, |
| 1636 &start, &stop, | |
| 3618 | 1637 &step, &slicelen) < 0) |
| 2330 | 1638 return NULL; |
| 4488 | 1639 return RangeSlice((RangeObject *)(self), start, stop); |
| 3618 | 1640 } |
| 1641 else | |
| 1642 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1643 RAISE_INVALID_INDEX_TYPE(idx); |
| 2330 | 1644 return NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1645 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1646 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1647 |
|
22669
3ceb24835183
patch 8.2.1883: compiler warnings when using Python
Bram Moolenaar <Bram@vim.org>
parents:
22572
diff
changeset
|
1648 static int |
| 3070 | 1649 RangeAsSubscript(PyObject *self, PyObject *idx, PyObject *val) |
| 1650 { | |
| 3618 | 1651 if (PyLong_Check(idx)) |
| 1652 { | |
| 3070 | 1653 long n = PyLong_AsLong(idx); |
| 1654 return RangeAsItem(self, n, val); | |
|
16162
cd5c83115ec6
patch 8.1.1086: too many curly braces
Bram Moolenaar <Bram@vim.org>
parents:
16032
diff
changeset
|
1655 } |
|
cd5c83115ec6
patch 8.1.1086: too many curly braces
Bram Moolenaar <Bram@vim.org>
parents:
16032
diff
changeset
|
1656 else if (PySlice_Check(idx)) |
| 3618 | 1657 { |
| 3070 | 1658 Py_ssize_t start, stop, step, slicelen; |
| 1659 | |
| 5768 | 1660 if (PySlice_GetIndicesEx((PySliceObject_T *)idx, |
| 3070 | 1661 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, |
| 1662 &start, &stop, | |
| 3618 | 1663 &step, &slicelen) < 0) |
| 3070 | 1664 return -1; |
| 1665 return RangeAsSlice(self, start, stop, val); | |
| 3618 | 1666 } |
| 1667 else | |
| 1668 { | |
|
4970
f5c822e5a0eb
updated for version 7.3.1230
Bram Moolenaar <bram@vim.org>
parents:
4968
diff
changeset
|
1669 RAISE_INVALID_INDEX_TYPE(idx); |
| 3070 | 1670 return -1; |
| 1671 } | |
| 1672 } | |
| 1673 | |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1674 // TabPage object - Implementation |
| 4401 | 1675 |
| 1676 static PyObject * | |
| 1677 TabPageGetattro(PyObject *self, PyObject *nameobj) | |
| 1678 { | |
| 1679 PyObject *r; | |
| 1680 | |
| 1681 GET_ATTR_STRING(name, nameobj); | |
| 1682 | |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1683 if ((r = TabPageAttrValid((TabPageObject *)(self), name))) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1684 return r; |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1685 |
| 4401 | 1686 if (CheckTabPage((TabPageObject *)(self))) |
| 1687 return NULL; | |
| 1688 | |
| 1689 r = TabPageAttr((TabPageObject *)(self), name); | |
| 1690 if (r || PyErr_Occurred()) | |
| 1691 return r; | |
| 1692 else | |
| 1693 return PyObject_GenericGetAttr(self, nameobj); | |
| 1694 } | |
| 1695 | |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1696 // Window object - Implementation |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1697 |
|
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
|
1698 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
|
1699 WindowGetattro(PyObject *self, PyObject *nameobj) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1700 { |
| 4319 | 1701 PyObject *r; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1702 |
| 3826 | 1703 GET_ATTR_STRING(name, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1704 |
|
4593
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1705 if ((r = WindowAttrValid((WindowObject *)(self), name))) |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1706 return r; |
|
0cf552b325b5
updated for version 7.3.1044
Bram Moolenaar <bram@vim.org>
parents:
4589
diff
changeset
|
1707 |
| 4319 | 1708 if (CheckWindow((WindowObject *)(self))) |
| 2330 | 1709 return NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1710 |
| 4319 | 1711 r = WindowAttr((WindowObject *)(self), name); |
| 1712 if (r || PyErr_Occurred()) | |
| 1713 return r; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1714 else |
| 2330 | 1715 return PyObject_GenericGetAttr(self, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1716 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1717 |
|
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
|
1718 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
|
1719 WindowSetattro(PyObject *self, PyObject *nameobj, PyObject *val) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1720 { |
| 3826 | 1721 GET_ATTR_STRING(name, nameobj); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1722 |
| 4488 | 1723 return WindowSetattr((WindowObject *)(self), name, val); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1724 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1725 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1726 // Tab page list object - Definitions |
| 4401 | 1727 |
| 1728 static PySequenceMethods TabListAsSeq = { | |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1729 (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
|
1730 (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
|
1731 (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
|
1732 (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
|
1733 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
|
1734 (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
|
1735 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
|
1736 0, // sq_contains |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1737 0, // sq_inplace_concat |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1738 0, // sq_inplace_repeat |
| 4401 | 1739 }; |
| 1740 | |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1741 // Window list object - Definitions |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1742 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1743 static PySequenceMethods WinListAsSeq = { |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1744 (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
|
1745 (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
|
1746 (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
|
1747 (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
|
1748 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
|
1749 (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
|
1750 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
|
1751 0, // sq_contains |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1752 0, // sq_inplace_concat |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1753 0, // sq_inplace_repeat |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1754 }; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1755 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1756 /* |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1757 * Current items object - Implementation |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1758 */ |
|
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
|
1759 static PyObject * |
| 4319 | 1760 CurrentGetattro(PyObject *self, PyObject *nameobj) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1761 { |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1762 PyObject *r; |
| 3826 | 1763 GET_ATTR_STRING(name, nameobj); |
|
4599
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1764 if (!(r = CurrentGetattr(self, name))) |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1765 return PyObject_GenericGetAttr(self, nameobj); |
|
89bec74fd793
updated for version 7.3.1047
Bram Moolenaar <bram@vim.org>
parents:
4593
diff
changeset
|
1766 return r; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1767 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1768 |
|
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
|
1769 static int |
| 4319 | 1770 CurrentSetattro(PyObject *self, PyObject *nameobj, PyObject *value) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1771 { |
| 4319 | 1772 GET_ATTR_STRING(name, nameobj); |
| 1773 return CurrentSetattr(self, name, value); | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1774 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1775 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1776 // Dictionary object - Definitions |
| 3618 | 1777 |
| 3828 | 1778 static PyObject * |
| 1779 DictionaryGetattro(PyObject *self, PyObject *nameobj) | |
| 1780 { | |
| 1781 DictionaryObject *this = ((DictionaryObject *) (self)); | |
| 1782 | |
| 1783 GET_ATTR_STRING(name, nameobj); | |
| 1784 | |
| 1785 if (strcmp(name, "locked") == 0) | |
| 1786 return PyLong_FromLong(this->dict->dv_lock); | |
| 1787 else if (strcmp(name, "scope") == 0) | |
| 1788 return PyLong_FromLong(this->dict->dv_scope); | |
| 1789 | |
| 1790 return PyObject_GenericGetAttr(self, nameobj); | |
| 1791 } | |
| 1792 | |
| 1793 static int | |
| 1794 DictionarySetattro(PyObject *self, PyObject *nameobj, PyObject *val) | |
| 1795 { | |
| 1796 GET_ATTR_STRING(name, nameobj); | |
| 4488 | 1797 return DictionarySetattr((DictionaryObject *)(self), name, val); |
| 3618 | 1798 } |
| 1799 | |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1800 // List object - Definitions |
| 3618 | 1801 |
| 3828 | 1802 static PyObject * |
| 1803 ListGetattro(PyObject *self, PyObject *nameobj) | |
| 1804 { | |
| 1805 GET_ATTR_STRING(name, nameobj); | |
| 1806 | |
| 1807 if (strcmp(name, "locked") == 0) | |
| 1808 return PyLong_FromLong(((ListObject *) (self))->list->lv_lock); | |
| 1809 | |
| 1810 return PyObject_GenericGetAttr(self, nameobj); | |
| 1811 } | |
| 1812 | |
| 1813 static int | |
| 1814 ListSetattro(PyObject *self, PyObject *nameobj, PyObject *val) | |
| 1815 { | |
| 1816 GET_ATTR_STRING(name, nameobj); | |
| 4488 | 1817 return ListSetattr((ListObject *)(self), name, val); |
| 3618 | 1818 } |
| 1819 | |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1820 // Function object - Definitions |
| 3618 | 1821 |
| 1822 static PyObject * | |
| 1823 FunctionGetattro(PyObject *self, PyObject *nameobj) | |
| 1824 { | |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1825 PyObject *r; |
| 3618 | 1826 FunctionObject *this = (FunctionObject *)(self); |
| 3826 | 1827 |
| 1828 GET_ATTR_STRING(name, nameobj); | |
| 3618 | 1829 |
|
8889
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1830 r = FunctionAttr(this, name); |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1831 if (r || PyErr_Occurred()) |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1832 return r; |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1833 else |
|
8755d57debaa
commit https://github.com/vim/vim/commit/8110a091bc749d8748a20807a724a3af3ca6d509
Christian Brabandt <cb@256bit.org>
parents:
8538
diff
changeset
|
1834 return PyObject_GenericGetAttr(self, nameobj); |
| 3618 | 1835 } |
| 1836 | |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1837 // External interface |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1838 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1839 void |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1840 python3_buffer_free(buf_T *buf) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1841 { |
|
31702
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1842 BufferObject *bp = BUF_PYTHON_REF(buf); |
|
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1843 if (bp == NULL) |
|
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1844 return; |
|
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1845 bp->buf = INVALID_BUFFER_VALUE; |
|
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1846 BUF_PYTHON_REF(buf) = NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1847 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1848 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1849 void |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1850 python3_window_free(win_T *win) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1851 { |
|
31702
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1852 WindowObject *wp = WIN_PYTHON_REF(win); |
|
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1853 if (wp == NULL) |
|
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1854 return; |
|
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1855 wp->win = INVALID_WINDOW_VALUE; |
|
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1856 WIN_PYTHON_REF(win) = NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1857 } |
| 4401 | 1858 |
| 1859 void | |
| 1860 python3_tabpage_free(tabpage_T *tab) | |
| 1861 { | |
|
31702
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1862 TabPageObject *tp = TAB_PYTHON_REF(tab); |
|
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1863 if (tp == NULL) |
|
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1864 return; |
|
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1865 tp->tab = INVALID_TABPAGE_VALUE; |
|
27c9212d10aa
patch 9.0.1183: code is indented more than necessary
Bram Moolenaar <Bram@vim.org>
parents:
31539
diff
changeset
|
1866 TAB_PYTHON_REF(tab) = NULL; |
| 4401 | 1867 } |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1868 |
| 3951 | 1869 static PyObject * |
| 1870 Py3Init_vim(void) | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1871 { |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1872 // 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
|
1873 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
|
1874 |
| 4494 | 1875 if (init_types()) |
| 1876 return NULL; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1877 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1878 // 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
|
1879 PySys_SetArgv(1, argv); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1880 |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1881 if ((vim_module = PyModule_Create(&vimmodule)) == NULL) |
| 2894 | 1882 return NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1883 |
|
4982
39980afcf54a
updated for version 7.3.1236
Bram Moolenaar <bram@vim.org>
parents:
4972
diff
changeset
|
1884 if (populate_module(vim_module)) |
| 2330 | 1885 return NULL; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1886 |
|
4833
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1887 if (init_sys_path()) |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1888 return NULL; |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1889 |
|
70b1178dec79
updated for version 7.3.1163
Bram Moolenaar <bram@vim.org>
parents:
4823
diff
changeset
|
1890 return vim_module; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1891 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1892 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1893 ////////////////////////////////////////////////////////////////////////// |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1894 // 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
|
1895 |
|
18798
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1896 /* |
|
f0f9692d4487
patch 8.1.2387: using old C style comments
Bram Moolenaar <Bram@vim.org>
parents:
18414
diff
changeset
|
1897 * 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
|
1898 * All internal newlines are replaced by null characters. |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1899 * |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1900 * 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
|
1901 */ |
|
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
|
1902 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
|
1903 LineToString(const char *str) |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1904 { |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1905 PyObject *result; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1906 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
|
1907 char *tmp, *p; |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1908 |
|
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
|
1909 tmp = alloc(len + 1); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1910 p = tmp; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1911 if (p == NULL) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1912 { |
| 2330 | 1913 PyErr_NoMemory(); |
| 1914 return NULL; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1915 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1916 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1917 while (*str) |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1918 { |
| 2330 | 1919 if (*str == '\n') |
| 1920 *p = '\0'; | |
| 1921 else | |
| 1922 *p = *str; | |
| 1923 | |
| 1924 ++p; | |
| 1925 ++str; | |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1926 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1927 *p = '\0'; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1928 |
|
23264
f9526a3c9bbf
patch 8.2.2178: Python 3: non-utf8 character cannot be handled
Bram Moolenaar <Bram@vim.org>
parents:
22669
diff
changeset
|
1929 result = PyUnicode_Decode(tmp, len, (char *)ENC_OPT, ERRORS_DECODE_ARG); |
|
2329
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1930 |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1931 vim_free(tmp); |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1932 return result; |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1933 } |
|
ad2889f48843
Added support for Python 3. (Roland Puntaier)
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1934 |
| 3618 | 1935 void |
|
16032
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1936 do_py3eval(char_u *str, typval_T *rettv) |
| 3618 | 1937 { |
| 4486 | 1938 DoPyCommand((char *) str, |
| 1939 (rangeinitializer) init_range_eval, | |
| 1940 (runner) run_eval, | |
| 1941 (void *) rettv); | |
|
16032
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1942 if (rettv->v_type == VAR_UNKNOWN) |
| 3618 | 1943 { |
|
16032
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1944 rettv->v_type = VAR_NUMBER; |
|
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1945 rettv->vval.v_number = 0; |
| 3618 | 1946 } |
| 1947 } | |
| 1948 | |
| 6565 | 1949 int |
|
16032
831f9e74eded
patch 8.1.1021: pyeval() and py3eval() leak memory
Bram Moolenaar <Bram@vim.org>
parents:
16030
diff
changeset
|
1950 set_ref_in_python3(int copyID) |
| 3618 | 1951 { |
| 6569 | 1952 return set_ref_in_py(copyID); |
| 3618 | 1953 } |