You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

131 lines
4.7 KiB

36 years ago
Merged revisions 60176-60209 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r60178 | georg.brandl | 2008-01-21 22:05:49 +0100 (Mon, 21 Jan 2008) | 2 lines #1715: include sub-extension modules in pydoc text output. ........ r60179 | georg.brandl | 2008-01-21 22:14:21 +0100 (Mon, 21 Jan 2008) | 2 lines Add a "const" to make gcc happy. ........ r60180 | georg.brandl | 2008-01-21 22:19:07 +0100 (Mon, 21 Jan 2008) | 2 lines Add the correct build dir when building with pydebug. ........ r60181 | georg.brandl | 2008-01-21 22:23:15 +0100 (Mon, 21 Jan 2008) | 3 lines Patch #1720595: add T_BOOL to the range of structmember types. Patch by Angelo Mottola, reviewed by MvL, tests by me. ........ r60182 | georg.brandl | 2008-01-21 22:28:32 +0100 (Mon, 21 Jan 2008) | 2 lines Reformat some ugly code. ........ r60187 | brett.cannon | 2008-01-22 00:50:16 +0100 (Tue, 22 Jan 2008) | 4 lines Make's MAKEFLAGS variable is set to a string containing the single-letter arguments to Make. This means there are no hyphens. Fix the '-s' check to silence distutils to now work. ........ r60188 | gregory.p.smith | 2008-01-22 01:19:41 +0100 (Tue, 22 Jan 2008) | 3 lines accepts and closes issue #1221598: adds an optional callback to ftplib.FTP storbinary() and storlines() methods. ........ r60189 | gregory.p.smith | 2008-01-22 02:12:02 +0100 (Tue, 22 Jan 2008) | 2 lines Replace spam.acquire() try: ... finally: spam.release() with "with spam:" ........ r60190 | gregory.p.smith | 2008-01-22 02:20:42 +0100 (Tue, 22 Jan 2008) | 4 lines - Fix Issue #1703448: A joined thread could show up in the threading.enumerate() list after the join() for a brief period until it actually exited. ........ r60193 | georg.brandl | 2008-01-22 08:53:31 +0100 (Tue, 22 Jan 2008) | 2 lines Fix \xhh specs, #1889. ........ r60198 | christian.heimes | 2008-01-22 16:01:25 +0100 (Tue, 22 Jan 2008) | 1 line Fixed a missing (X) in define ........ r60199 | christian.heimes | 2008-01-22 16:25:18 +0100 (Tue, 22 Jan 2008) | 2 lines Don't repeat yourself Added the macros PyModule_AddIntMacro and PyModule_AddStringMacro. They shorten PyModule_AddIntConstant(m, "AF_INET", AF_INET) to PyModule_AddIntMacro(m, AF_INET) ........ r60201 | raymond.hettinger | 2008-01-22 20:51:41 +0100 (Tue, 22 Jan 2008) | 1 line Document when to use izip_longest(). ........ r60202 | georg.brandl | 2008-01-22 20:56:03 +0100 (Tue, 22 Jan 2008) | 2 lines Fix for #1087741 patch. ........ r60203 | raymond.hettinger | 2008-01-22 21:18:53 +0100 (Tue, 22 Jan 2008) | 1 line Give zip() the same guarantee as izip() for left-to-right evaluation. ........ r60204 | raymond.hettinger | 2008-01-22 23:09:26 +0100 (Tue, 22 Jan 2008) | 1 line Improve variable name in sample code ........ r60205 | gregory.p.smith | 2008-01-23 00:15:34 +0100 (Wed, 23 Jan 2008) | 2 lines docstring and comment updates suggested by Giampaolo Rodola' ........ r60207 | raymond.hettinger | 2008-01-23 01:04:40 +0100 (Wed, 23 Jan 2008) | 1 line Let pprint() support sets and frozensets (suggested by David Mertz). ........ r60208 | guido.van.rossum | 2008-01-23 02:18:27 +0100 (Wed, 23 Jan 2008) | 4 lines I'm tired of these tests breaking at Google due to our large number of users and groups in LDAP/NIS. So I'm limiting the extra-heavy part of the tests to passwd/group files with at most 1000 entries. ........
19 years ago
31 years ago
  1. #ifndef Py_MODSUPPORT_H
  2. #define Py_MODSUPPORT_H
  3. #ifdef __cplusplus
  4. extern "C" {
  5. #endif
  6. /* Module support interface */
  7. #include <stdarg.h>
  8. /* If PY_SSIZE_T_CLEAN is defined, each functions treats #-specifier
  9. to mean Py_ssize_t */
  10. #ifdef PY_SSIZE_T_CLEAN
  11. #define PyArg_Parse _PyArg_Parse_SizeT
  12. #define PyArg_ParseTuple _PyArg_ParseTuple_SizeT
  13. #define PyArg_ParseTupleAndKeywords _PyArg_ParseTupleAndKeywords_SizeT
  14. #define PyArg_VaParse _PyArg_VaParse_SizeT
  15. #define PyArg_VaParseTupleAndKeywords _PyArg_VaParseTupleAndKeywords_SizeT
  16. #define Py_BuildValue _Py_BuildValue_SizeT
  17. #define Py_VaBuildValue _Py_VaBuildValue_SizeT
  18. #else
  19. PyAPI_FUNC(PyObject *) _Py_VaBuildValue_SizeT(const char *, va_list);
  20. #endif
  21. /* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */
  22. #if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000
  23. PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...);
  24. PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...);
  25. PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
  26. const char *, char **, ...);
  27. PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *);
  28. PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...);
  29. PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...);
  30. PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...);
  31. #endif
  32. #ifndef Py_LIMITED_API
  33. PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kw);
  34. PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list);
  35. PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *,
  36. const char *, char **, va_list);
  37. #endif
  38. PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list);
  39. PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *);
  40. PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long);
  41. PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *);
  42. #define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c)
  43. #define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c)
  44. #define Py_CLEANUP_SUPPORTED 0x20000
  45. #define PYTHON_API_VERSION 1013
  46. #define PYTHON_API_STRING "1013"
  47. /* The API version is maintained (independently from the Python version)
  48. so we can detect mismatches between the interpreter and dynamically
  49. loaded modules. These are diagnosed by an error message but
  50. the module is still loaded (because the mismatch can only be tested
  51. after loading the module). The error message is intended to
  52. explain the core dump a few seconds later.
  53. The symbol PYTHON_API_STRING defines the same value as a string
  54. literal. *** PLEASE MAKE SURE THE DEFINITIONS MATCH. ***
  55. Please add a line or two to the top of this log for each API
  56. version change:
  57. 22-Feb-2006 MvL 1013 PEP 353 - long indices for sequence lengths
  58. 19-Aug-2002 GvR 1012 Changes to string object struct for
  59. interning changes, saving 3 bytes.
  60. 17-Jul-2001 GvR 1011 Descr-branch, just to be on the safe side
  61. 25-Jan-2001 FLD 1010 Parameters added to PyCode_New() and
  62. PyFrame_New(); Python 2.1a2
  63. 14-Mar-2000 GvR 1009 Unicode API added
  64. 3-Jan-1999 GvR 1007 Decided to change back! (Don't reuse 1008!)
  65. 3-Dec-1998 GvR 1008 Python 1.5.2b1
  66. 18-Jan-1997 GvR 1007 string interning and other speedups
  67. 11-Oct-1996 GvR renamed Py_Ellipses to Py_Ellipsis :-(
  68. 30-Jul-1996 GvR Slice and ellipses syntax added
  69. 23-Jul-1996 GvR For 1.4 -- better safe than sorry this time :-)
  70. 7-Nov-1995 GvR Keyword arguments (should've been done at 1.3 :-( )
  71. 10-Jan-1995 GvR Renamed globals to new naming scheme
  72. 9-Jan-1995 GvR Initial version (incompatible with older API)
  73. */
  74. /* The PYTHON_ABI_VERSION is introduced in PEP 384. For the lifetime of
  75. Python 3, it will stay at the value of 3; changes to the limited API
  76. must be performed in a strictly backwards-compatible manner. */
  77. #define PYTHON_ABI_VERSION 3
  78. #define PYTHON_ABI_STRING "3"
  79. #ifdef Py_TRACE_REFS
  80. /* When we are tracing reference counts, rename PyModule_Create2 so
  81. modules compiled with incompatible settings will generate a
  82. link-time error. */
  83. #define PyModule_Create2 PyModule_Create2TraceRefs
  84. #endif
  85. PyAPI_FUNC(PyObject *) PyModule_Create2(struct PyModuleDef*,
  86. int apiver);
  87. #ifdef Py_LIMITED_API
  88. #define PyModule_Create(module) \
  89. PyModule_Create2(module, PYTHON_ABI_VERSION)
  90. #else
  91. #define PyModule_Create(module) \
  92. PyModule_Create2(module, PYTHON_API_VERSION)
  93. #endif
  94. #ifndef Py_LIMITED_API
  95. PyAPI_DATA(char *) _Py_PackageContext;
  96. #endif
  97. #ifdef __cplusplus
  98. }
  99. #endif
  100. #endif /* !Py_MODSUPPORT_H */