From 21c8b89422429cf4cdf8054e1c8d398d6b1b82eb Mon Sep 17 00:00:00 2001 From: Pablo Hoffman Date: Thu, 21 Mar 2013 12:26:52 -0300 Subject: [PATCH] Revert "replaced use of depricated module scrapy.settings with the method get_project_settings()" This reverts commit 1b4d14c8f635b28d5f72d37f924c4e71d71520ca. Calling `get_project_settings()` generates a new independent Settings object that doesn't contain the overrides passed by command line arguments, for example. Proper port would require implementing the from_crawler() class method and making sure the settings object is passed to all internal objects (probably breaking some minor backwards compatibility). --- scrapy/contrib/feedexport.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scrapy/contrib/feedexport.py b/scrapy/contrib/feedexport.py index ec19963b7..3732de87f 100644 --- a/scrapy/contrib/feedexport.py +++ b/scrapy/contrib/feedexport.py @@ -19,7 +19,6 @@ from scrapy.utils.ftp import ftp_makedirs_cwd from scrapy.exceptions import NotConfigured from scrapy.utils.misc import load_object from scrapy.utils.python import get_func_args -from scrapy.utils.project import get_project_settings class IFeedStorage(Interface): @@ -82,7 +81,7 @@ class FileFeedStorage(object): class S3FeedStorage(BlockingFeedStorage): def __init__(self, uri): - settings = get_project_settings() + from scrapy.conf import settings try: import boto except ImportError: