[PATCH 1 of 7] util.h: Utility macros for handling different Python APIs

Renato Cunha renatoc at gmail.com
Tue Jun 15 17:50:36 CDT 2010


# HG changeset patch
# User Renato Cunha <renatoc at gmail.com>
# Date 1276642196 10800
# Node ID d5069029108e380312638f6ca55df9375bc1e51f
# Parent  744d5b73f77656431d22933b8af7854ac4e7e7e2
util.h: Utility macros for handling different Python APIs.

If we are in py3k, a IS_PY3K symbol is defined. Apart from that, byte strings
use the API defined in Python 2.6+ (_?PyBytes_.*). For Python < 2.6, the bytes
API is defined accordingly for mercurial usage (shameless copy from
bytesobject.h from Python's code). Some macros were backported from 2.6, as
inspired by rPath's pycompat.h.

diff --git a/mercurial/util.h b/mercurial/util.h
new file mode 100644
--- /dev/null
+++ b/mercurial/util.h
@@ -0,0 +1,63 @@
+/*
+ util.h - utility functions for interfacing with the various python APIs.
+
+ This software may be used and distributed according to the terms of
+ the GNU General Public License, incorporated herein by reference.
+*/
+
+#ifndef _HG_UTIL_H_
+#define _HG_UTIL_H_
+
+#if PY_MAJOR_VERSION >= 3
+
+#define IS_PY3K
+#define PyInt_FromLong PyLong_FromLong
+
+#endif /* PY_MAJOR_VERSION */
+
+/* Backports from 2.6 */
+#if PY_VERSION_HEX < 0x02060000
+
+#define Py_TYPE(ob) (ob)->ob_type
+#define Py_SIZE(ob) (ob)->ob_size
+#define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,
+
+/* Shamelessly stolen from bytesobject.h */
+#define PyBytesObject PyStringObject
+#define PyBytes_Type PyString_Type
+
+#define PyBytes_Check PyString_Check
+#define PyBytes_CheckExact PyString_CheckExact
+#define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED
+#define PyBytes_AS_STRING PyString_AS_STRING
+#define PyBytes_GET_SIZE PyString_GET_SIZE
+#define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS
+
+#define PyBytes_FromStringAndSize PyString_FromStringAndSize
+#define PyBytes_FromString PyString_FromString
+#define PyBytes_FromFormatV PyString_FromFormatV
+#define PyBytes_FromFormat PyString_FromFormat
+#define PyBytes_Size PyString_Size
+#define PyBytes_AsString PyString_AsString
+#define PyBytes_Repr PyString_Repr
+#define PyBytes_Concat PyString_Concat
+#define PyBytes_ConcatAndDel PyString_ConcatAndDel
+#define _PyBytes_Resize _PyString_Resize
+#define _PyBytes_Eq _PyString_Eq
+#define PyBytes_Format PyString_Format
+#define _PyBytes_FormatLong _PyString_FormatLong
+#define PyBytes_DecodeEscape PyString_DecodeEscape
+#define _PyBytes_Join _PyString_Join
+#define PyBytes_Decode PyString_Decode
+#define PyBytes_Encode PyString_Encode
+#define PyBytes_AsEncodedObject PyString_AsEncodedObject
+#define PyBytes_AsEncodedString PyString_AsEncodedString
+#define PyBytes_AsDecodedObject PyString_AsDecodedObject
+#define PyBytes_AsDecodedString PyString_AsDecodedString
+#define PyBytes_AsStringAndSize PyString_AsStringAndSize
+#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping
+
+#endif /* PY_VERSION_HEX */
+
+#endif /* _HG_UTIL_H_ */
+


More information about the Mercurial-devel mailing list