From acbfdc618496f304c1a81f5f07ff0cacabfe8394 Mon Sep 17 00:00:00 2001
From: Pawel Miech <pawelmhm@gmail.com>
Date: Wed, 15 Jun 2016 15:12:18 +0200
Subject: [PATCH] [files_pipeline] ensure class attributes are preserved

dont override class attributes with default settings (same as in image pipeline).
---
 scrapy/settings/default_settings.py |  3 ---
 tests/test_pipeline_files.py        | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/scrapy/settings/default_settings.py b/scrapy/settings/default_settings.py
index 1e447e9e2..b9d01e155 100644
--- a/scrapy/settings/default_settings.py
+++ b/scrapy/settings/default_settings.py
@@ -160,9 +160,6 @@ FEED_EXPORTERS_BASE = {
 }
 
 FILES_STORE_S3_ACL = 'private'
-FILES_EXPIRES = 90
-FILES_URLS_FIELD = 'file_urls'
-FILES_RESULT_FIELD = 'files'
 
 HTTPCACHE_ENABLED = False
 HTTPCACHE_DIR = 'httpcache'
diff --git a/tests/test_pipeline_files.py b/tests/test_pipeline_files.py
index 760684c2b..4c64f6f3e 100644
--- a/tests/test_pipeline_files.py
+++ b/tests/test_pipeline_files.py
@@ -218,7 +218,20 @@ class FilesPipelineTestCaseCustomSettings(unittest.TestCase):
 
         return {prefix.upper() + "_" + k: v for k, v in settings.items()}
 
+    def _generate_fake_pipeline(self):
+
+        class UserDefinedFilePipeline(FilesPipeline):
+            FILES_EXPIRES = random.randint(1001, 2000)
+            DEFAULT_FILES_URLS_FIELD = "alfa"
+            DEFAULT_FILES_RESULT_FIELD = "beta"
+
+        return UserDefinedFilePipeline
+
     def test_different_settings_for_different_instances(self):
+        """
+        If there are different instances with different settings they should keep
+        different settings.
+        """
         custom_settings = self._generate_fake_settings()
         another_pipeline = FilesPipeline.from_settings(Settings(custom_settings))
         one_pipeline = FilesPipeline(self.tempdir)
@@ -229,6 +242,16 @@ class FilesPipelineTestCaseCustomSettings(unittest.TestCase):
             pipe_attr_lower = pipe_attr.lower().replace("default_", "")
             self.assertEqual(getattr(another_pipeline, pipe_attr_lower), custom_value)
 
+    def test_subclass_attributes_preserved_if_no_settings(self):
+        """
+        If subclasses override class attributes and there are no special settings those values should be kept.
+        """
+        pipe_cls = self._generate_fake_pipeline()
+        pipe = pipe_cls.from_settings(Settings({"FILES_STORE": self.tempdir}))
+        for pipe_attr, settings_attr in self.file_cls_attr_settings_map:
+            attr_lower = pipe_attr.lower().replace("default_", "")
+            self.assertEqual(getattr(pipe, attr_lower), getattr(pipe, pipe_attr))
+
 
 class TestS3FilesStore(unittest.TestCase):
     @defer.inlineCallbacks