fix PEP8 "E202 whitespace before ']' or '}'"

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 276efa82aee5236f440b72efbf93d07abba6a0a6..5e6f23f3552fee00ab759fadc108f9ba7889ffad 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -712,7 +712,7 @@ def manifest_paths(app_dir, flavour):
     possible_manifests = [os.path.join(app_dir, 'AndroidManifest.xml'),
             os.path.join(app_dir, 'src', 'main', 'AndroidManifest.xml'),
             os.path.join(app_dir, 'src', 'AndroidManifest.xml'),
-            os.path.join(app_dir, 'build.gradle') ]
+            os.path.join(app_dir, 'build.gradle')]
 
     if flavour:
         possible_manifests.append(
@@ -1040,9 +1040,9 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
         srclibpaths.append(basesrclib)
 
     # Update the local.properties file
-    localprops = [os.path.join(build_dir, 'local.properties') ]
+    localprops = [os.path.join(build_dir, 'local.properties')]
     if 'subdir' in build:
-        localprops += [os.path.join(root_dir, 'local.properties') ]
+        localprops += [os.path.join(root_dir, 'local.properties')]
     for path in localprops:
         if not os.path.isfile(path):
             continue

diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index efd12a912bb39f73869d8361b50eccb9df93a3f1..a95ee6fd8aaadc775a840eadb485d601c1c302f2 100644 (file)
--- 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'))):
@@ -87,7 +87,7 @@ def main():
     else:
 
         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():
         # Get device list each time to avoid device not found errors
@@ -97,7 +97,7 @@ def main():
         logging.info("Installing %s..." % apk)
         for dev in devs:
             logging.info("Installing %s on %s..." % (apk, dev))
-            p = FDroidPopen(["adb", "-s", dev, "install", apk ])
+            p = FDroidPopen(["adb", "-s", dev, "install", apk])
             fail= ""
             for line in p.stdout.splitlines():
                 if line.startswith("Failure"):

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

diff --git a/fdroidserver/server.py b/fdroidserver/server.py
index 9e17154bfb1d90719a87df7fcae0c72342cba1da..6c80a646e859fb1e7d69f9a8d751d36761ae5aa3 100644 (file)
--- a/fdroidserver/server.py
+++ b/fdroidserver/server.py
@@ -91,7 +91,7 @@ def update_awsbucket(repo_section):
             if upload:
                 if options.verbose:
                     logging.info(' uploading "' + file_to_upload + '"...')
-                extra = {'acl': 'public-read' }
+                extra = {'acl': 'public-read'}
                 if file_to_upload.endswith('.sig'):
                     extra['content_type'] = 'application/pgp-signature'
                 elif file_to_upload.endswith('.asc'):