Remove whitespace and fix style.

This commit is contained in:
Andris Raugulis
2019-01-24 14:28:22 +02:00
parent f29ea6f0bb
commit 76b2861a7c
+2 -3
View File
@@ -96,13 +96,13 @@ def load_conf(cf):
for rline in fp: for rline in fp:
line_nr += 1 line_nr += 1
line = rline.strip() line = rline.strip()
mx = re.match('^\s*([^=\s]+)\s*=\s*(.*?)\s*(?:#\s+.*)?\s*$', line) mx = re.match(r'^\s*([^=\s]+)\s*=\s*(.*?)\s*(?:#\s+.*)?\s*$', line)
if mx: if mx:
k, v = mx.group(1).lower(), mx.group(2) k, v = mx.group(1).lower(), mx.group(2)
if k.startswith('#'): if k.startswith('#'):
continue continue
for q in '"\'': for q in '"\'':
if re.match('^{0}.*{0}$'.format(q), v): if re.match(r'^{0}.*{0}$'.format(q), v):
v = v[1:-1] v = v[1:-1]
conf[k] = v conf[k] = v
conf['{0}.line'.format(k)] = line_nr conf['{0}.line'.format(k)] = line_nr
@@ -184,7 +184,6 @@ def send_req(conf, s, name, url, data, **kwargs):
dbg(conf.get('debug'), '{0}.response'.format(name), rr) dbg(conf.get('debug'), '{0}.response'.format(name), rr)
if do_json: if do_json:
return r.headers, parse_rjson(r) return r.headers, parse_rjson(r)
else:
return r.headers, r.text return r.headers, r.text