From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 2 May 2014 02:06:59 +0000 (-0400)
Subject: fix PEP8 "E203 whitespace before ':' or ','"
X-Git-Tag: 0.2~89^2~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f1812d5935a7be71c21cb86782f5acc07243022d;p=fdroidserver.git

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

diff --git a/examples/config.py b/examples/config.py
index e04f8a93..b651ca7d 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -141,6 +141,6 @@ build_server_always = False
 # Limit in number of characters that fields can take up
 # Only the fields listed here are supported, defaults shown
 char_limits = {
-    'Summary' : 50,
-    'Description' : 1500
+    'Summary': 50,
+    'Description': 1500
 }
diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index d20ebefc..8ef0c4d3 100644
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -268,7 +268,7 @@ def check_repotrunk(app, branch=None):
 def check_gplay(app):
     time.sleep(15)
     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)
     try:
         resp = urllib2.urlopen(req, None, 20)
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 4803c4ff..46b0b917 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -50,8 +50,8 @@ def get_default_config():
         'keystore': '$HOME/.local/share/fdroidserver/keystore.jks',
         'smartcardoptions': [],
         'char_limits': {
-            'Summary' : 50,
-            'Description' : 1500
+            'Summary': 50,
+            'Description': 1500
         },
         'keyaliases': { },
     }
diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index ebdae6b7..d65751ca 100644
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -68,7 +68,7 @@ def main():
     if args:
 
         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
         for apkfile in sorted(glob.glob(os.path.join(output_dir, '*.apk'))):
@@ -86,7 +86,7 @@ def main():
 
     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'))) }
 
     for appid, apk in apks.iteritems():
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index cb034812..51597a0c 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -120,62 +120,62 @@ class FieldType():
 
 # Generic value types
 valuetypes = {
-    'int' : FieldType("Integer",
+    'int': FieldType("Integer",
         r'^[1-9][0-9]*$', None,
         [ 'FlattrID' ],
         [ 'vercode' ]),
 
-    'http' : FieldType("HTTP link",
+    'http': FieldType("HTTP link",
         r'^http[s]?://', None,
         [ "Web Site", "Source Code", "Issue Tracker", "Donate" ], []),
 
-    'bitcoin' : FieldType("Bitcoin address",
+    'bitcoin': FieldType("Bitcoin address",
         r'^[a-zA-Z0-9]{27,34}$', None,
         [ "Bitcoin" ],
         [ ]),
 
-    'litecoin' : FieldType("Litecoin address",
+    'litecoin': FieldType("Litecoin address",
         r'^L[a-zA-Z0-9]{33}$', None,
         [ "Litecoin" ],
         [ ]),
 
-    'dogecoin' : FieldType("Dogecoin address",
+    'dogecoin': FieldType("Dogecoin address",
         r'^D[a-zA-Z0-9]{33}$', None,
         [ "Dogecoin" ],
         [ ]),
 
-    'Bool' : FieldType("Boolean",
+    'Bool': FieldType("Boolean",
         ['Yes', 'No'], None,
         [ "Requires Root" ],
         [ ]),
 
-    'bool' : FieldType("Boolean",
+    'bool': FieldType("Boolean",
         ['yes', 'no'], None,
         [ ],
         [ 'submodules', 'oldsdkloc', 'forceversion', 'forcevercode',
             'novcheck' ]),
 
-    'Repo Type' : FieldType("Repo Type",
+    'Repo Type': FieldType("Repo Type",
         [ 'git', 'git-svn', 'svn', 'hg', 'bzr', 'srclib' ], None,
         [ "Repo Type" ],
         [ ]),
 
-    'archive' : FieldType("Archive Policy",
+    'archive': FieldType("Archive Policy",
         r'^[0-9]+ versions$', None,
         [ "Archive Policy" ],
         [ ]),
 
-    'antifeatures' : FieldType("Anti-Feature",
+    'antifeatures': FieldType("Anti-Feature",
         [ "Ads", "Tracking", "NonFreeNet", "NonFreeDep", "NonFreeAdd", "UpstreamNonFree" ], ',',
         [ "AntiFeatures" ],
         [ ]),
 
-    'autoupdatemodes' : FieldType("Auto Update Mode",
+    'autoupdatemodes': FieldType("Auto Update Mode",
         r"^(Version .+|None)$", None,
         [ "Auto Update Mode" ],
         [ ]),
 
-    'updatecheckmodes' : FieldType("Update Check Mode",
+    'updatecheckmodes': FieldType("Update Check Mode",
         r"^(Tags|Tags .+|RepoManifest|RepoManifest/.+|RepoTrunk|HTTP|Static|None)$", None,
         [ "Update Check Mode" ],
         [ ])
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index d2b02b7b..1b058d21 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -813,7 +813,7 @@ def make_index(apps, apks, repodir, archive, categories):
             sys.exit(1)
 
     # 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']))
     shutil.copyfile(config['repo_icon'], iconfilename)