NPO-Accounting/conservancy_beancount Changeset - 42d2002fda44

Changeset - 42d2002fda44

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-06-21 15:39:31
brettcsmith@brettcsmith.org

reports: Balance.format(None) uses accounting formats.

2 files changed with 7 insertions and 5 deletions:

conservancy_beancount/reports/core.py

tests/test_reports_balance.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/core.py

➞

Show inline comments

@@ ... / @@ -218,34 +218,35 @@ class Balance(Mapping[str, data.Amount]): @@
         return ``zero``.
         Otherwise, return a string with each amount in the balance formatted
         as ``fmt``, separated by ``sep``.
         If you set ``fmt`` to None, amounts will be formatted according to the
         user's locale. The default format is Beancount's input format.
         """
         balance = self.clean_copy(tolerance) or self.copy(tolerance)
         if not balance:
             return empty
         elif zero is not None and balance.is_zero():
             return zero
         else:
             amounts = list(balance.values())
             amounts.sort(key=lambda amt: (-abs(amt.number), amt.currency))
             return sep.join(
                 babel.numbers.format_currency(amt.number, amt.currency, fmt)
                 for amt in amounts
                 babel.numbers.format_currency(
                     amt.number, amt.currency, fmt, format_type='accounting',
                 ) for amt in amounts
+            )
 class MutableBalance(Balance):
     __slots__ = ()
     def __iadd__(self: BalanceType, other: Union[data.Amount, Balance]) -> BalanceType:
         self._add_other(self._currency_map, other)
         return self
     def __isub__(self: BalanceType, other: Union[data.Amount, Balance]) -> BalanceType:
         self._add_other(self._currency_map, -other)
         return self
 class RelatedPostings(Sequence[data.Posting]):

tests/test_reports_balance.py

➞

Show inline comments

@@ ... / @@ -406,36 +406,37 @@ def test_format_defaults(mapping, expected): @@
 def test_format_fmt(fmt, expected):
     amounts = [testutil.Amount(5000, 'JPY'), testutil.Amount(-1500, 'EUR')]
     balance = core.Balance(amounts)
     assert balance.format(fmt) == expected
 @pytest.mark.parametrize('sep', [
     '; ',
     '—',
     '\0',
 ])
 def test_format_sep(sep):
     mapping, expected = DEFAULT_STRINGS[-1]
     expected = expected.replace(', ', sep)
     balance = core.Balance(amounts_from_map(mapping))
     assert balance.format(sep=sep) == expected
 def test_format_none():
     args = (65000, 'BRL')
 @pytest.mark.parametrize('number', [65000, -77000])
 def test_format_none(number):
     args = (number, 'BRL')
     balance = core.Balance([testutil.Amount(*args)])
     expected = babel.numbers.format_currency(*args)
+    expected = babel.numbers.format_currency(*args, format_type='accounting')
     assert balance.format(None) == expected
 @pytest.mark.parametrize('empty', [
     "N/A",
     "Zero",
     "ø",
 ])
 def test_format_empty(empty):
     balance = core.Balance()
     assert balance.format(empty=empty) == empty
 @pytest.mark.parametrize('currency,fmt', itertools.product(
     ['USD', 'JPY', 'BRL'],
     [None, '¤#,##0.00', '###0.00 ¤¤'],
 ))
 def test_format_zero_balance_fmt(currency, fmt):

0 comments (0 inline, 0 general)