mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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"]) p = SdkToolsPopen(['adb', "devices"])
if p.returncode != 0: if p.returncode != 0:
raise FDroidException("An error occured when finding devices: %s" % p.output) 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: if len(lines) < 3:
return [] return []
lines = lines[1:-1] lines = lines[1:-1]
return [l.split()[0] for l in lines] return [line.split()[0] for line in lines]
def main(): def main():

22
fdroidserver/lint.py
View file

@ -189,9 +189,9 @@ def check_regexes(app):
v = app.get(f) v = app.get(f)
t = metadata.fieldtype(f) t = metadata.fieldtype(f)
if t == metadata.TYPE_MULTILINE: if t == metadata.TYPE_MULTILINE:
for l in v.splitlines(): for line in v.splitlines():
if m.match(l): if m.match(line):
yield "%s at line '%s': %s" % (f, l, r) yield "%s at line '%s': %s" % (f, line, r)
else: else:
if v is None: if v is None:
continue continue
@ -345,12 +345,12 @@ def check_duplicates(app):
yield _("Description '%s' is just the app's summary") % app.Summary yield _("Description '%s' is just the app's summary") % app.Summary
seenlines = set() seenlines = set()
for l in app.Description.splitlines(): for line in app.Description.splitlines():
if len(l) < 1: if len(line) < 1:
continue continue
if l in seenlines: if line in seenlines:
yield _("Description has a duplicate line") yield _("Description has a duplicate line")
seenlines.add(l) seenlines.add(line)
desc_url = re.compile(r'(^|[^[])\[([^ ]+)( |\]|$)') desc_url = re.compile(r'(^|[^[])\[([^ ]+)( |\]|$)')
@ -369,18 +369,18 @@ def check_bulleted_lists(app):
validchars = ['*', '#'] validchars = ['*', '#']
lchar = '' lchar = ''
lcount = 0 lcount = 0
for l in app.Description.splitlines(): for line in app.Description.splitlines():
if len(l) < 1: if len(line) < 1:
lcount = 0 lcount = 0
continue continue
if l[0] == lchar and l[1] == ' ': if line[0] == lchar and line[1] == ' ':
lcount += 1 lcount += 1
if lcount > 2 and lchar not in validchars: if lcount > 2 and lchar not in validchars:
yield _("Description has a list (%s) but it isn't bulleted (*) nor numbered (#)") % lchar yield _("Description has a list (%s) but it isn't bulleted (*) nor numbered (#)") % lchar
break break
else: else:
lchar = l[0] lchar = line[0]
lcount = 1 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): if is_used_by_gradle(line):
for name in suspects_found(line): for name in suspects_found(line):
count += handleproblem('usual suspect \'%s\' at line %d' % (name, i + 1), path_in_build_dir, filepath) 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)) joined = re.sub(r'[\n\r\s]+', ' ', ' '.join(noncomment_lines))
for m in gradle_mavenrepo.finditer(joined): for m in gradle_mavenrepo.finditer(joined):
url = m.group(2) url = m.group(2)