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