Minor fixes, address final rounds of code review.

patroni/dcs/__init__.py

@@ -352,7 +352,8 @@ class AbstractDCS(object):
 
         :param data: json serialized information about instance (including connection strings)
         :param ttl: ttl for member key, optional parameter. If it is None `~self.member_ttl will be used`
-        :permanent: if set to `!True`, the member key will never expire. Used in patronictl for the external master.
+        :param permanent: if set to `!True`, the member key will never expire.
+         Used in patronictl for the external master.
         :returns: `!True` on success otherwise `!False`
         """
 

patroni/dcs/zookeeper.py

@@ -163,10 +163,7 @@ class ZooKeeper(AbstractDCS):
             return False
 
     def attempt_to_acquire_leader(self, permanent=False):
-        ret = self._create(self.leader_path,
-                           self._name,
-                           makepath=True,
-                           ephemeral=not permanent)
+        ret = self._create(self.leader_path, self._name, makepath=True, ephemeral=not permanent)
         if not ret:
             logger.info('Could not take out TTL lock')
         return ret

tests/test_ctl.py

@@ -4,8 +4,6 @@ import requests
 import sys
 import unittest
 
-from six.moves import BaseHTTPServer
-
 from click.testing import CliRunner
 from mock import patch, Mock
 from patroni.ctl import ctl, members, store_config, load_config, output_members, post_patroni, get_dcs, parse_dcs, \
@@ -299,7 +297,6 @@ class TestCtl(unittest.TestCase):
         assert result.exit_code == 0
 
     @patch('patroni.ctl.get_dcs')
-    @patch.object(BaseHTTPServer.HTTPServer, '__init__', Mock())
     def test_scaffold(self, mock_get_dcs):
         mock_get_dcs.return_value = self.e
         mock_get_dcs.return_value.get_cluster = get_cluster_not_initialized_without_leader