style(pep8): Use pep8-compliant code style

Author: duanhongyi

rootfs/api/models/app.py

@@ -158,15 +158,15 @@ def _get_entrypoint(self, container_type):
             entrypoint = ['/bin/bash', '-c']
 
         return entrypoint
-    
+
     def _refresh_tls(self, certs_auto_enabled, hosts):
         namespace = name = self.id
         try:
             data = self._scheduler.certificate.get(namespace, name).json()
         except KubeException:
             self.log("certificate {} does not exist".format(namespace), level=logging.INFO)
             data = None
-        
+
         if certs_auto_enabled:
             if data:
                 version = data["metadata"]["resourceVersion"]
@@ -177,7 +177,7 @@ def _refresh_tls(self, certs_auto_enabled, hosts):
                     namespace, name, settings.INGRESS_CLASS, hosts)
         elif data:
             self._scheduler.certificate.delete(namespace, name)
-    
+
     def _refresh_ingress(self, hosts, tls_map, ssl_redirect):
         ingress = namespace = self.id
         # Put Ingress
@@ -187,7 +187,8 @@ def _refresh_ingress(self, hosts, tls_map, ssl_redirect):
             "ssl_redirect": ssl_redirect
         }
         whitelist = self.appsettings_set.latest().whitelist
-        if whitelist: kwargs.update({"whitelist": whitelist})
+        if whitelist:
+            kwargs.update({"whitelist": whitelist})
         data = self._scheduler.ingress.get(namespace, ingress).json()
         version = data["metadata"]["resourceVersion"]
         self._scheduler.ingress.put(
@@ -217,9 +218,10 @@ def _refresh_ingress_and_tls(self):
                 tls_map[secret_name].append(host)
         self._refresh_ingress(hosts, tls_map, ssl_redirect)
         self._refresh_tls(certs_auto_enabled, hosts)
-    
+
     def refresh(self):
-        if not getattr(self, "refresh_enabled", True): return
+        if not getattr(self, "refresh_enabled", True):
+            return
         self._refresh_ingress_and_tls()
 
     def log(self, message, level=logging.INFO):

rootfs/api/models/tls.py

@@ -31,11 +31,9 @@ def _check_previous_tls_settings(self):
                 if previous_tls_settings.https_enforced == self.https_enforced:
                     raise AlreadyExists(
                         "{} changed nothing".format(self.owner))
-                self.certs_auto_enabled = \
-                        previous_tls_settings.certs_auto_enabled
+                self.certs_auto_enabled = previous_tls_settings.certs_auto_enabled
             elif self.certs_auto_enabled is not None:
-                if previous_tls_settings.certs_auto_enabled == \
-                        self.certs_auto_enabled:
+                if previous_tls_settings.certs_auto_enabled == self.certs_auto_enabled:
                     raise AlreadyExists(
                         "{} changed nothing".format(self.owner))
                 self.https_enforced = previous_tls_settings.https_enforced
@@ -52,7 +50,5 @@ def save(self, *args, **kwargs):
         finally:
             self.app.refresh()
 
-
     def sync(self):
         self.app.refresh()
-

rootfs/scheduler/resources/certificate.py

@@ -1,6 +1,5 @@
-import json
 from scheduler.resources import Resource
-from scheduler.exceptions import KubeHTTPException, KubeException
+from scheduler.exceptions import KubeHTTPException
 
 
 class Certificate(Resource):
@@ -32,15 +31,17 @@ def manifest(self, namespace, name, ingress_class, hosts, version=None):
                 }
             }
         }
-        if version: data["metadata"]["resourceVersion"] = version
+        if version:
+            data["metadata"]["resourceVersion"] = version
         return data
 
     def get(self, namespace, name=None, **kwargs):
         """
         Fetch a single certificate or a list of certificates
         """
         if name is not None:
-            url = "/apis/certmanager.k8s.io/v1alpha1/namespaces/%s/certificates/%s" % (namespace, name)
+            url = "/apis/certmanager.k8s.io/v1alpha1/namespaces/%s/certificates/%s" % (
+                namespace, name)
             message = 'get certificate ' + name
         else:
             url = "/apis/certmanager.k8s.io/v1alpha1/namespaces/%s/certificates" % namespace
@@ -78,4 +79,4 @@ def delete(self, namespace, name):
         response = self.http_delete(url)
         if self.unhealthy(response.status_code):
             raise KubeHTTPException(response, 'delete certificate ' + name)
-        return response
+        return response

rootfs/scheduler/resources/ingress.py

@@ -40,8 +40,10 @@ def manifest(self, ingress, ingress_class, namespace, **kwargs):
             data["metadata"]["annotations"].update({
                 "kubernetes.io/ingress.class": ingress_class
             })
-        if tls: data["spec"]["tls"] = tls
-        if version: data["metadata"]["resourceVersion"] = version
+        if tls:
+            data["spec"]["tls"] = tls
+        if version:
+            data["metadata"]["resourceVersion"] = version
         return data
 
 
@@ -61,6 +63,8 @@ def manifest(self, ingress, ingress_class, namespace, **kwargs):
                 "nginx.ingress.kubernetes.io/ssl-redirect": ssl_redirect
             })
         return data
+
+
 MANIFEAT_CLASSES["nginx"] = NginxManifest
 
 
@@ -81,6 +85,8 @@ def manifest(self, ingress, ingress_class, namespace, **kwargs):
                 "ingress.kubernetes.io/ssl-redirect": ssl_redirect
             })
         return data
+
+
 MANIFEAT_CLASSES["traefik"] = TraefikManifest
 
 

rootfs/scheduler/resources/secret.py

@@ -112,4 +112,4 @@ def delete(self, namespace, name):
                 'delete Secret "{}" in Namespace "{}"', name, namespace
             )
 
-        return response
+        return response

rootfs/scheduler/tests/test_ingress.py

@@ -13,8 +13,8 @@ class IngressTest(TestCase):
     def test_create_ingress(self):
         # Ingress assumes that the namespace and ingress name are always the same
         self.scheduler.ns.create("test-ingress")
-        self.scheduler.ingress.create("test-ingress", "nginx", "test-ingress",
-            hosts=["test-ingress"], tls=[])
+        self.scheduler.ingress.create(
+            "test-ingress", "nginx", "test-ingress", hosts=["test-ingress"], tls=[])
 
     def test_get_ingresses(self):
         response = self.scheduler.ingress.get("test-ingress")