Fix some linting issues

Author: avandras

patroni/dcs/__init__.py

@@ -512,7 +512,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

@@ -361,7 +361,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: " + multisite_ret)
             self.dcs.delete_leader()
             return False
         return ret
@@ -1561,7 +1561,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)
@@ -1583,7 +1583,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():
@@ -1718,7 +1718,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('', '')

setup.py

@@ -26,6 +26,7 @@
 
 EXTRAS_REQUIRE = {'aws': ['boto3'], 'etcd': ['python-etcd'], 'etcd3': ['python-etcd'],
                   'consul': ['py-consul'], 'exhibitor': ['kazoo'], 'zookeeper': ['kazoo'],
+                  'systemd': ['systemd-python'],
                   'kubernetes': [], 'raft': ['pysyncobj', 'cryptography'], 'jsonlogger': ['python-json-logger']}
 
 # Add here all kinds of additional classifiers as defined under

tests/test_citus.py

@@ -1,4 +1,3 @@
-import etcd
 import time
 import unittest
 

tests/test_config.py

@@ -1,4 +1,3 @@
-import etcd
 import io
 import os
 import sys

tests/test_ctl.py

@@ -1,4 +1,3 @@
-import etcd
 import os
 import unittest
 

tests/test_ha.py

@@ -5,16 +5,14 @@
 
 from unittest.mock import MagicMock, Mock, mock_open, patch, PropertyMock
 
-import etcd
-
 from patroni import global_config
 from patroni.collections import CaseInsensitiveSet
 from patroni.config import Config
 from patroni.dcs import Cluster, ClusterConfig, Failover, get_dcs, Leader, Member, Status, SyncState, TimelineHistory
 from patroni.dcs.etcd import AbstractEtcdClientWithFailover
 from patroni.exceptions import DCSError, PatroniFatalException, PostgresConnectionException
 from patroni.ha import _MemberStatus, Ha
-from patroni.multisite import MultisiteController, SingleSiteController
+from patroni.multisite import SingleSiteController
 from patroni.postgresql import Postgresql
 from patroni.postgresql.bootstrap import Bootstrap
 from patroni.postgresql.callback_executor import CallbackAction
@@ -1005,7 +1003,8 @@ def test_manual_switchover_process_no_leader_in_synchronous_mode(self):
         self.assertEqual(self.ha.run_cycle(), 'following a different leader because i am not the healthiest node')
 
         # to our node (postgresql0), which name is not in sync nodes list
-        self.ha.cluster = get_cluster_initialized_without_leader(failover=Failover(0, 'leader', 'postgresql0', None, ''),
+        self.ha.cluster = get_cluster_initialized_without_leader(failover=Failover(0, 'leader', 'postgresql0', None,
+                                                                                   ''),
                                                                  sync=('leader1', 'blabla'))
         self.assertEqual(self.ha.run_cycle(), 'following a different leader because i am not the healthiest node')
 

tests/test_mpp.py

@@ -1,5 +1,3 @@
-import etcd
-
 from typing import Any
 
 from patroni.exceptions import PatroniException