From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 15 Sep 2017 19:48:45 +0000 (+0200)
Subject: ensure _ is used only for gettext strings
X-Git-Tag: 0.9~75^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=255932453ccd2b6f268e80f1ef92d8c65d9b5f50;p=fdroidserver.git

ensure _ is used only for gettext strings

_ is often used for variables that are ignored, this makes that a bit more
explicit
!338
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 863ba338..9b82cf30 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1656,7 +1656,7 @@ class KnownApks:
                 else:
                     apps[appid] = added
         sortedapps = sorted(apps.items(), key=operator.itemgetter(1))[-num:]
-        lst = [app for app, _ in sortedapps]
+        lst = [app for app, _ignored in sortedapps]
         lst.reverse()
         return lst
 
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index d1602d9e..16c40a88 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -732,7 +732,7 @@ def read_metadata(xref=True, check_vcs=[]):
                                + glob.glob('.fdroid.txt')
                                + glob.glob('.fdroid.json')
                                + 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:
             warn_or_exception("Found multiple metadata files for " + packageName)
         app = parse_metadata(metadatapath, packageName in check_vcs)
@@ -777,7 +777,7 @@ def get_default_app_info(metadatapath=None):
     if metadatapath is None:
         appid = None
     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 os.path.exists('AndroidManifest.xml'):
@@ -929,7 +929,7 @@ def parse_metadata(metadatapath, check_vcs=False):
 
     app = App()
     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':
         check_vcs = False
     else:
diff --git a/fdroidserver/signatures.py b/fdroidserver/signatures.py
index fb6c53a9..b5e7a773 100644
--- a/fdroidserver/signatures.py
+++ b/fdroidserver/signatures.py
@@ -36,7 +36,7 @@ def extract_signature(apkpath):
         raise FDroidException("no valid signature in '{}'".format(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)
     if not os.path.exists(sigdir):
         os.makedirs(sigdir)