Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #759 from spulec/boto-bump

Browse Source 
Test Boto 2.43.0 .
This commit is contained in:
Steve Pulec 2016-11-06 11:09:47 -05:00 committed by GitHub
commit 078156c642
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -5,11 +5,11 @@ python:
- 2.7 - 2.7
env: env:
matrix: matrix:
- BOTO_VERSION=2.36.0 - BOTO_VERSION=2.43.0
matrix: matrix:
include: include:
- python: "3.3" - python: "3.3"
env: BOTO_VERSION=2.36.0 env: BOTO_VERSION=2.43.0
install: install:
- travis_retry pip install boto==$BOTO_VERSION - travis_retry pip install boto==$BOTO_VERSION
- travis_retry pip install boto3 - travis_retry pip install boto3

4
moto/iam/models.py
View File

@ -418,7 +418,7 @@ class IAMBackend(BaseBackend):
if path_prefix: if path_prefix:
policies = [p for p in policies if p.path.startswith(path_prefix)] policies = [p for p in policies if p.path.startswith(path_prefix)]
policies = sorted(policies) policies = sorted(policies, key=lambda policy: policy.name)
start_idx = int(marker) if marker else 0 start_idx = int(marker) if marker else 0
policies = policies[start_idx:start_idx + max_items] policies = policies[start_idx:start_idx + max_items]
@ -444,7 +444,7 @@ class IAMBackend(BaseBackend):
if path_prefix: if path_prefix:
policies = [p for p in policies if p.path.startswith(path_prefix)] policies = [p for p in policies if p.path.startswith(path_prefix)]
policies = sorted(policies) policies = sorted(policies, key=lambda policy: policy.name)
start_idx = int(marker) if marker else 0 start_idx = int(marker) if marker else 0
policies = policies[start_idx:start_idx + max_items] policies = policies[start_idx:start_idx + max_items]

2
moto/sqs/responses.py
View File

@ -183,7 +183,7 @@ class SQSResponse(BaseResponse):
message = self.sqs_backend.send_message(queue_name, message_body[0], delay_seconds=delay_seconds) message = self.sqs_backend.send_message(queue_name, message_body[0], delay_seconds=delay_seconds)
message.user_id = message_user_id message.user_id = message_user_id
message_attributes = parse_message_attributes(self.querystring, base='SendMessageBatchRequestEntry.{0}.'.format(index), value_namespace='') message_attributes = parse_message_attributes(self.querystring, base='SendMessageBatchRequestEntry.{0}.'.format(index))
if type(message_attributes) == tuple: if type(message_attributes) == tuple:
return message_attributes[0], message_attributes[1] return message_attributes[0], message_attributes[1]
message.message_attributes = message_attributes message.message_attributes = message_attributes

2
tests/test_s3/test_s3_lifecycle.py
View File

@ -23,7 +23,7 @@ def test_lifecycle_create():
lifecycle.id.should.equal('myid') lifecycle.id.should.equal('myid')
lifecycle.prefix.should.equal('') lifecycle.prefix.should.equal('')
lifecycle.status.should.equal('Enabled') lifecycle.status.should.equal('Enabled')
lifecycle.transition.should.equal(None) list(lifecycle.transition).should.equal([])
@mock_s3 @mock_s3