Apply some autopep8-python2 suggestions

fdroid

@@ -40,7 +40,7 @@ commands = {
     "scanner": "Scan the source code of a package",
     "stats": "Update the stats of the repo",
     "server": "Interact with the repo HTTP server",
-    }
+}
 
 
 def print_help():

fdroidserver/common.py

@@ -391,6 +391,7 @@ def getsrclibvcs(name):
 
 
 class vcs:
+
     def __init__(self, remote, local):
 
         # svn, git-svn and bzr may require auth
@@ -439,8 +440,7 @@ class vcs:
                     writeback = False
                 else:
                     deleterepo = True
-                    logging.info(
-                        "Repository details for %s changed - deleting" % (
+                    logging.info("Repository details for %s changed - deleting" % (
                         self.local))
             else:
                 deleterepo = True
@@ -592,7 +592,8 @@ class vcs_git(vcs):
     def latesttags(self, alltags, number):
         self.checkrepo()
         p = FDroidPopen(['echo "' + '\n'.join(alltags) + '" | '
-                        + 'xargs -I@ git log --format=format:"%at @%n" -1 @ | '
+                         +
+                         'xargs -I@ git log --format=format:"%at @%n" -1 @ | '
                          + 'sort -n | awk \'{print $2}\''],
                         cwd=self.local, shell=True, output=False)
         return p.output.splitlines()[-number:]
@@ -1005,6 +1006,7 @@ def parse_androidmanifests(paths, ignoreversions=None):
 
 
 class FDroidException(Exception):
+
     def __init__(self, value, detail=None):
         self.value = value
         self.detail = detail
@@ -1610,6 +1612,7 @@ def isApkDebuggable(apkfile, config):
 
 
 class AsynchronousFileReader(threading.Thread):
+
     '''
     Helper class to implement asynchronous reading of a file
     in a separate thread. Pushes read lines on a queue to

fdroidserver/lint.py

@@ -125,7 +125,7 @@ regex_pedantic = {
         (re.compile(r'.*[a-z0-9][.,!?][ $]'),
          "Punctuation should be avoided"),
     ],
-    }
+}
 
 
 def main():

fdroidserver/metadata.py

@@ -29,6 +29,7 @@ srclibs = None
 
 
 class MetaDataException(Exception):
+
     def __init__(self, value):
         self.value = value
 
@@ -69,7 +70,7 @@ app_defaults = OrderedDict([
     ('Current Version', ''),
     ('Current Version Code', '0'),
     ('No Source Since', ''),
-    ])
+])
 
 
 # In the order in which they are laid out on files
@@ -102,7 +103,7 @@ flag_defaults = OrderedDict([
     ('preassemble', []),
     ('antcommands', None),
     ('novcheck', False),
-    ])
+])
 
 
 # Designates a metadata field type and checks that it matches
@@ -222,7 +223,7 @@ valuetypes = {
                    r"^(Tags|Tags .+|RepoManifest|RepoManifest/.+|RepoTrunk|HTTP|Static|None)$", None,
                    ["Update Check Mode"],
                    [])
-    }
+}
 
 
 # Check an app's metadata information for integrity errors

makebuildserver

@@ -98,7 +98,7 @@ cachefiles = [
     ('Kivy-1.7.2.tar.gz',
      'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),
-    ]
+]
 
 if config['arch64']:
     cachefiles.extend([