diff --git a/scrapy/trunk/scrapy/contrib/aws.py b/scrapy/trunk/scrapy/contrib/aws.py index e81b9aa1f..8f19d7f82 100644 --- a/scrapy/trunk/scrapy/contrib/aws.py +++ b/scrapy/trunk/scrapy/contrib/aws.py @@ -15,7 +15,7 @@ def canonical_string(method, path, headers, expires=None): interesting_headers = {} for key in headers: lk = key.lower() - if lk in set('content-md5', 'content-type', 'date') or lk.startswith(AMAZON_HEADER_PREFIX): + if lk in set(['content-md5', 'content-type', 'date']) or lk.startswith(AMAZON_HEADER_PREFIX): interesting_headers[lk] = headers[key].strip() # these keys get empty strings if they don't exist diff --git a/scrapy/trunk/scrapy/contrib/pipeline/s3images.py b/scrapy/trunk/scrapy/contrib/pipeline/s3images.py index 584061e82..92981316a 100644 --- a/scrapy/trunk/scrapy/contrib/pipeline/s3images.py +++ b/scrapy/trunk/scrapy/contrib/pipeline/s3images.py @@ -40,7 +40,7 @@ class S3ImagesPipeline(BaseImagesPipeline): def s3request(self, key, method, body=None, headers=None): url = 'http://%s.s3.amazonaws.com/%s' % (self.bucket_name, key) req = Request(url, method=method, body=body, headers=headers) - sign_request(req, self.access_key, self.secret_keself.secret_keyy) + sign_request(req, self.access_key, self.secret_key) return req def image_downloaded(self, response, request, info):