Address PEP8 issues

Author: András Váczi

patroni/api.py

@@ -677,7 +677,7 @@ def do_GET_metrics(self) -> None:
             metrics.append("patroni_multisite_switches{0} {1}"
                            .format(labels, patroni.multisite.site_switches))
 
-        self.write_response(200, '\n'.join(metrics)+'\n', content_type='text/plain')
+        self.write_response(200, '\n'.join(metrics) + '\n', content_type='text/plain')
 
     def do_GET_multisite(self):
         self._write_json_response(200, self.server.patroni.multisite.status())

patroni/ctl.py

@@ -1502,8 +1502,6 @@ def get_cluster_service_info(cluster: Dict[str, Any]) -> List[str]:
     """
     service_info: List[str] = []
 
-
-
     if 'multisite' in cluster:
         info = f"Multisite {cluster['multisite']['name'] or ''} is {cluster['multisite']['status'].lower()}"
         standby_config = cluster['multisite'].get('standby_config', {})

patroni/dcs/__init__.py

@@ -496,7 +496,8 @@ def from_node(version: _Version, value: Union[str, Dict[str, str]]) -> 'Failover
         if data.get('scheduled_at'):
             data['scheduled_at'] = dateutil.parser.parse(data['scheduled_at'])
 
-        return Failover(version, data.get('leader'), data.get('member'), data.get('scheduled_at'), data.get('target_site'))
+        return Failover(version, data.get('leader'), data.get('member'), data.get('scheduled_at'),
+                        data.get('target_site'))
 
     def __len__(self) -> int:
         """Implement ``len`` function capability.

patroni/dcs/etcd3.py

@@ -754,7 +754,8 @@ def _cluster_from_nodes(self, nodes: Dict[str, Any]) -> Cluster:
 
         # get leader
         leader = nodes.get(self._LEADER)
-        if not self._ctl and not self._multisite and leader and leader['value'] == self._name and self._lease != leader.get('lease'):
+        if not self._ctl and not self._multisite and leader and leader['value'] == self._name \
+           and self._lease != leader.get('lease'):
             logger.warning('I am the leader but not owner of the lease')
 
         if leader:

patroni/ha.py

@@ -360,7 +360,7 @@ def acquire_lock(self) -> bool:
         self.set_is_leader(ret)
         multisite_ret = self.patroni.multisite.resolve_leader()
         if multisite_ret:
-            logger.error("Releasing leader lock because multi site status is: "+multisite_ret)
+            logger.error("Releasing leader lock because multi site status is: %s", multisite_ret)
             self.dcs.delete_leader()
             return False
         return ret
@@ -1555,7 +1555,7 @@ def demote(self, mode: str) -> Optional[bool]:
             'graceful':         dict(stop='fast',      checkpoint=True,  release=True,  offline=False, async_req=False),  # noqa: E241,E501
             'immediate':        dict(stop='immediate', checkpoint=False, release=True,  offline=False, async_req=True),  # noqa: E241,E501
             'immediate-nolock': dict(stop='immediate', checkpoint=False, release=False, offline=False, async_req=True),  # noqa: E241,E501
-            'multisite': dict(stop='fast', checkpoint=True, release=False, offline=True, async_req=False), # noqa: E241,E501
+            'multisite': dict(stop='fast', checkpoint=True, release=False, offline=True, async_req=False),  # noqa: E241,E501
         }[mode]
 
         logger.info('Demoting self (%s)', mode)
@@ -1577,7 +1577,7 @@ def on_shutdown(checkpoint_location: int, prev_location: int) -> None:
                     status['released'] = True
 
         if mode == 'multisite':
-            on_shutdown = self.patroni.multisite.on_shutdown
+            on_shutdown = self.patroni.multisite.on_shutdown  # noqa: F811
 
         def before_shutdown() -> None:
             if self.state_handler.mpp_handler.is_coordinator():
@@ -1712,7 +1712,8 @@ def process_unhealthy_cluster(self) -> str:
                 if failover:
                     if self.is_paused() and failover.leader and failover.candidate:
                         logger.info('Updating failover key after acquiring leader lock...')
