Skip to content

Commit

Permalink
Merge pull request #424 from aio-libs/update-botocore-40
Browse files Browse the repository at this point in the history
Port botocore updates
  • Loading branch information
jettify committed Nov 7, 2017
2 parents 772c4e0 + 6b66b6d commit a8d1faf
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions aiobotocore/paginate.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ def _init_pager(self):
self._current_kwargs = self._op_kwargs
self._previous_next_token = None
self._next_token = dict((key, None) for key in self._input_token)

if self._starting_token is not None:
self._next_token = self._parse_starting_token()[0]

# The number of items from result_key we've seen so far.
self._total_items = 0
self._first_request = True
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pytest-cov==2.5.1
pytest==3.2.3
sphinx==1.6.5
aiohttp==2.2.5
botocore==1.7.27
botocore==1.7.40
multidict==3.3.2
wrapt==1.10.11
dill==0.2.7.1
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# https://github.com/aio-libs/aiobotocore/pull/248 will continue working
# If adding requirements make sure to also add to requirements-dev.txt
install_requires = [
'botocore>=1.7.4, <=1.7.27',
'botocore>=1.7.28, <=1.7.40',
'aiohttp>=2.0.4, <=2.3.0',
'multidict>=2.1.4',
'wrapt>=1.10.10',
Expand Down
4 changes: 2 additions & 2 deletions tests/test_patches.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
_API_DIGESTS = {
ClientArgsCreator: {'a8d2e4159469622afcf938805b17ca76aefec7e7'},
ClientCreator: {'7d862f8663e93c310b2fd7c0b0741ce45dc0eb47'},
BaseClient: {'3e87626900a1374583cd9ecaecd6d58153a50cb6'},
BaseClient: {'37ca6319cc9d6fc1fb36bf216e2b83d5766a5fab'},
Config: {'c9261822caa7509d7b30b7738a9f034674061e35'},
convert_to_response_dict: {'ed634b3f0c24f8858aee8ed745051397270b1e46'},
Endpoint: {'7aa956cf3f28f573384dbaeb2f819b0a05724e65'},
EndpointCreator: {'00cb4303f8e9e775fe76996ad2f8852df7900398'},
PageIterator: {'d6d83b5c9314d4346ce021c85986b7c090569a34'},
PageIterator: {'5a14db3ee7bc8773974b36cfdb714649b17a6a42'},
Session: {'87b50bbf6caf0d7ae0ed1498032194ec36ca00f5'},
get_session: {'c47d588f5da9b8bde81ccc26eaef3aee19ddd901'},
}
Expand Down

0 comments on commit a8d1faf

Please sign in to comment.