NPO-Accounting/conservancy_beancount Changeset - e3dceb601c00

Changeset - e3dceb601c00

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Brett Smith - 4 years ago 2020-06-11 14:46:06
brettcsmith@brettcsmith.org

filters: Add iter_unique() function.

3 files changed with 21 insertions and 11 deletions:

conservancy_beancount/filters.py

conservancy_beancount/reports/accrual.py

tests/test_filters.py

0 comments (0 inline, 0 general)

conservancy_beancount/filters.py

➞

Show inline comments

@@ ... / @@ -21,25 +21,31 @@ from beancount.core import data as bc_data @@
 from . import data
 from . import rtutil
 from typing import (
     cast,
     Hashable,
     Iterable,
     Iterator,
     Optional,
     Pattern,
     Set,
     TypeVar,
     Union,
+)
 from .beancount_types import (
     Directive,
     Entries,
     MetaKey,
     MetaValue,
     Transaction,
+)
 # Saying Optional works around <https://github.com/python/mypy/issues/8768>.
 HashT = TypeVar('HashT', bound=Optional[Hashable])
 Postings = Iterable[data.Posting]
 Regexp = Union[str, Pattern]
 def audit_date(entries: Entries) -> Optional[datetime.date]:
     for entry in entries:
         if (isinstance(entry, bc_data.Custom)
@@ ... @@
     This functions yields postings where the *first* rt-id matches the given
     ticket number.
     """
     regexp = rtutil.RT.metadata_regexp(ticket_id, first_link_only=True)
     return filter_meta_match(postings, 'rt-id', regexp)
 def iter_unique(seq: Iterable[HashT]) -> Iterator[HashT]:
     seen: Set[HashT] = set()
     for item in seq:
         if item not in seen:
             seen.add(item)
             yield item
 def remove_opening_balance_txn(entries: Entries) -> Optional[Transaction]:
     """Remove an opening balance transaction from entries returned by Beancount
     Returns the removed transaction if found, or None if not.
     Note that it modifies the ``entries`` argument in-place.

conservancy_beancount/reports/accrual.py

➞

Show inline comments

@@ ... / @@ -204,23 +204,17 @@ class AccrualPostings(core.RelatedPostings): @@
             all_same = False
         else:
             all_same = all(item == item1 for item in items)
         return item1 if all_same else self.INCONSISTENT
     def entities(self, pred: Callable[[data.Posting], bool]=bool) -> Iterator[MetaValue]:
         seen: Set[MetaValue] = set()
         for post in self:
             if pred(post):
                 try:
                     entity = post.meta['entity']
                 except KeyError:
                     pass
                 else:
                     if entity not in seen:
                         yield entity
                         seen.add(entity)
         return filters.iter_unique(
             post.meta['entity']
             for post in self
             if pred(post) and 'entity' in post.meta
+        )
     def first_links(self, key: MetaKey, default: Optional[str]=None) -> Iterator[Optional[str]]:
         return (post.meta.first_link(key, default) for post in self)
     def make_consistent(self) -> Iterator[Tuple[MetaValue, 'AccrualPostings']]:
         account_ok = isinstance(self.account, str)

tests/test_filters.py

➞

Show inline comments

@@ ... / @@ -180,6 +180,9 @@ def test_audit_date(entry): @@
         entries.append(entry)
     actual = filters.audit_date(entries)
     if entry is None:
         assert actual is None
     else:
         assert actual == entry.date
 def test_iter_unique():
     assert list(filters.iter_unique('1213231')) == list('123')

0 comments (0 inline, 0 general)