NPO-Accounting/conservancy_beancount Changeset - 18800b249d2c

Changeset - 18800b249d2c

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 4 years ago 2020-05-17 18:52:23
brettcsmith@brettcsmith.org

config: Let user specify books dir with ~.

2 files changed with 6 insertions and 1 deletions:

conservancy_beancount/config.py

tests/test_config.py

0 comments (0 inline, 0 general)

conservancy_beancount/config.py

➞

Show inline comments

@@ ... / @@ -117,13 +117,13 @@ class Config: @@
             return None
         else:
             return books.Loader(books_path, self.fiscal_year_begin())
     def books_path(self) -> Optional[Path]:
         try:
-            retval = Path(self.file_config['Beancount'].get('books dir'))
+            retval = Path(self.file_config['Beancount']['books dir']).expanduser()
         except (KeyError, ValueError):
             ok = False
         else:
             ok = retval.is_absolute()
         return retval if ok else None

tests/test_config.py

➞

Show inline comments

@@ ... / @@ -351,12 +351,17 @@ def test_load_file_error(tmp_path, path_func): @@
         config.load_file(config_path)
 def test_no_books_path():
     config = config_mod.Config()
     assert config.books_path() is None
 def test_books_path_expands_user():
     config = config_mod.Config()
     config.load_string('[Beancount]\nbooks dir = ~/userbooks\n')
     assert config.books_path() == (Path.home() / 'userbooks')
 @pytest.mark.parametrize('value,month,day', [
     ('2', 2, 1),
     ('3 ', 3, 1),
     ('  4', 4, 1),
     (' 5 ', 5, 1),
     ('6 1', 6, 1),

0 comments (0 inline, 0 general)