-                        self.dcs.manual_failover('', failover.candidate, failover.scheduled_at, version=failover.version)
+                        self.dcs.manual_failover('', failover.candidate, failover.scheduled_at,
+                                                 version=failover.version)
                     else:
                         logger.info('Cleaning up failover key after acquiring leader lock...')
                         self.dcs.manual_failover('', '')

patroni/multisite.py

@@ -7,13 +7,14 @@
 import six
 
 from .dcs import Member, Cluster
-from .dcs.kubernetes import catch_kubernetes_errors, Kubernetes
+from .dcs.kubernetes import catch_kubernetes_errors
 from .exceptions import DCSError
 
 import kubernetes
 
 logger = logging.getLogger(__name__)
 
+
 @six.add_metaclass(abc.ABCMeta)
 class AbstractSiteController(object):
     # Set whether we are relying on this controller for providing standby config
@@ -56,11 +57,13 @@ def should_failover(self):
     def on_shutdown(self, checkpoint_location):
         pass
 
+
 class SingleSiteController(AbstractSiteController):
     """Do nothing controller for single site operation."""
     def status(self):
         return {"status": "Leader", "active": False}
 
+
 class MultisiteController(Thread, AbstractSiteController):
     is_active = True
 
@@ -96,7 +99,7 @@ def __init__(self, config, on_change=None):
         if msconfig.get('update_crd'):
             self._state_updater = KubernetesStateManagement(msconfig.get('update_crd'),
                                                             msconfig.get('crd_uid'),
-                                                            reporter=self.name, #  Use pod name?
+                                                            reporter=self.name,  # Use pod name?
                                                             crd_api=msconfig.get('crd_api', 'acid.zalan.do/v1'))
         else:
             self._state_updater = None
@@ -191,7 +194,6 @@ def _check_transition(self, leader, note=None):
             self._state_updater.state_transition('Leader' if leader else 'Standby', note)
             self._status = leader
 
-
     def _resolve_multisite_leader(self):
         logger.info("Running multisite consensus")
         try:
@@ -265,7 +267,8 @@ def _resolve_multisite_leader(self):
                         # _check_transition() handles the wake.
                         if not self._has_leader:
                             self.on_change()
-                        note = f"Lost leader lock to {lock_owner}" if self._has_leader else f"Current leader is {lock_owner}"
+                        note = f"Lost leader lock to {lock_owner}" if self._has_leader \
+                               else f"Current leader is {lock_owner}"
                         self._check_transition(leader=False, note=note)
 
         except DCSError as e:
@@ -281,7 +284,7 @@ def _resolve_multisite_leader(self):
             try:
                 self._update_history(cluster)
                 self.touch_member()
-            except DCSError as e:
+            except DCSError:
                 pass
 
     def _observe_leader(self):
@@ -350,7 +353,7 @@ def touch_member(self):
     def run(self):
         self._observe_leader()
         while not self._heartbeat.wait(self.config['observe_interval']):
-            # Keep track of who the leader is, even when we are not the primary node.  
+            # Keep track of who the leader is, even when we are not the primary node.
             # Needed to be able to rewind from the leader.
             self._observe_leader()
         while not self.stop_requested:
@@ -376,7 +379,7 @@ def __init__(self, crd_name, crd_uid, reporter, crd_api):
         self.crd_api_group, self.crd_api_version = crd_api.rsplit('/', 1)
 
         # TODO: handle config loading when main DCS is not Kubernetes based
-        #apiclient = k8s_client.ApiClient(False)
+        # apiclient = k8s_client.ApiClient(False)
         kubernetes.config.load_incluster_config()
         apiclient = kubernetes.client.ApiClient()
         self._customobj_api = kubernetes.client.CustomObjectsApi(apiclient)
@@ -423,9 +426,10 @@ def store_updates(self):
 
     @catch_kubernetes_errors
     def update_crd_state(self, update):
-        self._customobj_api.patch_namespaced_custom_object_status(self.crd_api_group, self.crd_api_version, self.crd_namespace,
-                                                    'postgresqls', self.crd_name + '/status', update,
-                                                     field_manager='patroni')
+        self._customobj_api.patch_namespaced_custom_object_status(self.crd_api_group, self.crd_api_version,
+                                                                  self.crd_namespace, 'postgresqls',
+                                                                  self.crd_name + '/status', update,
+                                                                  field_manager='patroni')
 
         return True