Scrapy, a fast high-level web crawling & scraping framework for Python.
Simplify regex conditions
Paul Tremberth962eb11c73bd
diff --git a/scrapy/utils/gz.py b/scrapy/utils/gz.pyindex 9fe88d108..afc7ed128 100644--- a/scrapy/utils/gz.py+++ b/scrapy/utils/gz.py@@ -50,13 +50,12 @@ def gunzip(data):raisereturn output-_is_gzipped_re = re.compile(br'^application/(x-)?gzip\b', re.I)-_is_octetstream_re = re.compile(br'^(application|binary)/octet-stream\b', re.I)+_is_gzipped = re.compile(br'^application/(x-)?gzip\b', re.I).search+_is_octetstream = re.compile(br'^(application|binary)/octet-stream\b', re.I).searchdef is_gzipped(response):"""Return True if the response is gzipped, or False otherwise"""ctype = response.headers.get('Content-Type', b'')cenc = response.headers.get('Content-Encoding', b'').lower()- return (_is_gzipped_re.search(ctype) is not None or- (_is_octetstream_re.search(ctype) is not None and- cenc in (b'gzip', b'x-gzip')))+ return (_is_gzipped(ctype) or+ (_is_octetstream(ctype) and cenc in (b'gzip', b'x-gzip')))