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

ensure _ is used only for gettext strings

Browse source 
_ is often used for variables that are ignored, this makes that a bit more
explicit
!338
This commit is contained in:
Hans-Christoph Steiner 2017-09-15 21:48:45 +02:00
parent 53e4ec47a7
commit 255932453c
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/common.py
View file

@ -1656,7 +1656,7 @@ class KnownApks:
else: else:
apps[appid] = added apps[appid] = added
sortedapps = sorted(apps.items(), key=operator.itemgetter(1))[-num:] sortedapps = sorted(apps.items(), key=operator.itemgetter(1))[-num:]
lst = [app for app, _ in sortedapps] lst = [app for app, _ignored in sortedapps]
lst.reverse() lst.reverse()
return lst return lst

6
fdroidserver/metadata.py
View file

@ -732,7 +732,7 @@ def read_metadata(xref=True, check_vcs=[]):
+ glob.glob('.fdroid.txt') + glob.glob('.fdroid.txt')
+ glob.glob('.fdroid.json') + glob.glob('.fdroid.json')
+ glob.glob('.fdroid.yml')): + glob.glob('.fdroid.yml')):
packageName, _ = fdroidserver.common.get_extension(os.path.basename(metadatapath)) packageName, _ignored = fdroidserver.common.get_extension(os.path.basename(metadatapath))
if packageName in apps: if packageName in apps:
warn_or_exception("Found multiple metadata files for " + packageName) warn_or_exception("Found multiple metadata files for " + packageName)
app = parse_metadata(metadatapath, packageName in check_vcs) app = parse_metadata(metadatapath, packageName in check_vcs)
@ -777,7 +777,7 @@ def get_default_app_info(metadatapath=None):
if metadatapath is None: if metadatapath is None:
appid = None appid = None
else: else:
appid, _ = fdroidserver.common.get_extension(os.path.basename(metadatapath)) appid, _ignored = fdroidserver.common.get_extension(os.path.basename(metadatapath))
if appid == '.fdroid': # we have local metadata in the app's source if appid == '.fdroid': # we have local metadata in the app's source
if os.path.exists('AndroidManifest.xml'): if os.path.exists('AndroidManifest.xml'):
@ -929,7 +929,7 @@ def parse_metadata(metadatapath, check_vcs=False):
app = App() app = App()
app.metadatapath = metadatapath app.metadatapath = metadatapath
name, _ = fdroidserver.common.get_extension(os.path.basename(metadatapath)) name, _ignored = fdroidserver.common.get_extension(os.path.basename(metadatapath))
if name == '.fdroid': if name == '.fdroid':
check_vcs = False check_vcs = False
else: else:

2
fdroidserver/signatures.py
View file

@ -36,7 +36,7 @@ def extract_signature(apkpath):
raise FDroidException("no valid signature in '{}'".format(apkpath)) raise FDroidException("no valid signature in '{}'".format(apkpath))
logging.debug('signature okay: %s', apkpath) logging.debug('signature okay: %s', apkpath)
appid, vercode, _ = common.get_apk_id_aapt(apkpath) appid, vercode, _ignored = common.get_apk_id_aapt(apkpath)
sigdir = common.metadata_get_sigdir(appid, vercode) sigdir = common.metadata_get_sigdir(appid, vercode)
if not os.path.exists(sigdir): if not os.path.exists(sigdir):
os.makedirs(sigdir) os.makedirs(sigdir)