NPO-Accounting/conservancy_beancount Changeset - 9e33b2795ca5

Changeset - 9e33b2795ca5

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Brett Smith - 3 years ago 2021-03-10 15:37:21
brettcsmith@brettcsmith.org

config: Add RTCredentials.idstr() method.

Want to reuse this code for a query-report cache key.

2 files changed with 25 insertions and 5 deletions:

conservancy_beancount/config.py

tests/test_config.py

0 comments (0 inline, 0 general)

conservancy_beancount/config.py

➞

Show inline comments

@@ ... / @@ -65,6 +65,18 @@ class RTCredentials(NamedTuple): @@
         else:
             return cls(**values)
     def idstr(self) -> str:
         """Return a string unique to these credentials
         This returns a string that incorporates the server URL and user.
         The string will be unique across different credentials.
         It's suitable for use as a cache key or filename.
         """
         return '{}@{}'.format(
             self.user or '',
             urlparse.quote(self.server or '', ''),
+        )
 class Config:
     _ENVIRON_DEFAULT_PATHS = {
@@ ... / @@ -209,11 +221,7 @@ class Config: @@
         if cache_dir_path is None:
             cache_db = None
         else:
             cache_name = '{}@{}.sqlite3'.format(
                 credentials.user,
                 urlparse.quote(str(credentials.server), ''),
+            )
             cache_path = cache_dir_path / cache_name
             cache_path = cache_dir_path / f'{credentials.idstr()}.sqlite3'
             try:
                 cache_path.touch(0o600)
             except OSError:

tests/test_config.py

➞

Show inline comments

@@ ... / @@ -7,6 +7,7 @@ @@
 import contextlib
 import decimal
 import itertools
 import operator
 import os
 import re
@@ ... / @@ -140,6 +141,17 @@ def test_rt_credentials_from_all_sources_mixed(tmp_path): @@
         rt_credentials = config.rt_credentials()
     assert rt_credentials == (server, 'mixedup', 'mixed up', 'rt')
 def test_rt_credentials_idstr():
     actual = {
         config_mod.RTCredentials(server, user).idstr()
         for server, user in itertools.product(
                 [None, 'https://example.org/rt'],
                 [None, 'example'],
         )}
     assert len(actual) == 4
     for idstr in actual:
         assert '/' not in idstr
 def check_rt_client_url(credentials, client):
     pattern = '^{}/?$'.format(re.escape(credentials[0].rstrip('/') + '/REST/1.0'))
     assert re.match(pattern, client.url)

0 comments (0 inline, 0 general)