Defined macros Py_RETURN_(TRUE|FALSE|NONE) as helper functions for returning

the specified value.  All three Py_INCREF the singleton and then return it.

diff --git a/Include/boolobject.h b/Include/boolobject.h
index e7a4e607960cf6fdfc379c5796fe4c4635397328..7c4939b239616b1cd2fa9b1d7788d9c07d701556 100644 (file)
--- a/Include/boolobject.h
+++ b/Include/boolobject.h
@@ -23,6 +23,10 @@ PyAPI_DATA(PyIntObject) _Py_ZeroStruct, _Py_TrueStruct;
 #define Py_False ((PyObject *) &_Py_ZeroStruct)
 #define Py_True ((PyObject *) &_Py_TrueStruct)
 
+/* Macros for returning Py_True or Py_False, respectively */
+#define Py_RETURN_TRUE Py_INCREF(Py_True); return Py_True;
+#define Py_RETURN_FALSE Py_INCREF(Py_False); return Py_False;
+
 /* Function to return a bool from a C long */
 PyAPI_FUNC(PyObject *) PyBool_FromLong(long);
 

diff --git a/Include/object.h b/Include/object.h
index 252e99c94d5e8d9fdeb5558e96df7d1996f1df65..8fdd4dc94e048ce96079bfd4bf7553a36b8baa38 100644 (file)
--- a/Include/object.h
+++ b/Include/object.h
@@ -633,6 +633,9 @@ Don't forget to apply Py_INCREF() when returning this value!!!
 PyAPI_DATA(PyObject) _Py_NoneStruct; /* Don't use this directly */
 #define Py_None (&_Py_NoneStruct)
 
+/* Macro for returning Py_None from a function */
+#define Py_RETURN_NONE Py_INCREF(Py_None); return Py_None;
+
 /*
 Py_NotImplemented is a singleton used to signal that an operation is
 not implemented for a given type combination.