From 77367f1bff3aadab8eae0e98d01aa3b9aa3d29ea Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 13 May 2020 22:21:46 +0200 Subject: [PATCH] server: disable extraneous HTTP errors in upload_apk_to_virustotal This should be in the lowest level so that both the low level call, upload_apk_to_virustotal(), and the next level up, upload_to_virustotal(), both inherit this. --- fdroidserver/server.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fdroidserver/server.py b/fdroidserver/server.py index e261222b..b7f4ce53 100644 --- a/fdroidserver/server.py +++ b/fdroidserver/server.py @@ -512,9 +512,6 @@ def upload_to_virustotal(repo_section, virustotal_apikey): import requests requests # stop unused import warning - logging.getLogger("urllib3").setLevel(logging.WARNING) - logging.getLogger("requests").setLevel(logging.WARNING) - if repo_section == 'repo': if not os.path.exists('virustotal'): os.mkdir('virustotal') @@ -534,6 +531,9 @@ def upload_apk_to_virustotal(virustotal_apikey, packageName, apkName, hash, versionCode, **kwargs): import requests + logging.getLogger("urllib3").setLevel(logging.WARNING) + logging.getLogger("requests").setLevel(logging.WARNING) + outputfilename = os.path.join('virustotal', packageName + '_' + str(versionCode) + '_' + hash + '.json')