Added function get_utf8able_str

This function will ensure given objects are utf-8 encodable,
used mainly for allowing for Python 2/3 compatibility.

1 files changed, 2 insertions, 1 deletions

diff --git a/boto/s3/bucket.py b/boto/s3/bucket.py
index e24d1a51..9a3f7bc4 100644
--- a/boto/s3/bucket.py
+++ b/boto/s3/bucket.py
@@ -51,6 +51,7 @@ import re
 import base64
 from collections import defaultdict
 from boto.compat import BytesIO, six, StringIO, urllib
+from boto.utils import get_utf8able_str
 
 # as per http://goo.gl/BDuud (02/19/2011)
 
@@ -852,7 +853,7 @@ class Bucket(object):
             if isinstance(src_key_name, bytes):
                 src_key_name = src_key_name.decode('utf-8')
         else:
-            src_key_name = six.ensure_str(src_key_name)
+            src_key_name = get_utf8able_str(src_key_name)
         if preserve_acl:
             if self.name == src_bucket_name:
                 src_bucket = self