From 0111917437cd9b20f0c24d8f9f2e8680349235d6 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 2 Jan 2016 16:08:05 +0100 Subject: Spare code cosmetics (2) --- module/plugins/internal/misc.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/internal/misc.py') diff --git a/module/plugins/internal/misc.py b/module/plugins/internal/misc.py index b5b25260a..346424db7 100644 --- a/module/plugins/internal/misc.py +++ b/module/plugins/internal/misc.py @@ -519,7 +519,7 @@ def parse_name(value, safechar=True): def parse_size(value, unit=""): #: returns bytes - m = re.match(r"([\d.,]+)\s*([\w^_]*)", str(value).lower()) + m = re.match(r'([\d.,]+)\s*([\w^_]*)', str(value).lower()) if m is None: return 0 @@ -557,7 +557,7 @@ def str2int(value): t_tuple = [(w, i * 10) for i, w in enumerate(tens)] numwords = dict(o_tuple + t_tuple) - tokens = re.split(r"[\s\-]+", value.lower()) + tokens = re.split(r'[\s\-]+', value.lower()) try: return sum(numwords[word] for word in tokens) @@ -717,17 +717,17 @@ def parse_html_header(header): def parse_html_tag_attr_value(attr_name, tag): - m = re.search(r"%s\s*=\s*([\"']?)((?<=\")[^\"]+|(?<=')[^']+|[^>\s\"'][^>\s]*)\1" % attr_name, tag, re.I) + m = re.search(r'%s\s*=\s*(["\']?)((?<=")[^"]+|(?<=\')[^\']+|[^>\s"\'][^>\s]*)\1' % attr_name, tag, re.I) return m.group(2) if m else None def parse_html_form(attr_str, html, input_names={}): - for form in re.finditer(r"(?P]*%s[^>]*>)(?P.*?)]*>" % attr_str, + for form in re.finditer(r'(?P]*%s.*?>)(?P.*?)' % attr_str, html, re.I | re.S): inputs = {} action = parse_html_tag_attr_value("action", form.group('TAG')) - for inputtag in re.finditer(r'(<(input|textarea)[^>]*>)([^<]*(?=)([^<]*(?=