From 0fbd04f1c25170d2bd566225af17cc97c2a9d5e8 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 11 May 2021 20:25:51 +0200
Subject: [PATCH] remove redundant imports and pointless code

---
 fdroidserver/index.py                | 1 -
 fdroidserver/init.py                 | 3 ---
 fdroidserver/metadata.py             | 4 ----
 fdroidserver/update.py               | 1 -
 locale/pick-complete-translations.py | 1 -
 5 files changed, 10 deletions(-)

diff --git a/fdroidserver/index.py b/fdroidserver/index.py
index 10dea357..1f30bd48 100644
--- a/fdroidserver/index.py
+++ b/fdroidserver/index.py
@@ -957,7 +957,6 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fing
                         % repo_icon)
         os.makedirs(os.path.dirname(iconfilename), exist_ok=True)
         try:
-            import qrcode
             qrcode.make(common.config['repo_url']).save(iconfilename)
         except Exception:
             exampleicon = os.path.join(common.get_examples_dir(),
diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 8291612d..e66d4daa 100644
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -66,7 +66,6 @@ def main():
                         help=_("Do not prompt for Android SDK path, just fail"))
     options = parser.parse_args()
 
-    aapt = None
     fdroiddir = os.getcwd()
     test_config = dict()
     examplesdir = common.get_examples_dir()
@@ -227,8 +226,6 @@ def main():
     msg = '\n'
     msg += _('Built repo based in "%s" with this config:') % fdroiddir
     msg += '\n\n  Android SDK:\t\t\t' + config['sdk_path']
-    if aapt:
-        msg += '\n  Android SDK Build Tools:\t' + os.path.dirname(aapt)
     msg += '\n  Android NDK r12b (optional):\t$ANDROID_NDK'
     msg += '\n  ' + _('Keystore for signing key:\t') + keystore
     if repo_keyalias is not None:
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index d5911a8d..597c4cd2 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -890,10 +890,6 @@ def write_yaml(mf, app):
     _yaml_bools_plus_lists.extend(_yaml_bools_false)
     _yaml_bools_plus_lists.extend([[x] for x in _yaml_bools_false])
 
-    def _class_as_dict_representer(dumper, data):
-        '''Creates a YAML representation of a App/Build instance'''
-        return dumper.represent_dict(data)
-
     def _field_to_yaml(typ, value):
         if typ is TYPE_STRING:
             if value in _yaml_bools_plus_lists:
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 0866d9f0..9c563381 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -2067,7 +2067,6 @@ def create_metadata_from_template(apk):
     template: field sort order, empty field value, formatting, etc.
     '''
 
-    import yaml
     if os.path.exists('template.yml'):
         with open('template.yml') as f:
             metatxt = f.read()
diff --git a/locale/pick-complete-translations.py b/locale/pick-complete-translations.py
index 99c1c125..3f343685 100755
--- a/locale/pick-complete-translations.py
+++ b/locale/pick-complete-translations.py
@@ -7,7 +7,6 @@ import os
 import re
 import requests
 import subprocess
-import sys
 
 
 projectbasedir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))