summaryrefslogtreecommitdiff
path: root/scss/cssdefs.py
diff options
context:
space:
mode:
authorGerman M. Bravo <german.mb@deipi.com>2013-05-02 16:04:22 -0500
committerGerman M. Bravo <german.mb@deipi.com>2013-05-02 19:07:10 -0500
commit8078a6d76e7bd3382643a6a84a81b84aaa789462 (patch)
tree05990428071905aa45d847a5d106644eebda2b14 /scss/cssdefs.py
parent365f440cb2e9096554503097428e18660e652778 (diff)
downloadpyscss-8078a6d76e7bd3382643a6a84a81b84aaa789462.tar.gz
Cleanups, variables names fixed, small issues fixed
Diffstat (limited to 'scss/cssdefs.py')
-rw-r--r--scss/cssdefs.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/scss/cssdefs.py b/scss/cssdefs.py
index f7349b9..0190025 100644
--- a/scss/cssdefs.py
+++ b/scss/cssdefs.py
@@ -237,8 +237,6 @@ _css_functions_re = re.compile(r'^(%s)$' % (
# Bits and pieces of grammar, as regexen
SEPARATOR = '\x00'
-_nl_re = re.compile(r'[ \t\r\f\v]*\n[ \t\r\f\v]*', re.MULTILINE)
-_nl_num_nl_re = re.compile(r'\n.+' + SEPARATOR + r'[ \t\r\f\v]*\n', re.MULTILINE)
_short_color_re = re.compile(r'(?<!\w)#([a-f0-9])\1([a-f0-9])\2([a-f0-9])\3\b', re.IGNORECASE)
_long_color_re = re.compile(r'(?<!\w)#([a-f0-9]){2}([a-f0-9]){2}([a-f0-9]){2}\b', re.IGNORECASE)
@@ -263,8 +261,8 @@ _expr_glob_re = re.compile(r'''
# XXX these still need to be fixed; the //-in-functions thing is a chumpy hack
_ml_comment_re = re.compile(r'\/\*(.*?)\*\/', re.DOTALL)
-_sl_comment_re = re.compile(r'(?<![(])(?<!\w{2}:)\/\/.*')
-_zero_units_re = re.compile(r'\b(?<![.])0(' + '|'.join(map(re.escape, _zero_units)) + r')(?!\w)', re.IGNORECASE)
+_sl_comment_re = re.compile(r'(?<!\burl[(])(?<!\w{2}:)\/\/.*')
+_zero_units_re = re.compile(r'\b0(' + '|'.join(map(re.escape, _zero_units)) + r')(?!\w)', re.IGNORECASE)
_zero_re = re.compile(r'\b0\.(?=\d)')
_escape_chars_re = re.compile(r'([^-a-zA-Z0-9_])')