sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed an internal reference issue with Python

Browse source
This commit is contained in:
John Wiegley 2009-11-14 06:11:45 -05:00
parent d12c7e08c6
commit 3bec708e38
2 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/py_journal.cc
View file

@ -230,15 +230,18 @@ void export_journal()
class_< collect_posts, bases<item_handler<post_t> >, class_< collect_posts, bases<item_handler<post_t> >,
shared_ptr<collect_posts>, boost::noncopyable >("PostCollector") shared_ptr<collect_posts>, boost::noncopyable >("PostCollector")
.def("__len__", &collect_posts::length) .def("__len__", &collect_posts::length)
.def("__iter__", range<return_internal_reference<> > .def("__iter__", range<return_internal_reference<1,
with_custodian_and_ward_postcall<1, 0> > >
(&collect_posts::begin, &collect_posts::end)) (&collect_posts::begin, &collect_posts::end))
; ;
class_< collector_wrapper, shared_ptr<collector_wrapper>, class_< collector_wrapper, shared_ptr<collector_wrapper>,
boost::noncopyable >("PostCollectorWrapper", no_init) boost::noncopyable >("PostCollectorWrapper", no_init)
.def("__len__", &collector_wrapper::length) .def("__len__", &collector_wrapper::length)
.def("__getitem__", posts_getitem, return_internal_reference<>()) .def("__getitem__", posts_getitem, return_internal_reference<1,
.def("__iter__", range<return_internal_reference<> > with_custodian_and_ward_postcall<0, 1> >())
.def("__iter__", range<return_value_policy<reference_existing_object,
with_custodian_and_ward_postcall<0, 1> > >
(&collector_wrapper::begin, &collector_wrapper::end)) (&collector_wrapper::begin, &collector_wrapper::end))
; ;
@ -263,30 +266,43 @@ void export_journal()
.def(init<path>()) .def(init<path>())
.def(init<string>()) .def(init<string>())
.add_property("master", make_getter(&journal_t::master, .add_property("master",
return_internal_reference<>())) make_getter(&journal_t::master,
return_internal_reference<1,
with_custodian_and_ward_postcall<1, 0> >()))
.add_property("bucket", .add_property("bucket",
make_getter(&journal_t::bucket, make_getter(&journal_t::bucket,
return_internal_reference<>()), return_internal_reference<1,
with_custodian_and_ward_postcall<1, 0> >()),
make_setter(&journal_t::bucket)) make_setter(&journal_t::bucket))
.add_property("was_loaded", make_getter(&journal_t::was_loaded)) .add_property("was_loaded", make_getter(&journal_t::was_loaded))
.add_property("commodity_pool", .add_property("commodity_pool",
make_getter(&journal_t::commodity_pool, make_getter(&journal_t::commodity_pool,
return_internal_reference<>())) return_internal_reference<1,
with_custodian_and_ward_postcall<1, 0> >()))
.def("add_account", &journal_t::add_account) .def("add_account", &journal_t::add_account)
.def("remove_account", &journal_t::remove_account) .def("remove_account", &journal_t::remove_account)
.def("find_account", py_find_account_1, return_internal_reference<>()) .def("find_account", py_find_account_1,
.def("find_account", py_find_account_2, return_internal_reference<>()) return_internal_reference<1,
with_custodian_and_ward_postcall<0, 1> >())
.def("find_account", py_find_account_2,
return_internal_reference<1,
with_custodian_and_ward_postcall<0, 1> >())
.def("find_account_re", &journal_t::find_account_re, .def("find_account_re", &journal_t::find_account_re,
return_internal_reference<>()) return_internal_reference<1,
with_custodian_and_ward_postcall<0, 1> >())
.def("add_xact", &journal_t::add_xact) .def("add_xact", &journal_t::add_xact)
.def("remove_xact", &journal_t::remove_xact) .def("remove_xact", &journal_t::remove_xact)
.def("__len__", xacts_len) .def("__len__", xacts_len)
.def("__getitem__", xacts_getitem, return_internal_reference<>()) #if 0
.def("__getitem__", xacts_getitem,
return_internal_reference<1,
with_custodian_and_ward_postcall<0, 1> >())
#endif
.def("__iter__", range<return_internal_reference<> > .def("__iter__", range<return_internal_reference<> >
(&journal_t::xacts_begin, &journal_t::xacts_end)) (&journal_t::xacts_begin, &journal_t::xacts_end))
@ -304,7 +320,7 @@ void export_journal()
.def("has_xdata", &journal_t::has_xdata) .def("has_xdata", &journal_t::has_xdata)
.def("clear_xdata", &journal_t::clear_xdata) .def("clear_xdata", &journal_t::clear_xdata)
.def("collect", py_collect) .def("collect", py_collect, with_custodian_and_ward_postcall<0, 1>())
.def("valid", &journal_t::valid) .def("valid", &journal_t::valid)
; ;

2
src/py_post.cc
View file

@ -116,7 +116,7 @@ void export_post()
make_setter(&post_t::xdata_t::datetime)) make_setter(&post_t::xdata_t::datetime))
.add_property("account", .add_property("account",
make_getter(&post_t::xdata_t::account, make_getter(&post_t::xdata_t::account,
return_internal_reference<>()), return_value_policy<reference_existing_object>()),
make_setter(&post_t::xdata_t::account, make_setter(&post_t::xdata_t::account,
with_custodian_and_ward<1, 2>())) with_custodian_and_ward<1, 2>()))
.add_property("sort_values", .add_property("sort_values",