merging current boost/python and libs/python from trunk into release branch

Ralf W. Grosse-Kunstleve · Ralf W. Grosse-Kunstleve · commit f759e9eb0ef2 · 2010-10-18T04:04:52.000Z
[SVN r66066]
diff --git a/example/tutorial/Jamroot b/example/tutorial/Jamroot
@@ -26,6 +26,14 @@ project
 # source files after the colon separated by spaces.
 python-extension hello_ext : hello.cpp ;
 
+# Put the extension and Boost.Python DLL in the current directory, so
+# that running script by hand works.
+install convenient_copy 
+  : hello_ext 
+  : <install-dependencies>on <install-type>SHARED_LIB <install-type>PYTHON_EXTENSION 
+    <location>. 
+  ;
+
 # A little "rule" (function) to clean up the syntax of declaring tests
 # of these extension modules.
 local rule run-test ( test-name : sources + )
diff --git a/include/boost/python/detail/operator_id.hpp b/include/boost/python/detail/operator_id.hpp
@@ -53,6 +53,9 @@ enum operator_id
     op_nonzero,
 #endif
     op_repr
+#if PY_VERSION_HEX >= 0x03000000
+    ,op_truediv
+#endif
 };
 
 }}} // namespace boost::python::detail
diff --git a/include/boost/python/object/function.hpp b/include/boost/python/object/function.hpp
@@ -39,6 +39,8 @@ struct BOOST_PYTHON_DECL function : PyObject
     void doc(object const& x);
     
     object const& name() const;
+
+    object const& get_namespace() const { return m_namespace; }
     
  private: // helper functions
     object signature(bool show_return_type=false) const;
diff --git a/include/boost/python/object/make_instance.hpp b/include/boost/python/object/make_instance.hpp
@@ -10,10 +10,7 @@
 # include <boost/python/converter/registered.hpp>
 # include <boost/python/detail/decref_guard.hpp>
 # include <boost/python/detail/none.hpp>
-# include <boost/type_traits/is_class.hpp>
 # include <boost/type_traits/is_union.hpp>
-# include <boost/mpl/assert.hpp>
-# include <boost/mpl/or.hpp>
 
 namespace boost { namespace python { namespace objects { 
 
diff --git a/include/boost/python/operators.hpp b/include/boost/python/operators.hpp
@@ -212,7 +212,11 @@ namespace self_ns                                       \
 BOOST_PYTHON_BINARY_OPERATOR(add, radd, +)
 BOOST_PYTHON_BINARY_OPERATOR(sub, rsub, -)
 BOOST_PYTHON_BINARY_OPERATOR(mul, rmul, *)
-BOOST_PYTHON_BINARY_OPERATOR(div, rdiv, /)
+#if PY_VERSION_HEX >= 0x03000000
+    BOOST_PYTHON_BINARY_OPERATOR(truediv, rtruediv, /)
+#else
+    BOOST_PYTHON_BINARY_OPERATOR(div, rdiv, /)
+#endif
 BOOST_PYTHON_BINARY_OPERATOR(mod, rmod, %)
 BOOST_PYTHON_BINARY_OPERATOR(lshift, rlshift, <<)
 BOOST_PYTHON_BINARY_OPERATOR(rshift, rrshift, >>)
diff --git a/src/object/function.cpp b/src/object/function.cpp
@@ -670,11 +670,26 @@ extern "C"
     {
         return python::incref(upcast<PyObject>(&PyCFunction_Type));
     }
+
+    static PyObject* function_get_module(PyObject* op, void*)
+    {
+        function* f = downcast<function>(op);
+        object const& ns = f->get_namespace();
+        if (!ns.is_none()) {
+            return python::incref(ns.ptr());
+        }
+        PyErr_SetString(
+            PyExc_AttributeError, const_cast<char*>(
+                "Boost.Python function __module__ unknown."));
+        return 0;
+    }
 }
 
 static PyGetSetDef function_getsetlist[] = {
     {const_cast<char*>("__name__"), (getter)function_get_name, 0, 0, 0 },
     {const_cast<char*>("func_name"), (getter)function_get_name, 0, 0, 0 },
+    {const_cast<char*>("__module__"), (getter)function_get_module, 0, 0, 0 },
+    {const_cast<char*>("func_module"), (getter)function_get_module, 0, 0, 0 },
     {const_cast<char*>("__class__"), (getter)function_get_class, 0, 0, 0 },    // see note above
     {const_cast<char*>("__doc__"), (getter)function_get_doc, (setter)function_set_doc, 0, 0},
     {const_cast<char*>("func_doc"), (getter)function_get_doc, (setter)function_set_doc, 0, 0},
diff --git a/test/pytype_function.py b/test/pytype_function.py
@@ -7,6 +7,11 @@
 >>> print func.__doc__.splitlines()[1]
 func( (A)arg1) -> A :
 
+>>> print func.__module__
+pytype_function_ext
+
+>>> print func.__name__
+func
 """
 def run(args = None):
     import sys
