@@ -13,12 +13,14 @@ from .S3Uri import S3UriS3

 from .Utils import (getTextFromXml, getTreeFromXml, formatSize,

                     calculateChecksum, parseNodes, s3_quote)

+SIZE_1MB = 1024 * 1024

+

 class MultiPartUpload(object):

     """Supports MultiPartUpload and MultiPartUpload(Copy) operation"""

     MIN_CHUNK_SIZE_MB = 5        # 5MB

-    MAX_CHUNK_SIZE_MB = 5120     # 5GB

-    MAX_FILE_SIZE = 42949672960  # 5TB

+    MAX_CHUNK_SIZE_MB = 5 * 1024     # 5GB

+    MAX_FILE_SIZE = 5 * 1024 * 1024  # 5TB

     def __init__(self, s3, src, dst_uri, headers_baseline=None,

                  src_size=None):

@@ -36,11 +38,11 @@ class MultiPartUpload(object):

             if not src_size:

                 raise ParameterError("Source size is missing for "

                                      "MultipartUploadCopy operation")

-            c_size = self.s3.config.multipart_copy_chunk_size_mb * 1024 * 1024

+            c_size = self.s3.config.multipart_copy_chunk_size_mb * SIZE_1MB

         else:

             # Source is a file_stream to upload

             self.file_stream = src

-            c_size = self.s3.config.multipart_chunk_size_mb * 1024 * 1024

+            c_size = self.s3.config.multipart_chunk_size_mb * SIZE_1MB

         self.chunk_size = c_size

         self.upload_id = self.initiate_multipart_upload()

@@ -127,8 +127,9 @@ def mime_magic(file):

         result = (None, None)

     return result

-EXPECT_CONTINUE_TIMEOUT = 2

+EXPECT_CONTINUE_TIMEOUT = 2

+SIZE_1MB = 1024 * 1024

 __all__ = []

 class S3Request(object):

@@ -681,9 +682,9 @@ class S3(object):

         if not self.config.enable_multipart and filename == "-":

             raise ParameterError("Multi-part upload is required to upload from stdin")

         if self.config.enable_multipart:

-            if size > self.config.multipart_chunk_size_mb * 1024 * 1024 or filename == "-":

+            if size > self.config.multipart_chunk_size_mb * SIZE_1MB or filename == "-":

                 multipart = True

-                if size > self.config.multipart_max_chunks * self.config.multipart_chunk_size_mb * 1024 * 1024:

+                if size > self.config.multipart_max_chunks * self.config.multipart_chunk_size_mb * SIZE_1MB:

                     raise ParameterError("Chunk size %d MB results in more than %d chunks. Please increase --multipart-chunk-size-mb" % \

                           (self.config.multipart_chunk_size_mb, self.config.multipart_max_chunks))

         if multipart:

@@ -816,7 +817,7 @@ class S3(object):

         return headers

     def object_copy(self, src_uri, dst_uri, extra_headers=None,

-                    extra_label=""):

+                    src_size=None, extra_label=""):

         if src_uri.type != "s3":

             raise ValueError("Expected URI type 's3', got '%s'" % src_uri.type)

         if dst_uri.type != "s3":

@@ -830,7 +831,7 @@ class S3(object):

                 if exc.status != 501:

                     raise exc

                 acl = None

-        headers = SortedDict(ignore_case = True)

+        headers = SortedDict(ignore_case=True)

         if self.config.acl_public:

             headers["x-amz-acl"] = "public-read"

@@ -850,15 +851,18 @@ class S3(object):

         if extra_headers:

             headers.update(extra_headers)

-        ## Multipart decision - only do multipart copy for remote s3 files > 5gb

+        # Multipart decision. Only do multipart copy for remote s3 files

+        # bigger than the multipart copy threshlod.

         if self.config.enable_multipart:

-            # get size of remote src only if multipart is enabled

-            src_info = self.object_info(src_uri)

-            size = int(src_info["headers"]["content-length"])

+            # get size of remote src only if multipart is enabled and no size

