all: make newer pycodestyle happy

Apparently the "two empty lines" rule is now stricter.

diff --git a/fdroid b/fdroid
index 53cc00c5dcc5eff9a1bf1e65fdf261300a28141b..af670d1b79b328ccaf863a211fed7987610537bb 100755 (executable)
--- a/fdroid
+++ b/fdroid
@@ -143,5 +143,6 @@ def main():
         raise
     sys.exit(0)
 
+
 if __name__ == "__main__":
     main()

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index cbbed3cd987278abc8b9ca4a077383f43f44ad43..ac9ae5529a831022bbfe6ecaf4a0dc523e0f9ab7 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -995,6 +995,7 @@ def parse_commandline():
 
     return options, parser
 
+
 options = None
 config = None
 
@@ -1191,5 +1192,6 @@ def main():
 
     sys.exit(0)
 
+
 if __name__ == "__main__":
     main()

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 2cc21e564a8fd8d230522afcc64f06c18be0114f..43447ca8f46fe682a14cfdf339a6f7be454a5199 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -574,5 +574,6 @@ def main():
 
     logging.info("Finished.")
 
+
 if __name__ == "__main__":
     main()

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 08708f3183aa16af8bdf2095eb77533a27e4b22b..80eb8a0e8c631305f70d17505b156909cc9b33f9 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1273,6 +1273,7 @@ def getsrclib(spec, srclib_dir, subdir=None, basepath=False,
 
     return (name, number, libdir)
 
+
 gradle_version_regex = re.compile(r"[^/]*'com\.android\.tools\.build:gradle:([^\.]+\.[^\.]+).*'.*")
 
 
@@ -1879,6 +1880,7 @@ def place_srclib(root_dir, number, libpath):
         if not placed:
             o.write('android.library.reference.%d=%s\n' % (number, relpath))
 
+
 apk_sigfile = re.compile(r'META-INF/[0-9A-Za-z]+\.(SF|RSA|DSA|EC)')
 
 
@@ -1913,6 +1915,7 @@ def verify_apks(signed_apk, unsigned_apk, tmp_dir):
     logging.info("...successfully verified")
     return None
 
+
 apk_badchars = re.compile('''[/ :;'"]''')
 
 

diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index 97c82f6fd0db5469b91c9a6266c9c626141a0bb6..60146536c3a162bb45ce1e9dcc27451ca0e4972b 100644 (file)
--- a/fdroidserver/import.py
+++ b/fdroidserver/import.py
@@ -67,6 +67,7 @@ def getrepofrompage(url):
 
     return (None, "No information found." + page)
 
+
 config = None
 options = None
 

diff --git a/fdroidserver/install.py b/fdroidserver/install.py
index 350003ac7e8cc9b9e0f77785446a91c46b4bb190..022b6262eb691a69c471f463b4e26224efd4a85c 100644 (file)
--- a/fdroidserver/install.py
+++ b/fdroidserver/install.py
@@ -114,5 +114,6 @@ def main():
 
     logging.info("\nFinished")
 
+
 if __name__ == "__main__":
     main()

diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index 41d4b21f43b688955fe59bad5e1b63d2e425bf20..fb35d9cb28426945f502fc701e328807162320d7 100644 (file)
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -33,6 +33,7 @@ def enforce_https(domain):
     return (re.compile(r'.*[^sS]://[^/]*' + re.escape(domain) + r'(/.*)?'),
             domain + " URLs should always use https://")
 
+
 https_enforcings = [
     enforce_https('github.com'),
     enforce_https('gitlab.com'),
@@ -47,6 +48,7 @@ def forbid_shortener(domain):
     return (re.compile(r'https?://[^/]*' + re.escape(domain) + r'/.*'),
             "URL shorteners should not be used")
 
+
 http_url_shorteners = [
     forbid_shortener('goo.gl'),
     forbid_shortener('t.co'),
@@ -191,6 +193,7 @@ def check_useless_fields(app):
     if app.UpdateCheckName == app.id:
         yield "Update Check Name is set to the known app id - it can be removed"
 
+
 filling_ucms = re.compile(r'^(Tags.*|RepoManifest.*)')
 
 
@@ -204,6 +207,7 @@ def check_empty_fields(app):
     if not app.Categories:
         yield "Categories are not set"
 
+
 all_categories = set([
     "Connectivity",
     "Development",

diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index e03efbeeb4d89d75af9ad5016dc7677ea678897c..ddfb19b531f7ca73817f87e0165734452aa7d950 100644 (file)
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -218,6 +218,7 @@ class App():
             else:
                 self.set_field(f, v)
 
+
 TYPE_UNKNOWN = 0
 TYPE_OBSOLETE = 1
 TYPE_STRING = 2
@@ -370,6 +371,7 @@ class Build():
         for f, v in d.items():
             self.set_flag(f, v)
 
+
 flagtypes = {
     'extlibs': TYPE_LIST,
     'srclibs': TYPE_LIST,
@@ -429,6 +431,7 @@ class FieldValidator():
                 warn_or_exception("'%s' is not a valid %s in %s. Regex pattern: %s"
                                   % (v, self.name, appid, self.matching))
 
+
 # Generic value types
 valuetypes = {
     FieldValidator("Integer",
@@ -819,6 +822,7 @@ def read_metadata(xref=True):
 
     return apps
 
+
 # Port legacy ';' separators
 list_sep = re.compile(r'[,;]')
 

diff --git a/fdroidserver/readmeta.py b/fdroidserver/readmeta.py
index 88ac7be357f9769148846d16b0b991d9a0433489..7ec1cb05a0d9a3f536b944707474dbbc32b24f6c 100644 (file)
--- a/fdroidserver/readmeta.py
+++ b/fdroidserver/readmeta.py
@@ -34,5 +34,6 @@ def main():
 
     metadata.read_metadata(xref=True)
 
+
 if __name__ == "__main__":
     main()

diff --git a/fdroidserver/rewritemeta.py b/fdroidserver/rewritemeta.py
index 25ed0875d069584791b724953525e827c2e77251..abd6b69aed7f2f5d60cc266cb318d2fea0e92d48 100644 (file)
--- a/fdroidserver/rewritemeta.py
+++ b/fdroidserver/rewritemeta.py
@@ -93,5 +93,6 @@ def main():
 
     logging.debug("Finished.")
 
+
 if __name__ == "__main__":
     main()

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 6e06f7c5558135168e63e43b05f5cd2fbed0c503..1ac76e591249a42f344d88fc272f0fd2601b5bfa 100644 (file)
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -325,5 +325,6 @@ def main():
     logging.info("Finished:")
     print("%d problems found" % probcount)
 
+
 if __name__ == "__main__":
     main()

diff --git a/fdroidserver/server.py b/fdroidserver/server.py
index ed39f0a7c48cb728b8bc78efcb73831958717aa6..e40bb55cd4d8251f4bc90ac51702faeac28b723d 100644 (file)
--- a/fdroidserver/server.py
+++ b/fdroidserver/server.py
@@ -318,5 +318,6 @@ def main():
 
     sys.exit(0)
 
+
 if __name__ == "__main__":
     main()

diff --git a/fdroidserver/signindex.py b/fdroidserver/signindex.py
index c550b995478563f239f06bf1aa373e711ccc0c32..caf9adb318599f4d4e2dce114aef8c84d117375a 100644 (file)
--- a/fdroidserver/signindex.py
+++ b/fdroidserver/signindex.py
@@ -75,5 +75,6 @@ def main():
     if signed == 0:
         logging.info("Nothing to do")
 
+
 if __name__ == "__main__":
     main()

diff --git a/fdroidserver/stats.py b/fdroidserver/stats.py
index 1f822ba085b500faf9ad5ec32ae2325bc973a6c1..8a1aec2a4322de6e6a8a6b1e8c6ee5bb73d3d35d 100644 (file)
--- a/fdroidserver/stats.py
+++ b/fdroidserver/stats.py
@@ -41,6 +41,7 @@ def carbon_send(key, value):
     s.sendall(msg)
     s.close()
 
+
 options = None
 config = None
 
@@ -299,5 +300,6 @@ def main():
 
     logging.info("Finished.")
 
+
 if __name__ == "__main__":
     main()

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 110de3ef986ad13f4556bd778e45620440eb4f92..fcf9c0929efb6bb1d6f5e0a01b8faa14ab969dc0 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1626,5 +1626,6 @@ def main():
 
     logging.info("Finished.")
 
+
 if __name__ == "__main__":
     main()

diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index 82a690c4eb05f8a5084769c7587357b1d6d53682..4c3819847edfc8dcc8cda5bd0daf975777993a6a 100644 (file)
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -96,5 +96,6 @@ def main():
     logging.info("{0} successfully verified".format(verified))
     logging.info("{0} NOT verified".format(notverified))
 
+
 if __name__ == "__main__":
     main()

diff --git a/makebuildserver b/makebuildserver
index 4a0e22b1a5363a981cce9bd76dcecd218127a2b0..96182e405384283b1683224d9f1e0f3dac7c33af 100755 (executable)
--- a/makebuildserver
+++ b/makebuildserver
@@ -44,6 +44,7 @@ def vagrant(params, cwd=None, printout=False):
         out = p.communicate()[0]
     return (p.returncode, out)
 
+
 boxfile = 'buildserver.box'
 serverdir = 'buildserver'
 
@@ -303,6 +304,7 @@ def sha256_for_file(path):
             s.update(data)
         return s.hexdigest()
 
+
 for srcurl, shasum in cachefiles:
     filename = os.path.basename(srcurl)
     local_filename = os.path.join(cachedir, filename)

diff --git a/tests/common.TestCase b/tests/common.TestCase
index d01568a2cab34934ac8084499e1a339d9962b928..c95ec9decc94c9f4f97b5e2b4ce135f39771c851 100755 (executable)
--- a/tests/common.TestCase
+++ b/tests/common.TestCase
@@ -157,6 +157,7 @@ class CommonTest(unittest.TestCase):
         p = fdroidserver.common.FDroidPopen(commands, stderr_to_stdout=False)
         self.assertEqual(p.output, 'stdout message\n')
 
+
 if __name__ == "__main__":
     parser = optparse.OptionParser()
     parser.add_option("-v", "--verbose", action="store_true", default=False,