Merge pull request boto#924 from kyleknap/fix-test

Use strings when writing contents

tests/integration/test_s3.py

@@ -629,7 +629,7 @@ def test_transfer_methods_do_not_use_threads(self):
         # use ``boto3.s3.transfer.S3Transfer`` and the other should be
         # using ``s3transfer.manager.TransferManager`` directly
         content = b'my content'
-        filename = self.files.create_file('myfile', content)
+        filename = self.files.create_file('myfile', content.decode('utf-8'))
         key = 'foo'
         config = boto3.s3.transfer.TransferConfig(use_threads=False)