diff options
| author | Bryan Newbold <bnewbold@archive.org> | 2020-01-09 12:34:14 -0800 |
|---|---|---|
| committer | Bryan Newbold <bnewbold@archive.org> | 2020-01-09 16:32:51 -0800 |
| commit | 101e3c818fa5852c11003e616526726e189ab2c3 (patch) | |
| tree | 3d41ab201bad9a560dbe206171b3915833b28a9a | |
| parent | 55ef20102eaf8123dfc41e1d7ae80c50607c99f4 (diff) | |
| download | sandcrawler-101e3c818fa5852c11003e616526726e189ab2c3.tar.gz sandcrawler-101e3c818fa5852c11003e616526726e189ab2c3.zip | |
location comes as a string, not list
| -rw-r--r-- | python/sandcrawler/ia.py | 2 | ||||
| -rw-r--r-- | python/tests/test_wayback.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/python/sandcrawler/ia.py b/python/sandcrawler/ia.py index 198c8aa..6544e58 100644 --- a/python/sandcrawler/ia.py +++ b/python/sandcrawler/ia.py @@ -257,7 +257,7 @@ class WaybackClient: # whole cluster is down though. status_code = gwb_record.get_status()[0] - location = (gwb_record.get_location() or [None])[0] + location = gwb_record.get_location() or None body = None if status_code == 200: diff --git a/python/tests/test_wayback.py b/python/tests/test_wayback.py index 2aafe7c..efffbe2 100644 --- a/python/tests/test_wayback.py +++ b/python/tests/test_wayback.py @@ -118,8 +118,8 @@ def wayback_client(cdx_client, mocker): client.rstore = mocker.Mock() resource = mocker.Mock() client.rstore.load_resource = mocker.MagicMock(return_value=resource) - resource.get_status = mocker.MagicMock(return_value=[200]) - resource.get_location = mocker.MagicMock(return_value=[WARC_TARGET]) + resource.get_status = mocker.MagicMock(return_value=(200, "Ok")) + resource.get_location = mocker.MagicMock(return_value=WARC_TARGET) body = mocker.Mock() resource.open_raw_content = mocker.MagicMock(return_value=body) body.read = mocker.MagicMock(return_value=WARC_BODY) @@ -140,8 +140,8 @@ def wayback_client_pdf(cdx_client, mocker): client.rstore = mocker.Mock() resource = mocker.Mock() client.rstore.load_resource = mocker.MagicMock(return_value=resource) - resource.get_status = mocker.MagicMock(return_value=[200]) - resource.get_location = mocker.MagicMock(return_value=[WARC_TARGET]) + resource.get_status = mocker.MagicMock(return_value=(200, "Ok")) + resource.get_location = mocker.MagicMock(return_value=WARC_TARGET) body = mocker.Mock() resource.open_raw_content = mocker.MagicMock(return_value=body) body.read = mocker.MagicMock(return_value=pdf_bytes) |