NPO-Accounting/conservancy_beancount Changeset - 7abc01b1ac35

Changeset - 7abc01b1ac35

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Brett Smith - 4 years ago 2020-12-29 15:53:55
brettcsmith@brettcsmith.org

fund: Bugfix crash when text report has an empty balance.

This mostly happens when a date range includes the opening or closing of a
fund account, because then the reported beginning/ending balance is empty.

3 files changed with 9 insertions and 2 deletions:

conservancy_beancount/reports/fund.py

setup.py

tests/test_reports_fund.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/fund.py

➞

Show inline comments

@@ ... / @@ -280,49 +280,49 @@ class TextReport: @@
             total = self._format_total(fund, account=account)
             if total:
                 yield (account, total)
     def write(self, rows: Iterable[str]) -> None:
         output = [
             line
             for fund in rows
             for line in self._account_balances(fund)
+        ]
         acct_width = max(len(acct_s) for acct_s, _ in output) + 2
         bal_width = max(len(s) for _, bal_s in output for s in bal_s)
         bal_width = max(bal_width, 8)
         line_fmt = f'{{:>{acct_width}}}  {{:>{bal_width}}}'
         print(line_fmt.replace('{:>', '{:^').format("ACCOUNT", "BALANCE"),
               file=self.out_file)
         fund_start = f' balance as of {self.start_date.isoformat()}'
         fund_end = f' balance as of {self.stop_date.isoformat()}'
         for acct_s, bal_seq in output:
             is_end_bal = acct_s.endswith(fund_end)
             if is_end_bal or acct_s.endswith(fund_start):
                 print(line_fmt.format('─' * acct_width, '─' * bal_width),
                       file=self.out_file)
             bal_iter = iter(bal_seq)
             print(line_fmt.format(acct_s, next(bal_iter)), file=self.out_file)
+            print(line_fmt.format(acct_s, next(bal_iter, "—")), file=self.out_file)
             for bal_s in bal_iter:
                 print(line_fmt.format('', bal_s), file=self.out_file)
             if is_end_bal:
                 print(line_fmt.format('═' * acct_width, '═' * bal_width),
                       file=self.out_file)
 class ReportType(enum.Enum):
     TEXT = TextReport
     ODS = ODSReport
     TXT = TEXT
     SPREADSHEET = ODS
     @classmethod
     def from_arg(cls, s: str) -> 'ReportType':
         try:
             return cls[s.upper()]
         except KeyError:
             raise ValueError(f"no report type matches {s!r}") from None
 def parse_arguments(arglist: Optional[Sequence[str]]=None) -> argparse.Namespace:
     parser = argparse.ArgumentParser(prog=PROGNAME)
     cliutil.add_version_argument(parser)

setup.py

➞

Show inline comments

 #!/usr/bin/env python3
 from setuptools import setup
 setup(
     name='conservancy_beancount',
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.14.1',
+    version='1.14.2',
     author='Software Freedom Conservancy',
     author_email='info@sfconservancy.org',
     license='GNU AGPLv3+',
     install_requires=[
         'babel>=2.6',  # Debian:python3-babel
         'beancount>=2.2',  # Debian:beancount
         'GitPython>=2.0',  # Debian:python3-git
         # 1.4.1 crashes when trying to save some documents.
         'odfpy>=1.4.0,!=1.4.1',  # Debian:python3-odf
         'PyYAML>=3.0',  # Debian:python3-yaml
         'regex',  # Debian:python3-regex
         'rt>=2.0',
     ],
     setup_requires=[
         'pytest-mypy',
         'pytest-runner',  # Debian:python3-pytest-runner
     ],
     tests_require=[
         'mypy>=0.770',  # Debian:python3-mypy
         'pytest',  # Debian:python3-pytest
     ],
     packages=[

tests/test_reports_fund.py

➞

Show inline comments

@@ ... / @@ -275,42 +275,49 @@ def run_main(out_type, arglist, config=None): @@
     retcode = fund.main(arglist, output, errors, config)
     output.seek(0)
     return retcode, output, errors
 @pytest.mark.parametrize('project,start_date,stop_date', [
     ('Conservancy', START_DATE, STOP_DATE),
     ('project=Conservancy', MID_DATE, STOP_DATE),
     ('Conservancy', START_DATE, MID_DATE),
     ('Alpha', START_DATE, STOP_DATE),
     ('project=Alpha', MID_DATE, STOP_DATE),
     ('Alpha', START_DATE, MID_DATE),
     ('Bravo', START_DATE, STOP_DATE),
     ('project=Bravo', MID_DATE, STOP_DATE),
     ('Bravo', START_DATE, MID_DATE),
     ('project=Charlie', START_DATE, STOP_DATE),
 ])
 def test_text_report(project, start_date, stop_date):
     retcode, output, errors = run_main(io.StringIO, [
         '-b', start_date.isoformat(), '-e', stop_date.isoformat(), project,
     ])
     assert not errors.getvalue()
     assert retcode == 0
     check_text_report(output, project, start_date, stop_date)
 def test_text_report_empty_balances():
     retcode, output, errors = run_main(io.StringIO, [
         '-t', 'text', '-b', '2018-01-01',
     ])
     assert not errors.getvalue()
     assert retcode == 0
 @pytest.mark.parametrize('start_date,stop_date', [
     (START_DATE, STOP_DATE),
     (MID_DATE, STOP_DATE),
     (START_DATE, MID_DATE),
 ])
 def test_ods_report(start_date, stop_date):
     retcode, output, errors = run_main(io.BytesIO, [
         '--begin', start_date.isoformat(), '--end', stop_date.isoformat(),
     ])
     assert not errors.getvalue()
     assert retcode == 0
     ods = odf.opendocument.load(output)
     check_ods_report(ods, start_date, stop_date)
 def test_main_no_postings(caplog):
     retcode, output, errors = run_main(io.StringIO, ['NonexistentProject'])
     assert retcode == 65
     assert any(log.levelname == 'WARNING' for log in caplog.records)

0 comments (0 inline, 0 general)