boost/python
2
0
Fork 0
mirror of https://github.com/boostorg/python.git synced 2026-01-24 06:02:14 +00:00
Code Issues Projects Releases Wiki Activity

Comments for hacks to make PyDoc work. Eliminate reinterpret_cast.

Browse Source 
[SVN r27614]
This commit is contained in:
Dave Abrahams
2005-03-12 02:58:42 +00:00
parent c2b5925600
commit 6d24977dd2
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/object/function.cpp
View File

@@ -404,7 +404,7 @@ void function::add_to_namespace(
dict = ((PyClassObject*)ns)->cl_dict;
else if (PyType_Check(ns))
dict = ((PyTypeObject*)ns)->tp_dict;
else
else
dict = PyObject_GetAttrString(ns, "__dict__");
if (dict == 0)
@@ -471,13 +471,18 @@ void function::add_to_namespace(
add_to_namespace(name_space, name_, attribute);
if (doc != 0)
{
object attr_copy(attribute);
if (PyObject_HasAttrString(attr_copy.ptr(), "__doc__") && attr_copy.attr("__doc__")) {
attr_copy.attr("__doc__") += "\n\n";
attr_copy.attr("__doc__") += doc;
// Accumulate documentation
object mutable_attribute(attribute);
if (
PyObject_HasAttrString(mutable_attribute.ptr(), "__doc__")
&& mutable_attribute.attr("__doc__"))
{
mutable_attribute.attr("__doc__") += "\n\n";
mutable_attribute.attr("__doc__") += doc;
}
else
attr_copy.attr("__doc__") = doc;
mutable_attribute.attr("__doc__") = doc;
}
}
@@ -572,16 +577,19 @@ extern "C"
return python::incref(f->name().ptr());
}
// We add a dummy __class__ attribute in order to fool PyDoc into
// treating these as built-in functions and scanning their
// documentation
static PyObject* function_get_class(PyObject* op, void*)
{
return python::incref(reinterpret_cast<PyObject *>(&PyCFunction_Type));
return python::incref(upcast<PyObject>(&PyCFunction_Type));
}
}
static PyGetSetDef function_getsetlist[] = {
{"__name__", (getter)function_get_name, 0 },
{"func_name", (getter)function_get_name, 0 },
{"__class__", (getter)function_get_class, 0 },
{"__class__", (getter)function_get_class, 0 }, // see note above
{"__doc__", (getter)function_get_doc, (setter)function_set_doc},
{"func_doc", (getter)function_get_doc, (setter)function_set_doc},
{NULL} /* Sentinel */