Fix some more pep8 warnings

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index cb895af4ada4d09a7cab24e1aaf89465ad714f8d..6b4831d47da4dbfb42a571abc6d54afd11d56b14 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -44,7 +44,7 @@ def check_http(app):
 
     try:
 
-        if not 'Update Check Data' in app:
+        if 'Update Check Data' not in app:
             raise Exception('Missing Update Check Data')
 
         urlcode, codeex, urlver, verex = app['Update Check Data'].split('|')

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 193b444382bb45d4508f87bdaefff68f993bd5ff..980a3837d00980991463627f745b6b907e8ab1a2 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -280,7 +280,7 @@ def getvcs(vcstype, remote, local):
 
 
 def getsrclibvcs(name):
-    if not name in metadata.srclibs:
+    if name not in metadata.srclibs:
         raise VCSException("Missing srclib " + name)
     return metadata.srclibs[name]['Repo Type']
 
@@ -939,7 +939,7 @@ def getsrclib(spec, srclib_dir, srclibpaths=[], subdir=None,
         if '/' in name:
             name, subdir = name.split('/', 1)
 
-    if not name in metadata.srclibs:
+    if name not in metadata.srclibs:
         raise BuildException('srclib ' + name + ' not found.')
 
     srclib = metadata.srclibs[name]
@@ -1434,7 +1434,7 @@ class KnownApks:
     # Record an apk (if it's new, otherwise does nothing)
     # Returns the date it was added.
     def recordapk(self, apk, app):
-        if not apk in self.apks:
+        if apk not in self.apks:
             self.apks[apk] = (app, time.gmtime(time.time()))
             self.changed = True
         _, added = self.apks[apk]

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 6d4982abc1e1a5a9ec3421e9769d26f071f31ae4..0a46e3beef8bc4ca34f06287c2abd872b2d4240e 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -25,6 +25,7 @@ import logging
 
 srclibs = {}
 
+
 class MetaDataException(Exception):
     def __init__(self, value):
         self.value = value

diff --git a/fdroidserver/readmeta.py b/fdroidserver/readmeta.py
index 962a0e9c089f9ae47999d460976072e8022820e2..9d26d5e99a57c100866f0f92f1b80e1e7dcc37cd 100644 (file)
--- a/fdroidserver/readmeta.py
+++ b/fdroidserver/readmeta.py
@@ -20,6 +20,7 @@
 import common
 import metadata
 
+
 def main():
 
     common.read_config(None)

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index ba3245bcc2ed5ba05b8793af46777ccd9befe63e..8f18905283b3cb174b228d5b951c9e8280fbcf4a 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -129,7 +129,7 @@ def update_wiki(apps, apks):
             if 'disable' in thisbuild:
                 if thisbuild['vercode'] == app['Current Version Code']:
                     cantupdate = True
-                #TODO: Nasty: vercode is a string in the build, and an int elsewhere
+                # TODO: Nasty: vercode is a string in the build, and an int elsewhere
                 apklist.append({'versioncode': int(thisbuild['vercode']),
                                 'version': thisbuild['version'],
                                 'buildproblem': thisbuild['disable']