+            # info was provided

+            if src_size is None:

+                src_info = self.object_info(src_uri)

+                src_size = int(src_info["headers"]["content-length"])

-            if size > self.config.multipart_copy_chunk_size_mb * 1024 * 1024:

+            if src_size > self.config.multipart_copy_chunk_size_mb * SIZE_1MB:

                 # Multipart requests are quite different... drop here

-                return self.copy_file_multipart(src_uri, dst_uri, size,

+                return self.copy_file_multipart(src_uri, dst_uri, src_size,

                                                 headers, extra_label)

         ## Not multipart...

@@ -872,7 +876,7 @@ class S3(object):

                                       headers=headers)

         response = self.send_request(request)

         if response["data"] and getRootTagName(response["data"]) == "Error":

-            #http://doc.s3.amazonaws.com/proposals/copy.html

+            # http://doc.s3.amazonaws.com/proposals/copy.html

             # Error during copy, status will be 200, so force error code 500

             response["status"] = 500

             error("Server error during the COPY operation. Overwrite response "

@@ -890,7 +894,7 @@ class S3(object):

         return response

     def object_modify(self, src_uri, dst_uri, extra_headers=None,

-                      extra_label=""):

+                      src_size=None, extra_label=""):

         if src_uri.type != "s3":

             raise ValueError("Expected URI type 's3', got '%s'" % src_uri.type)

@@ -957,12 +961,13 @@ class S3(object):

         return response

     def object_move(self, src_uri, dst_uri, extra_headers=None,

-                    extra_label=""):

-        response_copy = self.object_copy(src_uri, dst_uri, extra_headers)

+                    src_size=None, extra_label=""):

+        response_copy = self.object_copy(src_uri, dst_uri, extra_headers,

+                                         src_size, extra_label)

         debug("Object %s copied to %s" % (src_uri, dst_uri))

         if not response_copy["data"] \

            or getRootTagName(response_copy["data"]) \

-              in ["CopyObjectResult", "CompleteMultipartUploadResult"]:

+           in ["CopyObjectResult", "CompleteMultipartUploadResult"]:

             self.object_delete(src_uri)

             debug("Object '%s' deleted", src_uri)

         else:

@@ -831,19 +831,23 @@ def subcmd_cp_mv(args, process_fce, action_str, message):

     cfg = Config()

     if action_str == 'modify':

         if len(args) < 1:

-            raise ParameterError("Expecting one or more S3 URIs for " + action_str)

+            raise ParameterError("Expecting one or more S3 URIs for "

+                                 + action_str)

         destination_base = None

     else:

         if len(args) < 2:

-            raise ParameterError("Expecting two or more S3 URIs for " + action_str)

+            raise ParameterError("Expecting two or more S3 URIs for "

+                                 + action_str)

         dst_base_uri = S3Uri(args.pop())

         if dst_base_uri.type != "s3":

-            raise ParameterError("Destination must be S3 URI. To download a file use 'get' or 'sync'.")

+            raise ParameterError("Destination must be S3 URI. To download a "

+                                 "file use 'get' or 'sync'.")

         destination_base = dst_base_uri.uri()

     scoreboard = ExitScoreboard()

-    remote_list, exclude_list, remote_total_size = fetch_remote_list(args, require_attribs = False)

+    remote_list, exclude_list, remote_total_size = \

+        fetch_remote_list(args, require_attribs=False)

     remote_count = len(remote_list)

@@ -854,7 +858,9 @@ def subcmd_cp_mv(args, process_fce, action_str, message):

         # so we don't need to test for it here.

         if not destination_base.endswith('/') \

            and (len(remote_list) > 1 or cfg.recursive):

-            raise ParameterError("Destination must be a directory and end with '/' when acting on a folder content or on multiple sources.")

+            raise ParameterError("Destination must be a directory and end with"

+                                 " '/' when acting on a folder content or on "

+                                 "multiple sources.")

         if cfg.recursive:

             for key in remote_list:

