NPO-Accounting/conservancy_beancount Changeset - 01c3b975d811

Changeset - 01c3b975d811

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-04-12 02:26:01
brettcsmith@brettcsmith.org

data: Fix Amount.__new__.

See the comments for background and rationale.

2 files changed with 16 insertions and 6 deletions:

conservancy_beancount/data.py

tests/testutil.py

0 comments (0 inline, 0 general)

conservancy_beancount/data.py

➞

Show inline comments

@@ ... / @@ -129,12 +129,21 @@ class Amount(bc_amount.Amount): @@
     overrides the type declaration accordingly, so the type checker knows
     that our code doesn't have to consider the possibility that number is
     None.
     """
     number: decimal.Decimal
     # beancount.core._Amount is the plain namedtuple.
     # beancore.core.Amount adds instance methods to it.
     # b.c.Amount.__New__ calls `b.c._Amount.__new__`, which confuses type
     # checking. See <https://github.com/python/mypy/issues/1279>.
     # It works fine if you use super(), which is better practice anyway.
     # So we override __new__ just to call _Amount.__new__ this way.
     def __new__(cls, number: decimal.Decimal, currency: str) -> 'Amount':
         return super(bc_amount._Amount, Amount).__new__(cls, number, currency)
 class Metadata(MutableMapping[MetaKey, MetaValue]):
     """Transaction or posting metadata
     This class wraps a Beancount metadata dictionary with additional methods
     for common parsing and query tasks.
@@ ... / @@ -306,13 +315,13 @@ def balance_of(txn: Transaction, @@
     else:
         weights: Sequence[Amount] = [
             bc_convert.get_weight(post) for post in match_posts  # type:ignore[no-untyped-call]
+        ]
         number = sum((wt.number for wt in weights), number)
         currency = weights[0].currency
-    return Amount._make((number, currency))
     return Amount(number, currency)
 @functools.lru_cache()
 def is_opening_balance_txn(txn: Transaction) -> bool:
     opening_equity = balance_of(txn, Account.is_opening_equity)
     if not opening_equity.currency:
         return False

tests/testutil.py

➞

Show inline comments

@@ ... / @@ -71,18 +71,18 @@ def Amount(number, currency='USD'): @@
 def Cost(number, currency='USD', date=FY_MID_DATE, label=None):
     return bc_data.Cost(Decimal(number), currency, date, label)
 def Posting(account, number,
             currency='USD', cost=None, price=None, flag=None,
             **meta):
+            type_=bc_data.Posting, **meta):
     if cost is not None:
         cost = Cost(*cost)
-    if meta is None:
+    if not meta:
         meta = None
-    return bc_data.Posting(
+    return type_(
         account,
         Amount(number, currency),
         cost,
         price,
         flag,
         meta,
@@ ... / @@ -129,14 +129,15 @@ class Transaction: @@
         self.postings = []
         self.meta = {
             'filename': '<test>',
             'lineno': 0,
+        }
         self.meta.update(meta)
         for posting in postings:
             self.add_posting(*posting)
         if postings is not None:
             for posting in postings:
                 self.add_posting(*posting)
     def add_posting(self, arg, *args, **kwargs):
         """Add a posting to this transaction. Use any of these forms:
            txn.add_posting(account, number, …, kwarg=value, …)
            txn.add_posting(account, number, …, posting_kwargs_dict)

0 comments (0 inline, 0 general)