From 4efcf78a4a7c48774c29e7917712b030eccc5536 Mon Sep 17 00:00:00 2001 From: Daniel Grana Date: Fri, 22 May 2009 13:14:16 -0300 Subject: [PATCH] aws: take AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY from enviroment just like boto does --- scrapy/contrib/aws.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scrapy/contrib/aws.py b/scrapy/contrib/aws.py index d31c40b06..bb2eb8ff1 100644 --- a/scrapy/contrib/aws.py +++ b/scrapy/contrib/aws.py @@ -77,8 +77,8 @@ def sign_request(req, accesskey, secretkey): class AWSMiddleware(object): def __init__(self): - self.access_key = settings['AWS_ACCESS_KEY_ID'] - self.secret_key = settings['AWS_SECRET_ACCESS_KEY'] + self.access_key = settings['AWS_ACCESS_KEY_ID'] or os.environ.get('AWS_ACCESS_KEY_ID') + self.secret_key = settings['AWS_SECRET_ACCESS_KEY'] or os.environ.get('AWS_SECRET_ACCESS_KEY') def process_request(self, request, spider): if spider.domain_name == 's3.amazonaws.com' \