Merge pull request #274 from brunsgaard/master

Updated settings import in contrib/feedexport.py class S3FeedStorage

scrapy/contrib/feedexport.py

@@ -19,6 +19,7 @@ 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):
@@ -81,7 +82,7 @@ class FileFeedStorage(object):
 class S3FeedStorage(BlockingFeedStorage):
 
     def __init__(self, uri):
-        from scrapy.conf import settings
+        settings = get_project_settings()
         try:
             import boto
         except ImportError: