[style] fix pep8 and confs

Fixes setup.cfg, adding current exclude rules, simplified tox.ini to use
setup.cfg and fixed all.

7 files changed, 13 insertions, 0 deletions

diff --git a/client/src/leap/soledad/client/api.py b/client/src/leap/soledad/client/api.py
index c560f661..da6eec66 100644
--- a/client/src/leap/soledad/client/api.py
+++ b/client/src/leap/soledad/client/api.py
@@ -935,6 +935,7 @@ def create_path_if_not_exists(path):
 # Monkey patching u1db to be able to provide a custom SSL cert
 # ----------------------------------------------------------------------------
 
+
 # We need a more reasonable timeout (in seconds)
 SOLEDAD_TIMEOUT = 120
 
diff --git a/client/src/leap/soledad/client/examples/benchmarks/measure_index_times.py b/client/src/leap/soledad/client/examples/benchmarks/measure_index_times.py
index 4fc91d9d..92bc85d6 100644
--- a/client/src/leap/soledad/client/examples/benchmarks/measure_index_times.py
+++ b/client/src/leap/soledad/client/examples/benchmarks/measure_index_times.py
@@ -58,6 +58,7 @@ def debug(*args):
     if not silent:
         print(*args)
 
+
 debug("[+] db path:", tmpdb)
 debug("[+] num docs", numdocs)
 
@@ -74,6 +75,7 @@ dbpool = adbapi.getConnectionPool(opts)
 def createDoc(doc):
     return dbpool.runU1DBQuery("create_doc", doc)
 
+
 db_indexes = {
     'by-chash': ['chash'],
     'by-number': ['number']}
@@ -168,6 +170,7 @@ def insert_docs(_):
         deferreds.append(d)
     return defer.gatherResults(deferreds, consumeErrors=True)
 
+
 d = create_indexes(None)
 d.addCallback(insert_docs)
 d.addCallback(get_from_index)
diff --git a/client/src/leap/soledad/client/examples/benchmarks/measure_index_times_custom_docid.py b/client/src/leap/soledad/client/examples/benchmarks/measure_index_times_custom_docid.py
index 38ea18a3..429566c7 100644
--- a/client/src/leap/soledad/client/examples/benchmarks/measure_index_times_custom_docid.py
+++ b/client/src/leap/soledad/client/examples/benchmarks/measure_index_times_custom_docid.py
@@ -58,6 +58,7 @@ def debug(*args):
     if not silent:
         print(*args)
 
+
 debug("[+] db path:", tmpdb)
 debug("[+] num docs", numdocs)
 
@@ -74,6 +75,7 @@ dbpool = adbapi.getConnectionPool(opts)
 def createDoc(doc, doc_id):
     return dbpool.runU1DBQuery("create_doc", doc, doc_id=doc_id)
 
+
 db_indexes = {
     'by-chash': ['chash'],
     'by-number': ['number']}
@@ -168,6 +170,7 @@ def insert_docs(_):
         deferreds.append(d)
     return defer.gatherResults(deferreds, consumeErrors=True)
 
+
 d = create_indexes(None)
 d.addCallback(insert_docs)
 d.addCallback(get_from_index)
diff --git a/client/src/leap/soledad/client/examples/run_benchmark.py b/client/src/leap/soledad/client/examples/run_benchmark.py
index 61621e89..ddedf433 100644
--- a/client/src/leap/soledad/client/examples/run_benchmark.py
+++ b/client/src/leap/soledad/client/examples/run_benchmark.py
@@ -14,6 +14,7 @@ cmd = "SILENT=1 TIMES={times} TMPDIR={tmpdir} python ./use_{version}api.py"
 def parse_time(r):
     return r.split('\n')[-1]
 
+
 with open(CSVFILE, 'w') as log:
 
     for times in range(0, 10000, 500):
diff --git a/client/src/leap/soledad/client/examples/use_adbapi.py b/client/src/leap/soledad/client/examples/use_adbapi.py
index a2683836..39301b41 100644
--- a/client/src/leap/soledad/client/examples/use_adbapi.py
+++ b/client/src/leap/soledad/client/examples/use_adbapi.py
@@ -39,6 +39,7 @@ def debug(*args):
     if not silent:
         print(*args)
 
+
 debug("[+] db path:", tmpdb)
 debug("[+] times", times)
 
@@ -87,6 +88,7 @@ def allDone(_):
         print((end_time - start_time).total_seconds())
     reactor.stop()
 
+
 deferreds = []
 payload = open('manifest.phk').read()
 
diff --git a/client/src/leap/soledad/client/examples/use_api.py b/client/src/leap/soledad/client/examples/use_api.py
index e2501c98..db77c4b3 100644
--- a/client/src/leap/soledad/client/examples/use_api.py
+++ b/client/src/leap/soledad/client/examples/use_api.py
@@ -36,6 +36,7 @@ def debug(*args):
     if not silent:
         print(*args)
 
+
 debug("[+] db path:", tmpdb)
 debug("[+] times", times)
 
@@ -52,6 +53,7 @@ db = sqlcipher.SQLCipherDatabase(opts)
 def allDone():
     debug("ALL DONE!")
 
+
 payload = open('manifest.phk').read()
 
 for i in range(times):
diff --git a/client/src/leap/soledad/client/sqlcipher.py b/client/src/leap/soledad/client/sqlcipher.py
index 6caa39cd..b9db3674 100644
--- a/client/src/leap/soledad/client/sqlcipher.py
+++ b/client/src/leap/soledad/client/sqlcipher.py
@@ -594,6 +594,7 @@ def soledad_doc_factory(doc_id=None, rev=None, json='{}', has_conflicts=False,
     return SoledadDocument(doc_id=doc_id, rev=rev, json=json,
                            has_conflicts=has_conflicts, syncable=syncable)
 
+
 sqlite_backend.SQLiteDatabase.register_implementation(SQLCipherDatabase)