Skip to content

Commit

Permalink
fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
eamonnfaherty committed Jun 25, 2021
1 parent 062c913 commit 486d372
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
16 changes: 9 additions & 7 deletions betterboto/utils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import logging
import time
import copy

logger = logging.getLogger(__file__)

Expand All @@ -10,20 +11,21 @@ def slurp(
wait_between_pages=0,
**kwargs
):
kwargs_to_use = copy.deepcopy(kwargs)
logging_prefix = ''
if kwargs.get('logging_prefix'):
logging_prefix = kwargs.get('logging_prefix')
del kwargs['logging_prefix']
if kwargs_to_use.get('logging_prefix'):
logging_prefix = kwargs_to_use.get('logging_prefix')
del kwargs_to_use['logging_prefix']

logger.info("{}{}: {}".format(logging_prefix, name, kwargs))
logger.info("{}{}: {}".format(logging_prefix, name, kwargs_to_use))
all_responses = []
while True:
logger.info(f"{logging_prefix}{name} searching, {next_token_name_in_request}: {kwargs.get(next_token_name_in_request, 'FirstPage')}")
response = func(**kwargs)
logger.info(f"{logging_prefix}{name} searching, {next_token_name_in_request}: {kwargs_to_use.get(next_token_name_in_request, 'FirstPage')}")
response = func(**kwargs_to_use)
all_responses += response.get(response_to_concat)
if response.get(next_token_name_in_response) is None:
response[response_to_concat] = all_responses
return response
else:
kwargs[next_token_name_in_request] = response.get(next_token_name_in_response)
kwargs_to_use[next_token_name_in_request] = response.get(next_token_name_in_response)
time.sleep(wait_between_pages)
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setuptools.setup(
name="better-boto",
version="0.41.1",
version="0.41.2",
author="Eamonn Faherty",
author_email="python-packages@designandsolve.co.uk",
description="Helpers to make using boto3 more enjoyable",
Expand Down

0 comments on commit 486d372

Please sign in to comment.