Merge pull request #2172 from redapple/backport-1.1-pr2140

[backport][1.1][PR #2140] Fix IMAGES_EXPIRES default value back to 90
This commit is contained in:
Paul Tremberth 2016-08-11 12:18:36 +02:00 committed by GitHub
commit 79afcd070c
2 changed files with 2 additions and 2 deletions

View File

@ -42,7 +42,7 @@ class ImagesPipeline(FilesPipeline):
# ImagesPipeline. They may be overridden by settings.
MIN_WIDTH = 0
MIN_HEIGHT = 0
EXPIRES = 0
EXPIRES = 90
THUMBS = {}
DEFAULT_IMAGES_URLS_FIELD = 'image_urls'
DEFAULT_IMAGES_RESULT_FIELD = 'images'

View File

@ -221,7 +221,7 @@ class ImagesPipelineTestCaseCustomSettings(unittest.TestCase):
default_pipeline_settings = dict(
MIN_WIDTH=0,
MIN_HEIGHT=0,
EXPIRES=0,
EXPIRES=90,
THUMBS={},
IMAGES_URLS_FIELD='image_urls',
IMAGES_RESULT_FIELD='images'