NPO-Accounting/conservancy_beancount Changeset - e07a47ec8f8b

Changeset - e07a47ec8f8b

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-05-30 02:05:26
brettcsmith@brettcsmith.org

accrual: Use cliutil for better logging and error reporting.

2 files changed with 15 insertions and 17 deletions:

conservancy_beancount/reports/accrual.py

setup.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/accrual.py

➞

Show inline comments

@@ ... / @@ -92,4 +92,5 @@ from beancount.parser import printer as bc_printer @@
 from . import core
 from .. import cliutil
 from .. import config as configmod
 from .. import data
@@ ... / @@ -97,8 +98,10 @@ from .. import filters @@
 from .. import rtutil
 PROGNAME = 'accrual-report'
 PostGroups = Mapping[Optional[MetaValue], core.RelatedPostings]
 RTObject = Mapping[str, str]
-_logger = logging.getLogger('conservancy_beancount.reports.accrual')
+logger = logging.getLogger('conservancy_beancount.reports.accrual')
 class Account(NamedTuple):
@@ ... / @@ -135,5 +138,5 @@ class BaseReport: @@
     def __init__(self, out_file: TextIO) -> None:
         self.out_file = out_file
-        self.logger = _logger.getChild(type(self).__name__)
+        self.logger = logger.getChild(type(self).__name__)
     def _since_last_nonzero(self, posts: core.RelatedPostings) -> core.RelatedPostings:
@@ ... / @@ -350,5 +353,6 @@ def filter_search(postings: Iterable[data.Posting], @@
 def parse_arguments(arglist: Optional[Sequence[str]]=None) -> argparse.Namespace:
     parser = argparse.ArgumentParser()
     parser = argparse.ArgumentParser(prog=PROGNAME)
     cliutil.add_version_argument(parser)
     parser.add_argument(
         '--report-type', '-t',
@@ ... @@
 previous fiscal year).
 """)
     cliutil.add_loglevel_argument(parser)
     parser.add_argument(
         'search',
@@ ... @@
     return args
 def setup_logger(logger: logging.Logger, loglevel: int, stream: TextIO=sys.stderr) -> None:
     formatter = logging.Formatter('%(name)s: %(levelname)s: %(message)s')
     handler = logging.StreamHandler(stream)
     handler.setFormatter(formatter)
     logger.addHandler(handler)
     logger.setLevel(loglevel)
 def main(arglist: Optional[Sequence[str]]=None,
          stdout: TextIO=sys.stdout,
          stderr: TextIO=sys.stderr,
          config: Optional[configmod.Config]=None,
          logger: Optional[logging.Logger]=None,
 ) -> int:
     if logger is None:
         global _logger
         _logger = logger = logging.getLogger('accrual-report')
         setup_logger(_logger, logging.INFO, stderr)
     returncode = 0
     if cliutil.is_main_script():
         global logger
         logger = logging.getLogger(PROGNAME)
         sys.excepthook = cliutil.ExceptHook(logger)
     args = parse_arguments(arglist)
     cliutil.setup_logger(logger, args.loglevel, stderr)
     if config is None:
         config = configmod.Config()
@@ ... / @@ -418,4 +415,5 @@ def main(arglist: Optional[Sequence[str]]=None, @@
     groups = AccrualAccount.filter_paid_accruals(groups) or groups
     meta_errors = consistency_check(groups)
     returncode = 0
     for error in load_errors:
         bc_printer.print_error(error, file=stderr)

setup.py

➞

Show inline comments

@@ ... / @@ -6,5 +6,5 @@ setup( @@
     name='conservancy_beancount',
     description="Plugin, library, and reports for reading Conservancy's books",
-    version='1.0.7',
+    version='1.0.8',
     author='Software Freedom Conservancy',
     author_email='info@sfconservancy.org',

0 comments (0 inline, 0 general)