Merge pull request #330 from eliptus/feature/embedded-python

Improve Embedded Python Support

1 files changed, 25 insertions, 2 deletions

diff --git a/src/py_account.cc b/src/py_account.cc
index 3054512e..7b8eda8c 100644
--- a/src/py_account.cc
+++ b/src/py_account.cc
@@ -35,6 +35,7 @@
 #include "pyutils.h"
 #include "account.h"
 #include "post.h"
+#include "expr.h"
 
 namespace ledger {
 
@@ -97,6 +98,26 @@ namespace {
     return str_to_py_unicode(account.fullname());
   }
 
+  value_t py_amount_0(const account_t& account)
+  {
+      return account.amount();
+  }
+
+  value_t py_amount_1(const account_t& account, const boost::optional<expr_t&>& expr)
+  {
+      return account.amount(expr);
+  }
+
+  value_t py_total_0(const account_t& account)
+  {
+      return account.total();
+  }
+
+  value_t py_total_1(const account_t& account, const boost::optional<expr_t&>& expr)
+  {
+      return account.total(expr);
+  }
+
 } // unnamed namespace
 
 void export_account()
@@ -221,8 +242,10 @@ void export_account()
     .def("xdata", py_xdata,
          return_internal_reference<>())
 
-    .def("amount", &account_t::amount)
-    .def("total", &account_t::total)
+    .def("amount", py_amount_0)
+    .def("amount", py_amount_1, args("expr"))
+    .def("total", py_total_0)
+    .def("total", py_total_1, args("expr"))
 
     .def("self_details", &account_t::self_details,
          return_internal_reference<>())