Fixes to last checkin

dabrahams · dabrahams · commit 27d335ebe116 · 2002-03-30T02:21:00.000Z
[SVN r13312]
diff --git a/include/boost/python/data_members.hpp b/include/boost/python/data_members.hpp
@@ -91,7 +91,7 @@ objects::function* make_setter(D C::*pm)
             ::boost::bind(
                 &detail::member<D,C,default_call_policies>::set, pm, _1, _2
                 , default_call_policies()))
-        , 1);
+        , 2);
 }
 
 template <class C, class D, class Policies>
@@ -102,7 +102,7 @@ objects::function* make_setter(D C::*pm, Policies const& policies)
             ::boost::bind(
                 &detail::member<D,C,Policies>::set, pm, _1, _2
                 , policies))
-        , 1);
+        , 2);
 }
 
     
diff --git a/src/object/class.cpp b/src/object/class.cpp
@@ -258,14 +258,14 @@ extern "C"
 
 void class_base::add_property(char const* name, ref const& fget)
 {
-    ref property(PyObject_CallFunction((PyObject*)&PyProperty_Type, "sO", fget.get()));
+    ref property(PyObject_CallFunction((PyObject*)&PyProperty_Type, "O", fget.get()));
     if (PyObject_SetAttrString(object().get(), const_cast<char*>(name), property.get()) < 0)
         throw error_already_set();
 }
 
 void class_base::add_property(char const* name, ref const& fget, ref const& fset)
 {
-    ref property(PyObject_CallFunction((PyObject*)&PyProperty_Type, "sOO", fget.get(), fset.get()));
+    ref property(PyObject_CallFunction((PyObject*)&PyProperty_Type, "OO", fget.get(), fset.get()));
     if (PyObject_SetAttrString(object().get(), const_cast<char*>(name), property.get()) < 0)
         throw error_already_set();
 }
diff --git a/test/data_members.py b/test/data_members.py
@@ -4,8 +4,8 @@
 >>> x.x
 42
 >>> try: x.x = 77
->>> except AttributeError: pass
->>> else: print 'no error'
+... except AttributeError: pass
+... else: print 'no error'
 
 >>> y = Y(69)
 >>> y.x

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ objects::function* make_setter(D C::*pm)`
`91`	`91`	`::boost::bind(`
`92`	`92`	`&detail::member<D,C,default_call_policies>::set, pm, _1, _2`
`93`	`93`	`, default_call_policies()))`
`94`		`- , 1);`
	`94`	`+ , 2);`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`template <class C, class D, class Policies>`
`@@ -102,7 +102,7 @@ objects::function* make_setter(D C::*pm, Policies const& policies)`
`102`	`102`	`::boost::bind(`
`103`	`103`	`&detail::member<D,C,Policies>::set, pm, _1, _2`
`104`	`104`	`, policies))`
`105`		`- , 1);`
	`105`	`+ , 2);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -258,14 +258,14 @@ extern "C"`
`258`	`258`
`259`	`259`	`void class_base::add_property(char const* name, ref const& fget)`
`260`	`260`	`{`
`261`		`- ref property(PyObject_CallFunction((PyObject*)&PyProperty_Type, "sO", fget.get()));`
	`261`	`+ ref property(PyObject_CallFunction((PyObject*)&PyProperty_Type, "O", fget.get()));`
`262`	`262`	`if (PyObject_SetAttrString(object().get(), const_cast<char*>(name), property.get()) < 0)`
`263`	`263`	`throw error_already_set();`
`264`	`264`	`}`
`265`	`265`
`266`	`266`	`void class_base::add_property(char const* name, ref const& fget, ref const& fset)`
`267`	`267`	`{`
`268`		`- ref property(PyObject_CallFunction((PyObject*)&PyProperty_Type, "sOO", fget.get(), fset.get()));`
	`268`	`+ ref property(PyObject_CallFunction((PyObject*)&PyProperty_Type, "OO", fget.get(), fset.get()));`
`269`	`269`	`if (PyObject_SetAttrString(object().get(), const_cast<char*>(name), property.get()) < 0)`
`270`	`270`	`throw error_already_set();`
`271`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`>>> x.x`
`5`	`5`	`42`
`6`	`6`	`>>> try: x.x = 77`
`7`		`->>> except AttributeError: pass`
`8`		`->>> else: print 'no error'`
	`7`	`+... except AttributeError: pass`
	`8`	`+... else: print 'no error'`
`9`	`9`
`10`	`10`	`>>> y = Y(69)`
`11`	`11`	`>>> y.x`