diff --git a/.travis.yml b/.travis.yml index 3befdf927..117370bc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,11 @@ python: - 2.7 env: matrix: - - BOTO_VERSION=2.36.0 + - BOTO_VERSION=2.43.0 matrix: include: - python: "3.3" - env: BOTO_VERSION=2.36.0 + env: BOTO_VERSION=2.43.0 install: - travis_retry pip install boto==$BOTO_VERSION - travis_retry pip install boto3 diff --git a/moto/iam/models.py b/moto/iam/models.py index 14fba2ae7..a524c81f8 100644 --- a/moto/iam/models.py +++ b/moto/iam/models.py @@ -418,7 +418,7 @@ class IAMBackend(BaseBackend): if 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 policies = policies[start_idx:start_idx + max_items] @@ -444,7 +444,7 @@ class IAMBackend(BaseBackend): if 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 policies = policies[start_idx:start_idx + max_items] diff --git a/moto/sqs/responses.py b/moto/sqs/responses.py index 8744b4008..15c067613 100644 --- a/moto/sqs/responses.py +++ b/moto/sqs/responses.py @@ -183,7 +183,7 @@ class SQSResponse(BaseResponse): message = self.sqs_backend.send_message(queue_name, message_body[0], delay_seconds=delay_seconds) 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: return message_attributes[0], message_attributes[1] message.message_attributes = message_attributes diff --git a/tests/test_s3/test_s3_lifecycle.py b/tests/test_s3/test_s3_lifecycle.py index 55b27543f..60613de44 100644 --- a/tests/test_s3/test_s3_lifecycle.py +++ b/tests/test_s3/test_s3_lifecycle.py @@ -23,7 +23,7 @@ def test_lifecycle_create(): lifecycle.id.should.equal('myid') lifecycle.prefix.should.equal('') lifecycle.status.should.equal('Enabled') - lifecycle.transition.should.equal(None) + list(lifecycle.transition).should.equal([]) @mock_s3