Save state before 1.36 merges.

[SVN r47337]

doc/v2/object.html

@@ -655,11 +655,6 @@ namespace boost { namespace python { namespace api
       template <class A0, class A1,...class An>
       object operator()(A0 const&, A1 const&,...An const&) const;
 
-      detail::args_proxy operator* () const; 
-      object operator()(detail::args_proxy const &args) const; 
-      object operator()(detail::args_proxy const &args, 
-                        detail::kwds_proxy const &kwds) const; 
-
       // truth value testing
       //
       typedef unspecified bool_type;
@@ -709,25 +704,6 @@ object operator()(A0 const& a1, A1 const& a2,...An const& aN) const;
       call<object>(object(*static_cast<U*>(this)).ptr(), a1,
       a2,...aN)</dt>
     </dl>
-
-<pre>
-object operator()(detail::args_proxy const &amp;args) const; 
-</pre>
-<dl class="function-semantics">
-  <dt><b>Effects:</b>
-  call object with arguments given by the tuple <varname>args</varname></dt>
-</dl>
-<pre>
-object operator()(detail::args_proxy const &amp;args, 
-                  detail::kwds_proxy const &amp;kwds) const; 
-</pre>
-<dl class="function-semantics">
-  <dt><b>Effects:</b>
-  call object with arguments given by the tuple <varname>args</varname>, and named
-  arguments given by the dictionary <varname>kwds</varname></dt>
-</dl>
-
-
 <pre>
 operator bool_type() const;
 </pre>

include/boost/python/object_core.hpp

@@ -42,12 +42,6 @@
 
 namespace boost { namespace python { 
 
-namespace detail
-{
-  class kwds_proxy; 
-  class args_proxy; 
-} 
-
 namespace converter
 {
   template <class T> struct arg_to_python;
@@ -108,11 +102,6 @@ namespace api
 
 # define BOOST_PP_ITERATION_PARAMS_1 (3, (1, BOOST_PYTHON_MAX_ARITY, <boost/python/object_call.hpp>))
 # include BOOST_PP_ITERATE()
-    
-      detail::args_proxy operator* () const; 
-      object operator()(detail::args_proxy const &args) const; 
-      object operator()(detail::args_proxy const &args, 
-                        detail::kwds_proxy const &kwds) const; 
 
       // truth value testing
       //
@@ -230,11 +219,11 @@ namespace api
       inline object_base(object_base const&);
       inline object_base(PyObject* ptr);
       
-      inline object_base& operator=(object_base const& rhs);
-      inline ~object_base();
+      object_base& operator=(object_base const& rhs);
+      ~object_base();
         
       // Underlying object access -- returns a borrowed reference
-      inline PyObject* ptr() const;
+      PyObject* ptr() const;
       
    private:
       PyObject* m_ptr;
@@ -404,7 +393,7 @@ namespace api
       static PyObject*
       get(T const& x, U)
       {
-          return python::incref(get_managed_object(x, boost::python::tag));
+          return python::incref(get_managed_object(x, tag));
       }
   };
 
@@ -427,62 +416,6 @@ template <class T> struct extract;
 // implementation
 //
 
-namespace detail 
-{
-
-class call_proxy 
-{ 
-public: 
-  call_proxy(object target) : m_target(target) {} 
-  operator object() const { return m_target;} 
- 
- private: 
-    object m_target; 
-}; 
- 
-class kwds_proxy : public call_proxy 
-{ 
-public: 
-  kwds_proxy(object o = object()) : call_proxy(o) {} 
-}; 
-class args_proxy : public call_proxy 
-{ 
-public: 
-  args_proxy(object o) : call_proxy(o) {} 
-  kwds_proxy operator* () const { return kwds_proxy(*this);} 
-}; 
-} 
- 
-template <typename U> 
-detail::args_proxy api::object_operators<U>::operator* () const 
-{ 
-  object_cref2 x = *static_cast<U const*>(this); 
-  return boost::python::detail::args_proxy(x); 
-} 
- 
-template <typename U> 
-object api::object_operators<U>::operator()(detail::args_proxy const &args) const 
-{ 
-  U const& self = *static_cast<U const*>(this); 
-  PyObject *result = PyObject_Call(get_managed_object(self, boost::python::tag), 
-                                   args.operator object().ptr(), 
-                                   0); 
-  return object(boost::python::detail::new_reference(result)); 
- 
-} 
- 
-template <typename U> 
-object api::object_operators<U>::operator()(detail::args_proxy const &args, 
-                                            detail::kwds_proxy const &kwds) const 
-{ 
-  U const& self = *static_cast<U const*>(this); 
-  PyObject *result = PyObject_Call(get_managed_object(self, boost::python::tag), 
-                                   args.operator object().ptr(), 
-                                   kwds.operator object().ptr()); 
-  return object(boost::python::detail::new_reference(result)); 
- 
-}  
-
 inline object::object()
     : object_base(python::incref(Py_None))
 {}

test/object.cpp

@@ -187,11 +187,6 @@ bool check_string_slice()
     return s.slice(2,-1).slice(1,-1)  == "lo, wor";
 }
 
-object test_call(object c, object args, object kwds) 
-{ 
-    return c(*args, **kwds); 
-} 
-
 bool check_binary_operators()
 {
     int y;
@@ -382,7 +377,6 @@ BOOST_PYTHON_MODULE(object_ext)
     def("test_item", test_item);
     def("test_not_item", test_not_item);
 
-    def("test_call", test_call);
     def("check_binary_operators", check_binary_operators);
     def("check_inplace", check_inplace);
     def("check_string_slice", check_string_slice);

test/object.py

@@ -134,12 +134,7 @@
 
         Operators
 
->>> def print_args(*args, **kwds): 
-...     print args, kwds 
->>> test_call(print_args, (0, 1, 2, 3), {'a':'A'}) 
-(0, 1, 2, 3) {'a': 'A'}
-
-
+        
 >>> assert check_binary_operators()
 
 >>> class X: pass