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

@@ ... / @@ -202,66 +202,67 @@ class Balance(Mapping[str, data.Amount]): @@
     def le_zero(self) -> bool:
         """Returns true if all amounts in the balance <= 0, within tolerance."""
         op_func = operator.lt if self.tolerance else operator.le
         return self._all_amounts(op_func, self.tolerance)
     def format(self,
                fmt: Optional[str]='#,##0.00 ¤¤',
                sep: str=', ',
                empty: str="Zero balance",
                zero: Optional[str]=None,
                tolerance: Optional[Decimal]=None,
     ) -> str:
         """Formats the balance as a string with the given parameters
         If the balance is completely empty, return ``empty``.
         If the balance is zero (within tolerance) and ``zero`` is specified,
         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]):
     """Collect and query related postings
     This class provides common functionality for collecting related postings
     and running queries on them: iterating over them, tallying their balance,
     etc.
     This class doesn't know anything about how the postings are related. That's
     entirely up to the caller.
     A common pattern is to use this class with collections.defaultdict
     to organize postings based on some key. See the group_by_meta classmethod
     for an example.
     """
     __slots__ = ('_postings',)
     def __init__(self,

tests/test_reports_balance.py

➞

Show inline comments

@@ ... / @@ -390,68 +390,69 @@ def test_clean_copy_arg(tolerance): @@
 @pytest.mark.parametrize('mapping,expected', DEFAULT_STRINGS)
 def test_str(mapping, expected):
     balance = core.Balance(amounts_from_map(mapping))
     assert str(balance) == expected
 @pytest.mark.parametrize('mapping,expected', DEFAULT_STRINGS)
 def test_format_defaults(mapping, expected):
     balance = core.Balance(amounts_from_map(mapping))
     assert balance.format() == expected
 @pytest.mark.parametrize('fmt,expected', [
     ('¤##0.0', '¥5000, -€1500.00'),
     ('#,##0.0¤¤', '5,000JPY, -1,500.00EUR'),
     ('¤+##0.0;¤-##0.0', '¥+5000, €-1500.00'),
     ('#,##0.0 ¤¤;(#,##0.0 ¤¤)', '5,000 JPY, (1,500.00 EUR)'),
 ])
 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):
     zero_amt = testutil.Amount(0, currency)
     nonzero_amt = testutil.Amount(9, currency)
     zero_bal = core.Balance([zero_amt])
     nonzero_bal = core.Balance([nonzero_amt])
     expected = nonzero_bal.format(fmt).replace('9', '0')
     assert zero_bal.format(fmt) == expected
 @pytest.mark.parametrize('currency,fmt', testutil.combine_values(
     ['USD', 'JPY', 'BRL'],
     ["N/A", "Zero", "ø"],
 ))
 def test_format_zero_balance_zero_str(currency, fmt):
     zero_amt = testutil.Amount(0, currency)
     zero_bal = core.Balance([zero_amt])
     assert zero_bal.format(zero=fmt) == fmt

0 comments (0 inline, 0 general)