Mercurial > vim

annotate src/if_python3.c @ 25058:2bf78a07dd43

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