From 2714fb76f1cbea381a1078996a3fcc900523c895 Mon Sep 17 00:00:00 2001 From: georgepsarakis Date: Sun, 30 Apr 2017 08:03:46 +0300 Subject: [PATCH] Python 2/3 compatibility fixes --- tests/test_s3/test_s3.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test_s3/test_s3.py b/tests/test_s3/test_s3.py index 193399917..09ef235a8 100644 --- a/tests/test_s3/test_s3.py +++ b/tests/test_s3/test_s3.py @@ -14,6 +14,7 @@ from boto.exception import S3CreateError, S3ResponseError from boto.s3.connection import S3Connection from boto.s3.key import Key from freezegun import freeze_time +import six import requests import tests.backport_assert_raises # noqa from nose.tools import assert_raises @@ -1299,7 +1300,8 @@ def test_boto3_list_object_versions(): bucket_name = 'mybucket' key = 'key-with-versions' 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( Bucket=bucket_name, Key=key, @@ -1314,7 +1316,7 @@ def test_boto3_list_object_versions(): keys.should.equal({key}) # Test latest object version is returned response = s3.get_object(Bucket=bucket_name, Key=key) - response['Body'].read().should.equal('v2') + response['Body'].read().should.equal(items[-1]) TEST_XML = """\