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.

135 lines
4.4 KiB

36 years ago
36 years ago
36 years ago
36 years ago
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r60790 | raymond.hettinger | 2008-02-14 10:32:45 +0100 (Thu, 14 Feb 2008) | 4 lines Add diagnostic message to help figure-out why SocketServer tests occasionally crash when trying to remove a pid that in not in the activechildren list. ........ r60791 | raymond.hettinger | 2008-02-14 11:46:57 +0100 (Thu, 14 Feb 2008) | 1 line Add fixed-point examples to the decimal FAQ ........ r60792 | raymond.hettinger | 2008-02-14 12:01:10 +0100 (Thu, 14 Feb 2008) | 1 line Improve rst markup ........ r60794 | raymond.hettinger | 2008-02-14 12:57:25 +0100 (Thu, 14 Feb 2008) | 1 line Show how to remove exponents. ........ r60795 | raymond.hettinger | 2008-02-14 13:05:42 +0100 (Thu, 14 Feb 2008) | 1 line Fix markup. ........ r60797 | christian.heimes | 2008-02-14 13:47:33 +0100 (Thu, 14 Feb 2008) | 1 line Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. ........ r60798 | raymond.hettinger | 2008-02-14 13:49:37 +0100 (Thu, 14 Feb 2008) | 1 line Simplify moneyfmt() recipe. ........ r60810 | raymond.hettinger | 2008-02-14 20:02:39 +0100 (Thu, 14 Feb 2008) | 1 line Fix markup ........ r60811 | raymond.hettinger | 2008-02-14 20:30:30 +0100 (Thu, 14 Feb 2008) | 1 line No need to register subclass of ABCs. ........ r60814 | thomas.heller | 2008-02-14 22:00:28 +0100 (Thu, 14 Feb 2008) | 1 line Try to correct a markup error that does hide the following paragraph. ........ r60822 | christian.heimes | 2008-02-14 23:40:11 +0100 (Thu, 14 Feb 2008) | 1 line Use a static and interned string for __subclasscheck__ and __instancecheck__ as suggested by Thomas Heller in #2115 ........ r60827 | christian.heimes | 2008-02-15 07:57:08 +0100 (Fri, 15 Feb 2008) | 1 line Fixed repr() and str() of complex numbers. Complex suffered from the same problem as floats but I forgot to test and fix them. ........ r60830 | christian.heimes | 2008-02-15 09:20:11 +0100 (Fri, 15 Feb 2008) | 2 lines Bug #2111: mmap segfaults when trying to write a block opened with PROT_READ Thanks to Thomas Herve for the fix. ........ r60835 | eric.smith | 2008-02-15 13:14:32 +0100 (Fri, 15 Feb 2008) | 1 line In PyNumber_ToBase, changed from an assert to returning an error when PyObject_Index() returns something other than an int or long. It should never be possible to trigger this, as PyObject_Index checks to make sure it returns an int or long. ........ r60837 | skip.montanaro | 2008-02-15 20:03:59 +0100 (Fri, 15 Feb 2008) | 8 lines Two new functions: * place_summary_first copies the regrtest summary to the front of the file making it easier to scan quickly for problems. * count_failures gets the actual count of the number of failing tests, not just a 1 (some failures) or 0 (no failures). ........ r60840 | raymond.hettinger | 2008-02-15 22:21:25 +0100 (Fri, 15 Feb 2008) | 1 line Update example to match the current syntax. ........ r60841 | amaury.forgeotdarc | 2008-02-15 22:22:45 +0100 (Fri, 15 Feb 2008) | 8 lines Issue #2115: __slot__ attributes setting was 10x slower. Also correct a possible crash using ABCs. This change is exactly the same as an optimisation done 5 years ago, but on slot *access*: http://svn.python.org/view?view=rev&rev=28297 ........ r60842 | amaury.forgeotdarc | 2008-02-15 22:27:44 +0100 (Fri, 15 Feb 2008) | 2 lines Temporarily let these tests pass ........ r60843 | kurt.kaiser | 2008-02-15 22:56:36 +0100 (Fri, 15 Feb 2008) | 2 lines ScriptBinding event handlers weren't returning 'break'. Patch 2050, Tal Einat. ........ r60844 | kurt.kaiser | 2008-02-15 23:25:09 +0100 (Fri, 15 Feb 2008) | 4 lines Configured selection highlighting colors were ignored; updating highlighting in the config dialog would cause non-Python files to be colored as if they were Python source; improve use of ColorDelagator. Patch 1334. Tal Einat. ........ r60845 | amaury.forgeotdarc | 2008-02-15 23:44:20 +0100 (Fri, 15 Feb 2008) | 9 lines Re-enable tests, they were failing since gc.collect() clears the various freelists. They still remain fragile. For example, a call to assertEqual currently does not make any allocation (which surprised me at first). But this can change when gc.collect also deletes the numerous "zombie frames" attached to each function. ........
18 years ago
  1. /* Method object interface */
  2. #ifndef Py_METHODOBJECT_H
  3. #define Py_METHODOBJECT_H
  4. #ifdef __cplusplus
  5. extern "C" {
  6. #endif
  7. /* This is about the type 'builtin_function_or_method',
  8. not Python methods in user-defined classes. See classobject.h
  9. for the latter. */
  10. PyAPI_DATA(PyTypeObject) PyCFunction_Type;
  11. #define PyCFunction_Check(op) (Py_TYPE(op) == &PyCFunction_Type)
  12. typedef PyObject *(*PyCFunction)(PyObject *, PyObject *);
  13. typedef PyObject *(*_PyCFunctionFast) (PyObject *, PyObject *const *, Py_ssize_t);
  14. typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *,
  15. PyObject *);
  16. typedef PyObject *(*_PyCFunctionFastWithKeywords) (PyObject *,
  17. PyObject *const *, Py_ssize_t,
  18. PyObject *);
  19. typedef PyObject *(*PyNoArgsFunction)(PyObject *);
  20. PyAPI_FUNC(PyCFunction) PyCFunction_GetFunction(PyObject *);
  21. PyAPI_FUNC(PyObject *) PyCFunction_GetSelf(PyObject *);
  22. PyAPI_FUNC(int) PyCFunction_GetFlags(PyObject *);
  23. /* Macros for direct access to these values. Type checks are *not*
  24. done, so use with care. */
  25. #ifndef Py_LIMITED_API
  26. #define PyCFunction_GET_FUNCTION(func) \
  27. (((PyCFunctionObject *)func) -> m_ml -> ml_meth)
  28. #define PyCFunction_GET_SELF(func) \
  29. (((PyCFunctionObject *)func) -> m_ml -> ml_flags & METH_STATIC ? \
  30. NULL : ((PyCFunctionObject *)func) -> m_self)
  31. #define PyCFunction_GET_FLAGS(func) \
  32. (((PyCFunctionObject *)func) -> m_ml -> ml_flags)
  33. #endif
  34. PyAPI_FUNC(PyObject *) PyCFunction_Call(PyObject *, PyObject *, PyObject *);
  35. #ifndef Py_LIMITED_API
  36. PyAPI_FUNC(PyObject *) _PyCFunction_FastCallDict(PyObject *func,
  37. PyObject *const *args,
  38. Py_ssize_t nargs,
  39. PyObject *kwargs);
  40. PyAPI_FUNC(PyObject *) _PyCFunction_FastCallKeywords(PyObject *func,
  41. PyObject *const *stack,
  42. Py_ssize_t nargs,
  43. PyObject *kwnames);
  44. #endif
  45. struct PyMethodDef {
  46. const char *ml_name; /* The name of the built-in function/method */
  47. PyCFunction ml_meth; /* The C function that implements it */
  48. int ml_flags; /* Combination of METH_xxx flags, which mostly
  49. describe the args expected by the C func */
  50. const char *ml_doc; /* The __doc__ attribute, or NULL */
  51. };
  52. typedef struct PyMethodDef PyMethodDef;
  53. #define PyCFunction_New(ML, SELF) PyCFunction_NewEx((ML), (SELF), NULL)
  54. PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *,
  55. PyObject *);
  56. /* Flag passed to newmethodobject */
  57. /* #define METH_OLDARGS 0x0000 -- unsupported now */
  58. #define METH_VARARGS 0x0001
  59. #define METH_KEYWORDS 0x0002
  60. /* METH_NOARGS and METH_O must not be combined with the flags above. */
  61. #define METH_NOARGS 0x0004
  62. #define METH_O 0x0008
  63. /* METH_CLASS and METH_STATIC are a little different; these control
  64. the construction of methods for a class. These cannot be used for
  65. functions in modules. */
  66. #define METH_CLASS 0x0010
  67. #define METH_STATIC 0x0020
  68. /* METH_COEXIST allows a method to be entered even though a slot has
  69. already filled the entry. When defined, the flag allows a separate
  70. method, "__contains__" for example, to coexist with a defined
  71. slot like sq_contains. */
  72. #define METH_COEXIST 0x0040
  73. #ifndef Py_LIMITED_API
  74. #define METH_FASTCALL 0x0080
  75. #endif
  76. /* This bit is preserved for Stackless Python */
  77. #ifdef STACKLESS
  78. #define METH_STACKLESS 0x0100
  79. #else
  80. #define METH_STACKLESS 0x0000
  81. #endif
  82. #ifndef Py_LIMITED_API
  83. typedef struct {
  84. PyObject_HEAD
  85. PyMethodDef *m_ml; /* Description of the C function to call */
  86. PyObject *m_self; /* Passed as 'self' arg to the C func, can be NULL */
  87. PyObject *m_module; /* The __module__ attribute, can be anything */
  88. PyObject *m_weakreflist; /* List of weak references */
  89. } PyCFunctionObject;
  90. PyAPI_FUNC(PyObject *) _PyMethodDef_RawFastCallDict(
  91. PyMethodDef *method,
  92. PyObject *self,
  93. PyObject *const *args,
  94. Py_ssize_t nargs,
  95. PyObject *kwargs);
  96. PyAPI_FUNC(PyObject *) _PyMethodDef_RawFastCallKeywords(
  97. PyMethodDef *method,
  98. PyObject *self,
  99. PyObject *const *args,
  100. Py_ssize_t nargs,
  101. PyObject *kwnames);
  102. #endif
  103. PyAPI_FUNC(int) PyCFunction_ClearFreeList(void);
  104. #ifndef Py_LIMITED_API
  105. PyAPI_FUNC(void) _PyCFunction_DebugMallocStats(FILE *out);
  106. PyAPI_FUNC(void) _PyMethod_DebugMallocStats(FILE *out);
  107. #endif
  108. #ifdef __cplusplus
  109. }
  110. #endif
  111. #endif /* !Py_METHODOBJECT_H */