diff options
| author | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2010-12-12 21:48:54 +0000 |
|---|---|---|
| committer | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2010-12-21 04:24:36 +0000 |
| commit | cb6b52945b4c114d39613e6a7b35c73762e5045f (patch) | |
| tree | 30fd118d454aa4008174f0aac71fc15023612867 /psycopg/python.h | |
| parent | e182201e6ee8075a88b63c9d8338f833bd2471b0 (diff) | |
| download | psycopg2-cb6b52945b4c114d39613e6a7b35c73762e5045f.tar.gz | |
The library can be compiled with Python 3.
Just compiled! No test run yet and many points to review, marked in the
code.
The patch is largely Martin von Löwis work, simplified after refactoring
in the previous commits and adapted to the new code (as the patch was
originally for Psycopg 2.0.9)
Diffstat (limited to 'psycopg/python.h')
| -rw-r--r-- | psycopg/python.h | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/psycopg/python.h b/psycopg/python.h index b514c2c..8fee7fd 100644 --- a/psycopg/python.h +++ b/psycopg/python.h @@ -74,4 +74,66 @@ #define FORMAT_CODE_SIZE_T "%zu" #endif +/* Abstract from text type. Only supported for ASCII and UTF-8 */ +#if PY_MAJOR_VERSION < 3 +#define Text_Type PyString_Type +#define Text_Check(s) PyString_Check(s) +#define Text_Format(f,a) PyString_Format(f,a) +#define Text_FromUTF8(s) PyString_FromString(s) +#define Text_FromUTF8AndSize(s,n) PyString_FromStringAndSize(s,n) +/* f must contain exactly a %s placeholder */ +#define Text_FromFormatS(f,s) PyString_FromFormat(f, PyString_AsString(s)) +#define Text_S "%s" +#else +#define Text_Type PyUnicode_Type +#define Text_Check(s) PyUnicode_Check(s) +#define Text_Format(f,a) PyUnicode_Format(f,a) +#define Text_FromUTF8(s) PyUnicode_FromString(s) +#define Text_FromUTF8AndSize(s,n) PyUnicode_FromStringAndSize(s,n) +/* f must contain exactly a %U placeholder */ +#define Text_FromFormatS(f,s) PyUnicode_FromFormat(f, s) +#define Text_S "%U" +#endif + +#if PY_MAJOR_VERSION > 2 +#define PyInt_Type PyLong_Type +#define PyInt_AsLong PyLong_AsLong +#define PyInt_FromLong PyLong_FromLong +#define PyInt_FromSsize_t PyLong_FromSsize_t +#define PyString_FromFormat PyUnicode_FromFormat +#define Py_TPFLAGS_HAVE_ITER 0L +#define Py_TPFLAGS_HAVE_RICHCOMPARE 0L +#ifndef PyNumber_Int +#define PyNumber_Int PyNumber_Long +#endif +#endif /* PY_MAJOR_VERSION > 2 */ + +#if PY_MAJOR_VERSION < 3 +/* XXX BytesType -> Bytes_Type */ +#define BytesType PyString_Type +#define Bytes_Check PyString_Check +#define Bytes_AS_STRING PyString_AS_STRING +#define Bytes_GET_SIZE PyString_GET_SIZE +#define Bytes_Size PyString_Size +#define Bytes_AsString PyString_AsString +#define Bytes_AsStringAndSize PyString_AsStringAndSize +#define Bytes_FromStringAndSize PyString_FromStringAndSize +#else +#define BytesType PyBytes_Type +#define Bytes_Check PyBytes_Check +#define Bytes_AS_STRING PyBytes_AS_STRING +#define Bytes_GET_SIZE PyBytes_GET_SIZE +#define Bytes_Size PyBytes_Size +#define Bytes_AsString PyBytes_AsString +#define Bytes_AsStringAndSize PyBytes_AsStringAndSize +#define Bytes_FromStringAndSize PyBytes_FromStringAndSize +#endif + +/* Mangle the module name into the name of the module init function */ +#if PY_MAJOR_VERSION > 2 +#define INIT_MODULE(m) PyInit_ ## m +#else +#define INIT_MODULE(m) init ## m +#endif + #endif /* !defined(PSYCOPG_PYTHON_H) */ |