diff options
| author | Larry Hastings <larry@hastings.org> | 2010-03-25 00:54:54 +0000 |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2010-03-25 00:54:54 +0000 |
| commit | 3bcff6ed52acaac596725dde0143e343cd4b1116 (patch) | |
| tree | 40ed6cc494b7e7fe3500815384057422a38454ca /Include/datetime.h | |
| parent | 9c50a5d250942586c3f002ec51685c780e11d5e4 (diff) | |
| download | cpython-3bcff6ed52acaac596725dde0143e343cd4b1116.tar.gz | |
Backported PyCapsule from 3.1, and converted most uses of
CObject to PyCapsule.
Diffstat (limited to 'Include/datetime.h')
| -rw-r--r-- | Include/datetime.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/Include/datetime.h b/Include/datetime.h index 490d5ca311..e0172990b1 100644 --- a/Include/datetime.h +++ b/Include/datetime.h @@ -158,6 +158,8 @@ typedef struct { } PyDateTime_CAPI; +#define PyDateTime_CAPSULE_NAME "datetime.datetime_CAPI" + /* "magic" constant used to partially protect against developer mistakes. */ #define DATETIME_API_MAGIC 0x414548d5 @@ -186,15 +188,7 @@ typedef struct { static PyDateTime_CAPI *PyDateTimeAPI = NULL; #define PyDateTime_IMPORT \ - PyDateTimeAPI = (PyDateTime_CAPI*) PyCObject_Import("datetime", \ - "datetime_CAPI") - -/* This macro would be used if PyCObject_ImportEx() was created. -#define PyDateTime_IMPORT \ - PyDateTimeAPI = (PyDateTime_CAPI*) PyCObject_ImportEx("datetime", \ - "datetime_CAPI", \ - DATETIME_API_MAGIC) -*/ + PyDateTimeAPI = (PyDateTime_CAPI *)PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0) /* Macros for type checking when not building the Python core. */ #define PyDate_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateType) |