From: Daniel Martí Date: Wed, 28 May 2014 07:33:14 +0000 (+0200) Subject: Fix some more pep8 warnings X-Git-Tag: 0.2~59 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0f0ccdb1e1bf393cd206b44bd221ae2569328b3a;p=fdroidserver.git Fix some more pep8 warnings --- diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index cb895af4..6b4831d4 100644 --- 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 193b4443..980a3837 100644 --- 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 6d4982ab..0a46e3be 100644 --- 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 962a0e9c..9d26d5e9 100644 --- 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 ba3245bc..8f189052 100644 --- 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']