mirror of
https://github.com/python/cpython.git
synced 2025-08-31 05:58:33 +00:00
Merge of descr-branch back into trunk.
This commit is contained in:
parent
52d55a3926
commit
6d6c1a35e0
57 changed files with 6923 additions and 1309 deletions
|
@ -22,8 +22,8 @@ extern DL_IMPORT(int) PyModule_AddObject(PyObject *, char *, PyObject *);
|
|||
extern DL_IMPORT(int) PyModule_AddIntConstant(PyObject *, char *, long);
|
||||
extern DL_IMPORT(int) PyModule_AddStringConstant(PyObject *, char *, char *);
|
||||
|
||||
#define PYTHON_API_VERSION 1010
|
||||
#define PYTHON_API_STRING "1010"
|
||||
#define PYTHON_API_VERSION 1011
|
||||
#define PYTHON_API_STRING "1011"
|
||||
/* The API version is maintained (independently from the Python version)
|
||||
so we can detect mismatches between the interpreter and dynamically
|
||||
loaded modules. These are diagnosed by an error message but
|
||||
|
@ -37,6 +37,8 @@ extern DL_IMPORT(int) PyModule_AddStringConstant(PyObject *, char *, char *);
|
|||
Please add a line or two to the top of this log for each API
|
||||
version change:
|
||||
|
||||
17-Jul-2001 GvR 1011 Descr-branch, just to be on the safe side
|
||||
|
||||
25-Jan-2001 FLD 1010 Parameters added to PyCode_New() and
|
||||
PyFrame_New(); Python 2.1a2
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue