From 6a8bcf25254e518c4549f1ba5a87c986a3d31364 Mon Sep 17 00:00:00 2001 From: Christopher Noyes Date: Thu, 19 Jul 2012 16:58:44 -0400 Subject: [PATCH] remove comments, add space after ; --- S3/S3.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/S3/S3.py b/S3/S3.py index aad624d3c..a1c3a3590 100644 --- a/S3/S3.py +++ b/S3/S3.py @@ -374,15 +374,15 @@ def object_put(self, filename, uri, extra_headers = None, extra_label = ""): ## MIME-type handling content_type = self.config.mime_type - print(content_type) + if not content_type and self.config.guess_mime_type: content_type = mime_magic(filename) if not content_type: content_type = self.config.default_mime_type - print(content_type) + ## add charset to content type if self.add_encoding(filename, content_type): - content_type = content_type + ";charset=" + self.config.encoding.upper() + content_type = content_type + "; charset=" + self.config.encoding.upper() debug("Content-Type set to '%s'" % content_type) headers["content-type"] = content_type