aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@archive.org>2021-04-13 17:13:55 -0700
committerBryan Newbold <bnewbold@archive.org>2021-04-13 17:13:55 -0700
commit7a701662c17467a9eb3402cf8641a7dd15f5ad1c (patch)
treee1bd9ecc8211feb2841b9be5f2b5439f1fafccdc
parent825c928ff9411b55f6bec5fa11f7771367ae3a24 (diff)
downloadfuzzycat-7a701662c17467a9eb3402cf8641a7dd15f5ad1c.tar.gz
fuzzycat-7a701662c17467a9eb3402cf8641a7dd15f5ad1c.zip
make fmt
-rw-r--r--fuzzycat/utils.py2
-rw-r--r--tests/test_utils.py17
2 files changed, 16 insertions, 3 deletions
diff --git a/fuzzycat/utils.py b/fuzzycat/utils.py
index bd7ceed..8e1ffb0 100644
--- a/fuzzycat/utils.py
+++ b/fuzzycat/utils.py
@@ -19,6 +19,7 @@ CHEM_FORMULA = re.compile(r"([A-Z]{1,2}[0-9]{1,2})+")
ParsedPages = collections.namedtuple("ParsedPages", "start end count")
+
def es_compat_hits_total(resp):
"""
Given a search response dict, support ES6 and ES7 style total value. See:
@@ -32,6 +33,7 @@ def es_compat_hits_total(resp):
except TypeError:
return resp["hits"]["total"]
+
def parse_page_string(s):
"""
Parse typical page strings, e.g. 150-180.
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 24be9d1..381c44e 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -99,11 +99,22 @@ def test_zstdlines():
with open(fn) as f:
assert [s.strip() for s in f.readlines()] == list(zstdlines(zfn))
+
def test_es_compat_hits_total():
cases = (
- ({"hits": {"total": 6}}, 6),
- ({"hits": {"total": {"value": 7, "relation": "eq"}}}, 7),
+ ({
+ "hits": {
+ "total": 6
+ }
+ }, 6),
+ ({
+ "hits": {
+ "total": {
+ "value": 7,
+ "relation": "eq"
+ }
+ }
+ }, 7),
)
for r, expected in cases:
assert es_compat_hits_total(r) == expected
-