Python 2/3 compatibility fixes

This commit is contained in:
georgepsarakis 2017-04-30 08:03:46 +03:00
parent 617e994ac6
commit 2714fb76f1

View File

@ -14,6 +14,7 @@ from boto.exception import S3CreateError, S3ResponseError
from boto.s3.connection import S3Connection from boto.s3.connection import S3Connection
from boto.s3.key import Key from boto.s3.key import Key
from freezegun import freeze_time from freezegun import freeze_time
import six
import requests import requests
import tests.backport_assert_raises # noqa import tests.backport_assert_raises # noqa
from nose.tools import assert_raises from nose.tools import assert_raises
@ -1299,7 +1300,8 @@ def test_boto3_list_object_versions():
bucket_name = 'mybucket' bucket_name = 'mybucket'
key = 'key-with-versions' key = 'key-with-versions'
s3.create_bucket(Bucket=bucket_name) s3.create_bucket(Bucket=bucket_name)
for body in ('v1', 'v2'): items = (six.b('v1'), six.b('v2'))
for body in items:
s3.put_object( s3.put_object(
Bucket=bucket_name, Bucket=bucket_name,
Key=key, Key=key,
@ -1314,7 +1316,7 @@ def test_boto3_list_object_versions():
keys.should.equal({key}) keys.should.equal({key})
# Test latest object version is returned # Test latest object version is returned
response = s3.get_object(Bucket=bucket_name, Key=key) response = s3.get_object(Bucket=bucket_name, Key=key)
response['Body'].read().should.equal('v2') response['Body'].read().should.equal(items[-1])
TEST_XML = """\ TEST_XML = """\