all: flake8ize

kedifa/app.py

@@ -19,7 +19,6 @@
 # See https://www.nexedi.com/licensing for rationale and options.
 
 from cryptography import x509
-from cryptography.hazmat.primitives.serialization import Encoding
 from threading import local
 from wsgiref.simple_server import make_server
 import caucase.exceptions

kedifa/test.py

@@ -31,7 +31,6 @@ import requests
 import requests.exceptions
 import shutil
 import signal
-import sys
 import tarfile
 import tempfile
 import time
@@ -62,6 +61,7 @@ def findFreeTCPPort(ip=''):
     s.bind((ip, 0))
     return str(s.getsockname()[1])
 
+
 def retry(callback, try_count=10, try_delay=0.1):
     """
     Poll <callback> every <try_delay> for <try_count> times or until it returns
@@ -75,6 +75,7 @@ def retry(callback, try_count=10, try_delay=0.1):
       time.sleep(try_delay)
     return result
 
+
 def canConnect(caucase_url):
   """
   Returns True if a connection can be established to given address, False
@@ -97,13 +98,15 @@ class KedifaMixin(object):
 
 
 _clean_caucased_snapshot = None
+
+
 class KedifaCaucaseMixin(KedifaMixin):
   def _startCaucaseServer(self, argv=(), timeout=10):
     """
     Start caucased server
     """
-    ip, port = os.environ['SLAPOS_TEST_IPV6'],\
-       findFreeTCPPort(os.environ['SLAPOS_TEST_IPV6'])
+    ip, port = os.environ[
+      'SLAPOS_TEST_IPV6'], findFreeTCPPort(os.environ['SLAPOS_TEST_IPV6'])
     self.caucase_runtime = caucase_runtime = multiprocessing.Process(
       target=caucase.http.main,
       kwargs=dict(
@@ -120,8 +123,8 @@ class KedifaCaucaseMixin(KedifaMixin):
 
     if not retry(
       lambda: (
-        self.assertTrue(caucase_runtime.is_alive()) or
-        canConnect(self.caucase_url)
+        self.assertTrue(
+          caucase_runtime.is_alive()) or canConnect(self.caucase_url)
       ),
       try_count=timeout * 10,
     ):
@@ -141,7 +144,6 @@ class KedifaCaucaseMixin(KedifaMixin):
     if caucase_runtime.is_alive():
       raise ValueError('%r does not wish to die' % (caucase_runtime, ))
 
-
   def createKey(self):
     key = rsa.generate_private_key(
       public_exponent=65537, key_size=2048, backend=default_backend())
@@ -207,7 +209,7 @@ class KedifaCaucaseMixin(KedifaMixin):
     self.pem = certificate_pem + key_pem
 
   def setUpCaucase(self):
-    global _clean_caucased_snapshot # pylint: disable=global-statement
+    global _clean_caucased_snapshot  # pylint: disable=global-statement
     self.caucased = os.path.join(self.testdir, 'caucased')
     self.caucase_db = os.path.join(self.caucased, 'caucase.sqlite')
     self.caucase_service = os.path.join(self.testdir, 'service')
@@ -402,13 +404,14 @@ class KedifaIntegrationTest(KedifaCaucaseMixin, unittest.TestCase):
 
   def assertLastLogEntry(self, entry):
     tries_left = 5  # try few times, as server can store the log line a bit
-                    # later
+    # later
     while True:
       with open(self.logfile) as fh:
         last_log_line = fh.readlines()[-1]
       try:
         self.assertTrue(
-          entry in last_log_line, '%r not found in %r' % (entry, last_log_line))
+          entry in last_log_line, '%r not found in %r' % (
+            entry, last_log_line))
       except AssertionError:
         if tries_left == 0:
           raise

kedifa/updater.py

@@ -86,7 +86,7 @@ class Updater(object):
     except IOError:
       current = ''
 
-    if not(certificate):
+    if not (certificate):
       if fallback and not fallback_overridden:
         certificate = fallback
       elif not current and master_content is not None: