From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Tue, 13 Jan 2015 08:26:30 +0000 (+0000)
Subject: Fix PEP8 issues from latest pull request
X-Git-Tag: 0.4.0~138
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=24aaa568da4b79b6139938ecc939a02715f7d3d9;p=fdroidserver.git

Fix PEP8 issues from latest pull request
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 28a9baca..189ffbd4 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1898,9 +1898,9 @@ def compare_apks(apk1, apk2, tmp_dir):
         return("Failed to unpack " + apk2)
 
     # try to find apktool in the path, if it hasn't been manually configed
-    if not 'apktool' in config:
+    if 'apktool' not in config:
         tmp = find_command('apktool')
-        if not tmp is None:
+        if tmp is not None:
             config['apktool'] = tmp
     if 'apktool' in config:
         if subprocess.call([config['apktool'], 'd', os.path.abspath(apk1), '--output', 'apktool'],
@@ -1914,7 +1914,7 @@ def compare_apks(apk1, apk2, tmp_dir):
     lines = p.output.splitlines()
     if len(lines) != 1 or 'META-INF' not in lines[0]:
         meld = find_command('meld')
-        if not meld is None:
+        if meld is not None:
             p = FDroidPopen(['meld', apk1dir, apk2dir], output=False)
         return("Unexpected diff output - " + p.output)