mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 16:02:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace finds with pythonic terms

Browse source
This commit is contained in:
Daniel Martí 2013-12-20 09:34:03 +01:00
parent 8f3a2d4355
commit efc8317272
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/common.py
View file

@ -1361,7 +1361,7 @@ def isApkDebuggable(apkfile, config):
print "ERROR: Failed to get apk manifest information" print "ERROR: Failed to get apk manifest information"
sys.exit(1) sys.exit(1)
for line in output.splitlines(): for line in output.splitlines():
if line.find('android:debuggable') != -1 and not line.endswith('0x0'): if 'android:debuggable' in line and not line.endswith('0x0'):
return True return True
return False return False

14
fdroidserver/metadata.py
View file

@ -341,11 +341,10 @@ def parse_srclib(metafile, **kw):
if not line or line.startswith("#"): if not line or line.startswith("#"):
continue continue
index = line.find(':') try:
if index == -1: field, value = line.split(':',1)
except ValueError:
raise MetaDataException("Invalid metadata in " + metafile.name + " at: " + line) raise MetaDataException("Invalid metadata in " + metafile.name + " at: " + line)
field = line[:index]
value = line[index+1:]
if field == "Subdir": if field == "Subdir":
thisinfo[field] = value.split(',') thisinfo[field] = value.split(',')
@ -543,11 +542,10 @@ def parse_metadata(metafile):
if line.startswith("#"): if line.startswith("#"):
curcomments.append(line) curcomments.append(line)
continue continue
index = line.find(':') try:
if index == -1: field, value = line.split(':',1)
except ValueError:
raise MetaDataException("Invalid metadata in " + metafile.name + " at: " + line) raise MetaDataException("Invalid metadata in " + metafile.name + " at: " + line)
field = line[:index]
value = line[index+1:]
# Translate obsolete fields... # Translate obsolete fields...
if field == 'Market Version': if field == 'Market Version':

2
fdroidserver/verify.py
View file

@ -101,7 +101,7 @@ def main():
cwd=tmp_dir, stdout=subprocess.PIPE) cwd=tmp_dir, stdout=subprocess.PIPE)
out = p.communicate()[0] out = p.communicate()[0]
lines = out.splitlines() lines = out.splitlines()
if len(lines) != 1 or lines[0].find('META-INF') == -1: if len(lines) != 1 or 'META-INF' not in lines[0]:
raise Exception("Unexpected diff output - " + out) raise Exception("Unexpected diff output - " + out)
print "...successfully verified" print "...successfully verified"