Merge pull request #2542 from scrapy/redirect-cleanup

[MRG+1] Cleanup MetaRefreshMiddleware: remove redundant check
This commit is contained in:
Mikhail Korobov 2017-02-08 00:57:21 +05:00 committed by GitHub
commit f2f9350c47
1 changed files with 8 additions and 7 deletions

View File

@ -53,8 +53,10 @@ class BaseRedirectMiddleware(object):
class RedirectMiddleware(BaseRedirectMiddleware):
"""Handle redirection of requests based on response status and meta-refresh html tag"""
"""
Handle redirection of requests based on response status
and meta-refresh html tag.
"""
def process_response(self, request, response, spider):
if (request.meta.get('dont_redirect', False) or
response.status in getattr(spider, 'handle_httpstatus_list', []) or
@ -92,10 +94,9 @@ class MetaRefreshMiddleware(BaseRedirectMiddleware):
not isinstance(response, HtmlResponse):
return response
if isinstance(response, HtmlResponse):
interval, url = get_meta_refresh(response)
if url and interval < self._maxdelay:
redirected = self._redirect_request_using_get(request, url)
return self._redirect(redirected, request, spider, 'meta refresh')
interval, url = get_meta_refresh(response)
if url and interval < self._maxdelay:
redirected = self._redirect_request_using_get(request, url)
return self._redirect(redirected, request, spider, 'meta refresh')
return response