NPO-Accounting/conservancy_beancount Changeset - 87760f6aea28

Changeset - 87760f6aea28

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Brett Smith - 4 years ago 2020-06-05 14:01:36
brettcsmith@brettcsmith.org

accrual: Clean up typing after recent bugfix.

1 file changed with 4 insertions and 3 deletions:

conservancy_beancount/reports/accrual.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/accrual.py

➞

Show inline comments

@@ ... / @@ -200,55 +200,56 @@ class AccrualPostings(core.RelatedPostings): @@
                  source: Iterable[data.Posting]=(),
                  *,
                  _can_own: bool=False,
     ) -> None:
         super().__init__(source, _can_own=_can_own)
         # The following type declarations tell mypy about values set in the for
         # loop that are important enough to be referenced directly elsewhere.
         self.account: Union[data.Account, Sentinel]
         self.invoice: Union[MetaValue, Sentinel]
         for name, get_func in self._FIELDS.items():
             values = frozenset(get_func(post) for post in self)
             setattr(self, f'{name}s', values)
             if len(values) == 1:
                 one_value = next(iter(values))
             else:
                 one_value = self.INCONSISTENT
             setattr(self, name, one_value)
         if self.account is self.INCONSISTENT:
             self.accrual_type: Optional[AccrualAccount] = None
             self.end_balance = self.balance_at_cost()
             self.accrued_entities = self._collect_entities()
             self.paid_entities = self.accrued_entities
         else:
             self.accrual_type = AccrualAccount.classify(self)
             norm_func = self.accrual_type.value.norm_func
             accrual_acct: Account = self.accrual_type.value
             norm_func = accrual_acct.norm_func
             self.end_balance = norm_func(self.balance_at_cost())
             self.accrued_entities = self._collect_entities(
-                lambda post: norm_func(post.units).number > 0,  # type:ignore[no-any-return]
                 lambda post: norm_func(post.units).number > 0,
+            )
             self.paid_entities = self._collect_entities(
-                lambda post: norm_func(post.units).number < 0,  # type:ignore[no-any-return]
                 lambda post: norm_func(post.units).number < 0,
+            )
     def _collect_entities(self,
                           pred: Callable[[data.Posting], bool]=bool,
                           default: str='<empty>',
     ) -> FrozenSet[MetaValue]:
         return frozenset(
             post.meta.get('entity') or default
             for post in self if pred(post)
+        )
     def entities(self) -> Iterator[MetaValue]:
         yield from self.accrued_entities
         yield from self.paid_entities.difference(self.accrued_entities)
     def make_consistent(self) -> Iterator[Tuple[MetaValue, 'AccrualPostings']]:
         account_ok = isinstance(self.account, str)
         # `'/' in self.invoice` is just our heuristic to ensure that the
         # invoice metadata is "unique enough," and not just a placeholder
         # value like "FIXME". It can be refined if needed.
         invoice_ok = isinstance(self.invoice, str) and '/' in self.invoice
         if account_ok and invoice_ok:
             yield (self.invoice, self)
             return

0 comments (0 inline, 0 general)