fix PEP8 "E226 missing whitespace around arithmetic operator"

diff --git a/fdroid b/fdroid
index 9b5e120c0c9ce3476826cfa3fb1c1638116ab804..c597eaead50e9f98fe4bdfe9991ee1015ee51d71 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -44,7 +44,7 @@ def print_help():
     print
     print "Valid commands are:"
     for cmd, summary in commands.items():
-        print "   " + cmd + ' '*(15-len(cmd)) + summary
+        print "   " + cmd + ' ' * (15 - len(cmd)) + summary
     print
 
 

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index e9e033b528a0f0f2976d52180ecb5db944a13db7..35ecaadbd30a44a1d865741ccf6ffefd4361fb8f 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -604,12 +604,14 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         if 'target' in thisbuild:
             target = thisbuild["target"].split('-')[1]
             FDroidPopen(['sed', '-i',
-                         's@<platform>[0-9]*</platform>@<platform>'+target+'</platform>@g',
+                         's@<platform>[0-9]*</platform>@<platform>'
+                         + target + '</platform>@g',
                          'pom.xml'],
                         cwd=root_dir)
             if '@' in thisbuild['maven']:
                 FDroidPopen(['sed', '-i',
-                             's@<platform>[0-9]*</platform>@<platform>'+target+'</platform>@g',
+                             's@<platform>[0-9]*</platform>@<platform>'
+                             + target + '</platform>@g',
                              'pom.xml'],
                             cwd=maven_dir)
 
@@ -702,7 +704,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         if flavours_cmd:
             flavours_cmd = flavours_cmd[0].upper() + flavours_cmd[1:]
 
-        commands += ['assemble'+flavours_cmd+'Release']
+        commands += ['assemble' + flavours_cmd + 'Release']
 
         p = FDroidPopen(commands, cwd=gradle_dir)
 
@@ -753,7 +755,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
         else:
             name = '-'.join([basename, '-'.join(flavours), 'release', 'unsigned'])
         dd = os.path.normpath(dd)
-        src = os.path.join(dd, 'build', 'apk', name+'.apk')
+        src = os.path.join(dd, 'build', 'apk', name + '.apk')
     elif thisbuild['type'] == 'ant':
         stdout_apk = '\n'.join([
             line for line in p.stdout.splitlines() if '.apk' in line])

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index d55fef3a75ebbac715a451066355f5ce98d709d3..fc5257891d62ebd09d5722505ed57f3c517ed46d 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -183,7 +183,7 @@ def check_repomanifest(app, branch=None):
 
         if repotype == 'git':
             if branch:
-                branch = 'origin/'+branch
+                branch = 'origin/' + branch
             vcs.gotorevision(branch)
         elif repotype == 'git-svn':
             vcs.gotorevision(branch)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 1151b75e2ed7772682fe1653e4c4d51bd9d994aa..6bae404505d0ac9eedc92b2aeaa93f7de851bab5 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -460,7 +460,7 @@ class vcs_git(vcs):
 
     def latesttags(self, alltags, number):
         self.checkrepo()
-        p = SilentPopen(['echo "'+'\n'.join(alltags)+'" | \
+        p = SilentPopen(['echo "' + '\n'.join(alltags) + '" | \
                 xargs -I@ git log --format=format:"%at @%n" -1 @ | \
                 sort -n | awk \'{print $2}\''],
                         cwd=self.local, shell=True)
@@ -653,7 +653,7 @@ class vcs_hg(vcs):
         p = SilentPopen(['hg', 'purge', '--all'], cwd=self.local)
         # Also delete untracked files, we have to enable purge extension for that:
         if "'purge' is provided by the following extension" in p.stdout:
-            with open(self.local+"/.hg/hgrc", "a") as myfile:
+            with open(self.local + "/.hg/hgrc", "a") as myfile:
                 myfile.write("\n[extensions]\nhgext.purge=\n")
             p = SilentPopen(['hg', 'purge', '--all'], cwd=self.local)
             if p.returncode != 0:
@@ -713,9 +713,9 @@ def retrieve_string(app_dir, string, xmlfiles=None):
 
     string_search = None
     if string.startswith('@string/'):
-        string_search = re.compile(r'.*"'+string[8:]+'".*?>([^<]+?)<.*').search
+        string_search = re.compile(r'.*"' + string[8:] + '".*?>([^<]+?)<.*').search
     elif string.startswith('&') and string.endswith(';'):
-        string_search = re.compile(r'.*<!ENTITY.*'+string[1:-1]+'.*?"([^"]+?)".*>').search
+        string_search = re.compile(r'.*<!ENTITY.*' + string[1:-1] + '.*?"([^"]+?)".*>').search
 
     if string_search is not None:
         for xmlfile in xmlfiles:
