diff options
| author | Johannes Linke <johannes.linke@posteo.de> | 2017-02-16 20:13:36 +0100 |
|---|---|---|
| committer | Johannes Linke <johannes.linke@posteo.de> | 2017-02-16 20:13:36 +0100 |
| commit | 13451276ddb07b7d31646f90973fb0901afd996b (patch) | |
| tree | 820e70c8f39269458bba5c2803ac86302db9752f /compressor/filters | |
| parent | 9848c1f8a8b6703ca302add0a5557af6277bfb41 (diff) | |
| download | django-compressor-13451276ddb07b7d31646f90973fb0901afd996b.tar.gz | |
More robust URL_PATTERN regex, includes comments
Diffstat (limited to 'compressor/filters')
| -rw-r--r-- | compressor/filters/css_default.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/compressor/filters/css_default.py b/compressor/filters/css_default.py index 44984c1..1776004 100644 --- a/compressor/filters/css_default.py +++ b/compressor/filters/css_default.py @@ -6,9 +6,15 @@ from compressor.cache import get_hashed_mtime, get_hashed_content from compressor.conf import settings from compressor.filters import FilterBase, FilterError -URL_PATTERN = re.compile(r'url\( *([\'"]?)(.+?)\1 *\)') -# URL_PATTERN = re.compile(r'url\(([^\)]+)\)') -SRC_PATTERN = re.compile(r'src=([\'"])(.+?)\1') +URL_PATTERN = re.compile(r""" + url\( + \s* # any amount of whitespace + ([\'"]?) # optional quote + (.*?) # any amount of anything, non-greedily (this is the actual url) + \1 # matching quote (or nothing if there was none) + \s* # any amount of whitespace + \)""", re.VERBOSE) +SRC_PATTERN = re.compile(r'src=([\'"])(.*?)\1') SCHEMES = ('http://', 'https://', '/') |