@@ -873,7 +879,9 @@ def subcmd_cp_mv(args, process_fce, action_str, message):

         for key in exclude_list:

             output(u"exclude: %s" % key)

         for key in remote_list:

-            output(u"%s: '%s' -> '%s'" % (action_str, remote_list[key]['object_uri_str'], remote_list[key]['dest_name']))

+            output(u"%s: '%s' -> '%s'" % (action_str,

+                                          remote_list[key]['object_uri_str'],

+                                          remote_list[key]['dest_name']))

         warning(u"Exiting now because of --dry-run")

         return EX_OK

@@ -886,10 +894,12 @@ def subcmd_cp_mv(args, process_fce, action_str, message):

         item = remote_list[key]

         src_uri = S3Uri(item['object_uri_str'])

         dst_uri = S3Uri(item['dest_name'])

+        src_size = item.get('size')

         extra_headers = copy(cfg.extra_headers)

         try:

             response = process_fce(src_uri, dst_uri, extra_headers,

+                                   src_size=src_size,

                                    extra_label=seq_label)

             output(message % {"src": src_uri, "dst": dst_uri,

                               "extra": seq_label})

@@ -902,12 +912,14 @@ def subcmd_cp_mv(args, process_fce, action_str, message):

                 warning(u"Key not found %s" % item['object_uri_str'])

             else:

                 scoreboard.failed()

-            if cfg.stop_on_error: break

+            if cfg.stop_on_error:

+                break

     return scoreboard.rc()

 def cmd_cp(args):

     s3 = S3(Config())

-    return subcmd_cp_mv(args, s3.object_copy, "copy", u"remote copy: '%(src)s' -> '%(dst)s'  %(extra)s")

+    return subcmd_cp_mv(args, s3.object_copy, "copy",

+                        u"remote copy: '%(src)s' -> '%(dst)s'  %(extra)s")

 def cmd_modify(args):

     s3 = S3(Config())

@@ -916,7 +928,8 @@ def cmd_modify(args):

 def cmd_mv(args):

     s3 = S3(Config())

-    return subcmd_cp_mv(args, s3.object_move, "move", u"move: '%(src)s' -> '%(dst)s'  %(extra)s")

+    return subcmd_cp_mv(args, s3.object_move, "move",

+                        u"move: '%(src)s' -> '%(dst)s'  %(extra)s")

 def cmd_info(args):

     cfg = Config()

@@ -1112,10 +1125,12 @@ def cmd_sync_remote2remote(args):

             item = src_list[file]

             src_uri = S3Uri(item['object_uri_str'])

             dst_uri = S3Uri(item['target_uri'])

+            src_size = item.get('size')

             seq_label = "[%d of %d]" % (seq, src_count)

             extra_headers = copy(cfg.extra_headers)

             try:

                 response = s3.object_copy(src_uri, dst_uri, extra_headers,

+                                          src_size=src_size,

                                           extra_label=seq_label)

                 output(u"remote copy: '%s' -> '%s'  %s" %

                        (src_uri, dst_uri, seq_label))

@@ -1561,13 +1576,15 @@ def remote_copy(s3, copy_pairs, destination_base, uploaded_objects_list=None):

         debug(u"Remote Copying from %s to %s" % (dst1, dst2))

         dst1_uri = S3Uri(destination_base + dst1)

         dst2_uri = S3Uri(destination_base + dst2)

+        src_obj_size = src_obj.get(u'size', 0)

         seq_label = "[%d of %d]" % (seq, src_count)

         extra_headers = copy(cfg.extra_headers)

         try:

             s3.object_copy(dst1_uri, dst2_uri, extra_headers,

+                           src_size=src_obj_size,

                            extra_label=seq_label)

             output(u"remote copy: '%s' -> '%s'  %s" % (dst1, dst2, seq_label))

-            saved_bytes += src_obj.get(u'size', 0)

+            saved_bytes += src_obj_size

             if uploaded_objects_list is not None:

                 uploaded_objects_list.append(dst2)

         except Exception: