fix PEP8 "E203 whitespace before ':' or ','"

This commit is contained in:
Hans-Christoph Steiner 2014-05-01 22:06:59 -04:00
parent fccb990521
commit f1812d5935
6 changed files with 20 additions and 20 deletions

View file

@ -141,6 +141,6 @@ build_server_always = False
# Limit in number of characters that fields can take up # Limit in number of characters that fields can take up
# Only the fields listed here are supported, defaults shown # Only the fields listed here are supported, defaults shown
char_limits = { char_limits = {
'Summary' : 50, 'Summary': 50,
'Description' : 1500 'Description': 1500
} }

View file

@ -268,7 +268,7 @@ def check_repotrunk(app, branch=None):
def check_gplay(app): def check_gplay(app):
time.sleep(15) time.sleep(15)
url = 'https://play.google.com/store/apps/details?id=' + app['id'] url = 'https://play.google.com/store/apps/details?id=' + app['id']
headers = {'User-Agent' : 'Mozilla/5.0 (X11; Linux i686; rv:18.0) Gecko/20100101 Firefox/18.0'} headers = {'User-Agent': 'Mozilla/5.0 (X11; Linux i686; rv:18.0) Gecko/20100101 Firefox/18.0'}
req = urllib2.Request(url, None, headers) req = urllib2.Request(url, None, headers)
try: try:
resp = urllib2.urlopen(req, None, 20) resp = urllib2.urlopen(req, None, 20)

View file

@ -50,8 +50,8 @@ def get_default_config():
'keystore': '$HOME/.local/share/fdroidserver/keystore.jks', 'keystore': '$HOME/.local/share/fdroidserver/keystore.jks',
'smartcardoptions': [], 'smartcardoptions': [],
'char_limits': { 'char_limits': {
'Summary' : 50, 'Summary': 50,
'Description' : 1500 'Description': 1500
}, },
'keyaliases': { }, 'keyaliases': { },
} }

View file

@ -68,7 +68,7 @@ def main():
if args: if args:
vercodes = common.read_pkg_args(args, True) vercodes = common.read_pkg_args(args, True)
apks = { appid : None for appid in vercodes } apks = { appid: None for appid in vercodes }
# Get the signed apk with the highest vercode # Get the signed apk with the highest vercode
for apkfile in sorted(glob.glob(os.path.join(output_dir, '*.apk'))): for apkfile in sorted(glob.glob(os.path.join(output_dir, '*.apk'))):
@ -86,7 +86,7 @@ def main():
else: else:
apks = { common.apknameinfo(apkfile)[0] : apkfile for apkfile in apks = { common.apknameinfo(apkfile)[0]: apkfile for apkfile in
sorted(glob.glob(os.path.join(output_dir, '*.apk'))) } sorted(glob.glob(os.path.join(output_dir, '*.apk'))) }
for appid, apk in apks.iteritems(): for appid, apk in apks.iteritems():

View file

@ -120,62 +120,62 @@ class FieldType():
# Generic value types # Generic value types
valuetypes = { valuetypes = {
'int' : FieldType("Integer", 'int': FieldType("Integer",
r'^[1-9][0-9]*$', None, r'^[1-9][0-9]*$', None,
[ 'FlattrID' ], [ 'FlattrID' ],
[ 'vercode' ]), [ 'vercode' ]),
'http' : FieldType("HTTP link", 'http': FieldType("HTTP link",
r'^http[s]?://', None, r'^http[s]?://', None,
[ "Web Site", "Source Code", "Issue Tracker", "Donate" ], []), [ "Web Site", "Source Code", "Issue Tracker", "Donate" ], []),
'bitcoin' : FieldType("Bitcoin address", 'bitcoin': FieldType("Bitcoin address",
r'^[a-zA-Z0-9]{27,34}$', None, r'^[a-zA-Z0-9]{27,34}$', None,
[ "Bitcoin" ], [ "Bitcoin" ],
[ ]), [ ]),
'litecoin' : FieldType("Litecoin address", 'litecoin': FieldType("Litecoin address",
r'^L[a-zA-Z0-9]{33}$', None, r'^L[a-zA-Z0-9]{33}$', None,
[ "Litecoin" ], [ "Litecoin" ],
[ ]), [ ]),
'dogecoin' : FieldType("Dogecoin address", 'dogecoin': FieldType("Dogecoin address",
r'^D[a-zA-Z0-9]{33}$', None, r'^D[a-zA-Z0-9]{33}$', None,
[ "Dogecoin" ], [ "Dogecoin" ],
[ ]), [ ]),
'Bool' : FieldType("Boolean", 'Bool': FieldType("Boolean",
['Yes', 'No'], None, ['Yes', 'No'], None,
[ "Requires Root" ], [ "Requires Root" ],
[ ]), [ ]),
'bool' : FieldType("Boolean", 'bool': FieldType("Boolean",
['yes', 'no'], None, ['yes', 'no'], None,
[ ], [ ],
[ 'submodules', 'oldsdkloc', 'forceversion', 'forcevercode', [ 'submodules', 'oldsdkloc', 'forceversion', 'forcevercode',
'novcheck' ]), 'novcheck' ]),
'Repo Type' : FieldType("Repo Type", 'Repo Type': FieldType("Repo Type",
[ 'git', 'git-svn', 'svn', 'hg', 'bzr', 'srclib' ], None, [ 'git', 'git-svn', 'svn', 'hg', 'bzr', 'srclib' ], None,
[ "Repo Type" ], [ "Repo Type" ],
[ ]), [ ]),
'archive' : FieldType("Archive Policy", 'archive': FieldType("Archive Policy",
r'^[0-9]+ versions$', None, r'^[0-9]+ versions$', None,
[ "Archive Policy" ], [ "Archive Policy" ],
[ ]), [ ]),
'antifeatures' : FieldType("Anti-Feature", 'antifeatures': FieldType("Anti-Feature",
[ "Ads", "Tracking", "NonFreeNet", "NonFreeDep", "NonFreeAdd", "UpstreamNonFree" ], ',', [ "Ads", "Tracking", "NonFreeNet", "NonFreeDep", "NonFreeAdd", "UpstreamNonFree" ], ',',
[ "AntiFeatures" ], [ "AntiFeatures" ],
[ ]), [ ]),
'autoupdatemodes' : FieldType("Auto Update Mode", 'autoupdatemodes': FieldType("Auto Update Mode",
r"^(Version .+|None)$", None, r"^(Version .+|None)$", None,
[ "Auto Update Mode" ], [ "Auto Update Mode" ],
[ ]), [ ]),
'updatecheckmodes' : FieldType("Update Check Mode", 'updatecheckmodes': FieldType("Update Check Mode",
r"^(Tags|Tags .+|RepoManifest|RepoManifest/.+|RepoTrunk|HTTP|Static|None)$", None, r"^(Tags|Tags .+|RepoManifest|RepoManifest/.+|RepoTrunk|HTTP|Static|None)$", None,
[ "Update Check Mode" ], [ "Update Check Mode" ],
[ ]) [ ])

View file

@ -813,7 +813,7 @@ def make_index(apps, apks, repodir, archive, categories):
sys.exit(1) sys.exit(1)
# Copy the repo icon into the repo directory... # Copy the repo icon into the repo directory...
icon_dir = os.path.join(repodir ,'icons') icon_dir = os.path.join(repodir, 'icons')
iconfilename = os.path.join(icon_dir, os.path.basename(config['repo_icon'])) iconfilename = os.path.join(icon_dir, os.path.basename(config['repo_icon']))
shutil.copyfile(config['repo_icon'], iconfilename) shutil.copyfile(config['repo_icon'], iconfilename)