Merge branch 'garnaat-fix-614' into develop

* garnaat-fix-614:
  Update CHANGELOG
  Don't encode the copy_source argument
  The fake session should no longer unquote the copy_source.
  Let botocore handle the quoting of the x-amz-copy-source header.
  Quote the filename in the x-amz-copy-source header for multipart COPY operations.  Fixes #614.

Conflicts:
	CHANGELOG.rst

CHANGELOG.rst

@@ -8,6 +8,9 @@ Next Release (TBD)
 * bugfix:Bundled Installer: Allow creation of bundled
   installer with ``pip 1.5``
   (`issue 691 <https://github.com/aws/aws-cli/issues/691>`__)
+* bugfix:``aws s3``: Fix issue when copying objects using
+  ``aws s3 cp`` with key names containing ``+`` characters
+  (`issue #614 <https://github.com/aws/aws-cli/issues/614>`__)
 * bugfix:``ec2 create-snapshot``: Remove ``Tags`` key from
   output response
   (`issue 247 <https://github.com/boto/botocore/pull/247>`__)

awscli/customizations/s3/fileinfo.py

@@ -235,7 +235,7 @@ def copy(self):
         """
         Copies a object in s3 to another location in s3.
         """
-        copy_source = quote(self.src.encode('utf-8'), safe='/~')
+        copy_source = self.src
         bucket, key = find_bucket_key(self.dest)
         params = {'endpoint': self.endpoint, 'bucket': bucket,
                   'copy_source': copy_source, 'key': key}

tests/unit/customizations/s3/fake_session.py

@@ -13,10 +13,10 @@
 import hashlib
 from operator import itemgetter
 from botocore.vendored import requests
+from six import text_type
 from six import StringIO
 from io import BytesIO
 
-from botocore.compat import unquote
 from mock import MagicMock, Mock
 
 from awscli.customizations.s3.filegenerator import find_bucket_key
@@ -224,8 +224,7 @@ def copy_object(self, kwargs):
         key = kwargs['key']
         copy_source = kwargs['copy_source']
         src_bucket, src_key = find_bucket_key(copy_source)
-        src_key = unquote(src_key)
-        if hasattr(src_key, 'decode'):
+        if not isinstance(src_key, text_type) and hasattr(src_key, 'decode'):
             src_key = src_key.decode('utf-8')
         response_data = {}
         etag = ''