@@ -1112,14 +1112,14 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
         if 'target' in build:
             n = build["target"].split('-')[1]
             FDroidPopen(['sed', '-i',
-                         's@compileSdkVersion *[0-9]*@compileSdkVersion '+n+'@g',
+                         's@compileSdkVersion *[0-9]*@compileSdkVersion ' + n + '@g',
                          'build.gradle'],
                         cwd=root_dir)
             if '@' in build['gradle']:
                 gradle_dir = os.path.join(root_dir, build['gradle'].split('@', 1)[1])
                 gradle_dir = os.path.normpath(gradle_dir)
                 FDroidPopen(['sed', '-i',
-                             's@compileSdkVersion *[0-9]*@compileSdkVersion '+n+'@g',
+                             's@compileSdkVersion *[0-9]*@compileSdkVersion ' + n + '@g',
                              'build.gradle'],
                             cwd=gradle_dir)
 
@@ -1258,7 +1258,7 @@ def getpaths(build_dir, build, field):
         p = p.strip()
         full_path = os.path.join(build_dir, p)
         full_path = os.path.normpath(full_path)
-        paths += [r[len(build_dir)+1:] for r in glob.glob(full_path)]
+        paths += [r[len(build_dir) + 1:] for r in glob.glob(full_path)]
     return paths
 
 
@@ -1335,7 +1335,7 @@ def scan_source(build_dir, root_dir, thisbuild):
 
             # Path (relative) to the file
             fp = os.path.join(r, curfile)
-            fd = fp[len(build_dir)+1:]
+            fd = fp[len(build_dir) + 1:]
 
             # Check if this file has been explicitly excluded from scanning
             if toignore(fd):

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 80297c16828e49a003750166e1f67285fc7d7e87..820ce05b0629fe6d0447c9adc68fada3fc3d7e61 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -293,7 +293,7 @@ class DescriptionFormatter:
                     urltext = url
                 linkified_html += '<a href="' + url + '">' + cgi.escape(urltext) + '</a>'
                 linkified_plain += urltext
-                txt = txt[index+2:]
+                txt = txt[index + 2:]
             else:
                 index = txt.find("]")
                 if index == -1:
@@ -309,7 +309,7 @@ class DescriptionFormatter:
                 linkified_plain += urltxt
                 if urltxt != url:
                     linkified_plain += ' (' + url + ')'
-                txt = txt[index+1:]
+                txt = txt[index + 1:]
 
     def addtext(self, txt):
         p, h = self.linkify(txt)
@@ -550,7 +550,7 @@ def parse_metadata(metafile):
             commit = 'unknown - see disabled'
             index = parts[2].rfind('at ')
             if index != -1:
-                commit = parts[2][index+3:]
+                commit = parts[2][index + 3:]
                 if commit.endswith(')'):
                     commit = commit[:-1]
             thisbuild['commit'] = commit
@@ -629,9 +629,9 @@ def parse_metadata(metafile):
             try:
                 field, value = line.split(':', 1)
             except ValueError:
-                raise MetaDataException("Invalid metadata in "+linedesc)
+                raise MetaDataException("Invalid metadata in " + linedesc)
             if field != field.strip() or value != value.strip():
-                raise MetaDataException("Extra spacing found in "+linedesc)
+                raise MetaDataException("Extra spacing found in " + linedesc)
 
             # Translate obsolete fields...
             if field == 'Market Version':

diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index 058461b2dbf1cda0fe8f402beff400b98f343cd1..9c373a10748eae4f2766e0cf418b5a02e7608ca7 100644 (file)
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -47,7 +47,7 @@ def main():
 
     for app in apps:
         logging.info("Writing " + app['id'])
-        metadata.write_metadata(os.path.join('metadata', app['id'])+'.txt', app)
+        metadata.write_metadata(os.path.join('metadata', app['id']) + '.txt', app)
 
     logging.info("Finished.")
 

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index ad64ca9d0b83cab19b97535babc0cec2b4b2819c..a4500381afa2ac93f278c10666e257c5e0cfb5f6 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -754,9 +754,9 @@ def make_index(apps, apks, repodir, archive, categories):
 
         # Check for duplicates - they will make the client unhappy...
         for i in range(len(apklist) - 1):
-            if apklist[i]['versioncode'] == apklist[i+1]['versioncode']:
+            if apklist[i]['versioncode'] == apklist[i + 1]['versioncode']:
                 logging.critical("duplicate versions: '%s' - '%s'" % (
-                    apklist[i]['apkname'], apklist[i+1]['apkname']))
+                    apklist[i]['apkname'], apklist[i + 1]['apkname']))
                 sys.exit(1)
 
         for apk in apklist:

diff --git a/setup.py b/setup.py
index b4dd7e5e86cee5c4ab2e79104c933140a2b3ed28..a3fcdcc8b49ed4929323339e27b59079837b5211 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ setup(name='fdroidserver',
       scripts=['fdroid', 'fd-commit'],
       data_files=[
         (sys.prefix + '/share/doc/fdroidserver/examples',
-         [ 'buildserver/config.buildserver.py',
+         ['buildserver/config.buildserver.py',
            'examples/config.py',
            'examples/makebs.config.py',
            'examples/opensc-fdroid.cfg',