Address some flake8 complaints

Author: avandras

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

@@ -1385,8 +1385,8 @@ def _do_failover_or_switchover(action: str, cluster_name: str, group: Optional[i
 
 
 def _do_site_switchover(cluster_name: str, group: Optional[int],
-                               switchover_leader: Optional[str], candidate: Optional[str],
-                               force: bool, scheduled: Optional[str] = None) -> None:
+                        switchover_leader: Optional[str], candidate: Optional[str],
+                        force: bool, scheduled: Optional[str] = None) -> None:
     """Perform a site switchover operation in the cluster.
 
     Informational messages are printed in the console during the operation, as well as the list of members before and
@@ -1436,7 +1436,7 @@ def _do_site_switchover(cluster_name: str, group: Optional[int],
 
     if cluster.leader and cluster.leader.multisite:
         leader_site = (cluster.leader.multisite.get('name') if not cluster.leader.multisite.get('standby_config') else
-        cluster.leader.multisite.get('standby_config', {}).get('leader_site'))
+                       cluster.leader.multisite.get('standby_config', {}).get('leader_site'))
     else:
         raise PatroniCtlException('Multisite is not active or there is no leader site, cannot switch sites')
 
@@ -1454,7 +1454,7 @@ def _do_site_switchover(cluster_name: str, group: Optional[int],
     # multisite_cluster = multisite_dcs.get_cluster()
 
     candidate_names = [str(m.multisite['name']) for m in cluster.members
-                        if m.multisite and m.multisite['name'] != leader_site]
+                       if m.multisite and m.multisite['name'] != leader_site]
     # We sort the names for consistent output to the client
     candidate_names.sort()
 
@@ -1478,7 +1478,7 @@ def _do_site_switchover(cluster_name: str, group: Optional[int],
     if scheduled is None and not force:
         next_hour = (datetime.datetime.now() + datetime.timedelta(hours=1)).strftime('%Y-%m-%dT%H:%M')
         scheduled = click.prompt('When should the switchover take place (e.g. ' + next_hour + ' ) ',
-                                    type=str, default='now')
+                                 type=str, default='now')
 
         scheduled_at = parse_scheduled(scheduled)
         if scheduled_at:
@@ -1583,13 +1583,14 @@ def switchover(cluster_name: str, group: Optional[int], leader: Optional[str],
 @ctl.command('site-switchover', help='Switchover to another data centre')
 @arg_cluster_name
 @option_citus_group
-@click.option('--leader-site', '--primary-site', 'leader_site', help='The name of the current leader site', default=None)
+@click.option('--leader-site', '--primary-site', 'leader_site', help='The name of the current leader site',
+              default=None)
 @click.option('--candidate-site', 'candidate_site', help='The name of the candidate', default=None)
 @click.option('--scheduled', help='Timestamp of a scheduled switchover in unambiguous format (e.g. ISO 8601)',
               default=None)
 @option_force
 def site_switchover(cluster_name: str, group: Optional[int], leader_site: Optional[str],
-               candidate_site: Optional[str], force: bool, scheduled: Optional[str]) -> None:
+                    candidate_site: Optional[str], force: bool, scheduled: Optional[str]) -> None:
     """Process ``multisite-switchover`` command of ``patronictl`` utility.
 
     Perform a site switchover operation in the multisite cluster.
@@ -1609,7 +1610,6 @@ def site_switchover(cluster_name: str, group: Optional[int], leader_site: Option
     _do_site_switchover(cluster_name, group, leader_site, candidate_site, force, scheduled)
 
 
-
 def generate_topology(level: int, member: Dict[str, Any],
                       topology: Dict[Optional[str], List[Dict[str, Any]]]) -> Iterator[Dict[str, Any]]:
     """Recursively yield members with their names adjusted according to their *level* in the cluster topology.
@@ -1698,8 +1698,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'].get('name') or ''} is {cluster['multisite']['status'].lower()}"
         standby_config = cluster['multisite'].get('standby_config', {})

patroni/multisite.py

@@ -12,11 +12,12 @@
 import kubernetes
 
 from .dcs import Cluster, Member
-from .dcs.kubernetes import catch_kubernetes_errors, Kubernetes
+from .dcs.kubernetes import catch_kubernetes_errors
 from .exceptions import DCSError
 
 logger = logging.getLogger(__name__)
 
+
 @six.add_metaclass(abc.ABCMeta)
 class AbstractSiteController(object):
     # Set whether we are relying on this controller for providing standby config
@@ -60,11 +61,13 @@ def should_failover(self) -> bool:
     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
 
@@ -81,7 +84,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
@@ -200,7 +203,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:
@@ -291,7 +293,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):
@@ -385,7 +387,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)
@@ -432,9 +434,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