From e23d3b7f498c63eac651a04a1c1a9cfb7b096bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 27 Oct 2015 12:52:52 +0200 Subject: [PATCH] Upgrade rcssmin to 1.0.6 --- compressor/filters/cssmin/rcssmin.py | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) mode change 100644 => 100755 compressor/filters/cssmin/rcssmin.py diff --git a/compressor/filters/cssmin/rcssmin.py b/compressor/filters/cssmin/rcssmin.py old mode 100644 new mode 100755 index e178894..5f590bc --- a/compressor/filters/cssmin/rcssmin.py +++ b/compressor/filters/cssmin/rcssmin.py @@ -12,7 +12,7 @@ itself is based on `the rule list by Isaac Schlueter`_\\. :Copyright: - Copyright 2011 - 2014 + Copyright 2011 - 2015 Andr\xe9 Malo or his licensors, as applicable :License: @@ -40,10 +40,10 @@ Here's a feature list: - Strings are kept, except that escaped newlines are stripped - Space/Comments before the very end or before various characters are - stripped: ``:{});=>+],!`` (The colon (``:``) is a special case, a single + stripped: ``:{});=>],!`` (The colon (``:``) is a special case, a single space is kept if it's outside a ruleset.) - Space/Comments at the very beginning or after various characters are - stripped: ``{}(=:>+[,!`` + stripped: ``{}(=:>[,!`` - Optional space after unicode escapes is kept, resp. replaced by a simple space - whitespaces inside ``url()`` definitions are stripped @@ -78,7 +78,7 @@ if __doc__: __author__ = r"Andr\xe9 Malo".encode('ascii').decode('unicode_escape') __docformat__ = "restructuredtext en" __license__ = "Apache License, Version 2.0" -__version__ = '1.0.5' +__version__ = '1.0.6' __all__ = ['cssmin'] import re as _re @@ -176,19 +176,19 @@ def _make_cssmin(python_only=False): main_sub = _re.compile(( # noqa pylint: disable = C0330 - r'([^\\"\047u>@\r\n\f\040\t/;:{}]+)' - r'|(?<=[{}(=:>+[,!])(%(space)s+)' - r'|^(%(space)s+)' - r'|(%(space)s+)(?=(([:{});=>+\],!])|$)?)' - r'|;(%(space)s*(?:;%(space)s*)*)(?=(\})?)' - r'|(\{)' - r'|(\})' - r'|(%(strings)s)' - r'|(?@\r\n\f\040\t/;:{}+]+)' # 1 + r'|(?<=[{}(=:>[,!])(%(space)s+)' # 2 + r'|^(%(space)s+)' # 3 + r'|(%(space)s+)(?=(([:{});=>\],!])|$)?)' # 4, 5, 6 + r'|;(%(space)s*(?:;%(space)s*)*)(?=(\})?)' # 7, 8 + r'|(\{)' # 9 + r'|(\})' # 10 + r'|(%(strings)s)' # 11 + r'|(?@\r\n\f\040\t/;:{}]*)' + r'(%(space)s*)(?=[{,])' # 17 + r'|(%(nl_strings)s)' # 18 + r'|(%(escape)s[^\\"\047u>@\r\n\f\040\t/;:{}+]*)' # 19 ) % locals()).sub # print main_sub.__self__.pattern