Add missing return statement in boto.s3.multipart.MultiPart.complete_…

…upload. Fixes Googlecode issue 515.
boto · May 31, 2011 · 955cb6e · 955cb6e
1 parent 3510d33
commit 955cb6e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/boto/s3/multipart.py b/boto/s3/multipart.py
@@ -230,7 +230,8 @@ def upload_part_from_file(self, fp, part_num, headers=None, replace=True,
         query_args = 'uploadId=%s&partNumber=%d' % (self.id, part_num)
         key = self.bucket.new_key(self.key_name)
         key.set_contents_from_file(fp, headers, replace, cb, num_cb, policy,
-                                   md5, reduced_redundancy=False, query_args=query_args)
+                                   md5, reduced_redundancy=False,
+                                   query_args=query_args)
 
     def complete_upload(self):
         """
@@ -242,8 +243,8 @@ def complete_upload(self):
         :returns: An object representing the completed upload.
         """
         xml = self.to_xml()
-        self.bucket.complete_multipart_upload(self.key_name,
-                                              self.id, xml)
+        return self.bucket.complete_multipart_upload(self.key_name,
+                                                     self.id, xml)
 
     def cancel_upload(self):
         """