kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-05 18:50:09 +02:00
Code Activity

fix pep8 E741 ambiguous variable name 'l'

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2020-05-14 11:54:32 +02:00
parent 1106795583
commit df563d339a
No known key found for this signature in database
GPG Key ID: 3E177817BA1B9BFA
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/install.py
View File

@ -36,11 +36,11 @@ def devices():
p = SdkToolsPopen(['adb', "devices"])
if p.returncode != 0:
raise FDroidException("An error occured when finding devices: %s" % p.output)
lines = [l for l in p.output.splitlines() if not l.startswith('* ')]
lines = [line for line in p.output.splitlines() if not line.startswith('* ')]
if len(lines) < 3:
return []
lines = lines[1:-1]
return [l.split()[0] for l in lines]
return [line.split()[0] for line in lines]
def main():

22
fdroidserver/lint.py
View File

@ -189,9 +189,9 @@ def check_regexes(app):
v = app.get(f)
t = metadata.fieldtype(f)
if t == metadata.TYPE_MULTILINE:
for l in v.splitlines():
if m.match(l):
yield "%s at line '%s': %s" % (f, l, r)
for line in v.splitlines():
if m.match(line):
yield "%s at line '%s': %s" % (f, line, r)
else:
if v is None:
continue
@ -345,12 +345,12 @@ def check_duplicates(app):
yield _("Description '%s' is just the app's summary") % app.Summary
seenlines = set()
for l in app.Description.splitlines():
if len(l) < 1:
for line in app.Description.splitlines():
if len(line) < 1:
continue
if l in seenlines:
if line in seenlines:
yield _("Description has a duplicate line")
seenlines.add(l)
seenlines.add(line)
desc_url = re.compile(r'(^|[^[])\[([^ ]+)( |\]|$)')
@ -369,18 +369,18 @@ def check_bulleted_lists(app):
validchars = ['*', '#']
lchar = ''
lcount = 0
for l in app.Description.splitlines():
if len(l) < 1:
for line in app.Description.splitlines():
if len(line) < 1:
lcount = 0
continue
if l[0] == lchar and l[1] == ' ':
if line[0] == lchar and line[1] == ' ':
lcount += 1
if lcount > 2 and lchar not in validchars:
yield _("Description has a list (%s) but it isn't bulleted (*) nor numbered (#)") % lchar
break
else:
lchar = l[0]
lchar = line[0]
lcount = 1

2
fdroidserver/scanner.py
View File

@ -250,7 +250,7 @@ def scan_source(build_dir, build=metadata.Build()):
if is_used_by_gradle(line):
for name in suspects_found(line):
count += handleproblem('usual suspect \'%s\' at line %d' % (name, i + 1), path_in_build_dir, filepath)
noncomment_lines = [l for l in lines if not common.gradle_comment.match(l)]
noncomment_lines = [line for line in lines if not common.gradle_comment.match(line)]
joined = re.sub(r'[\n\r\s]+', ' ', ' '.join(noncomment_lines))
for m in gradle_mavenrepo.finditer(joined):
url = m.group(2)