Skip to content

Commit

Permalink
Fix compatibility with python 3.4&3.5 (#1248)
Browse files Browse the repository at this point in the history
Close #1247
  • Loading branch information
CyberDem0n committed Oct 25, 2019
1 parent 2a9ef41 commit 3f71165
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion patroni/ctl.py
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ def version(obj, cluster_name, member_names):
if not member_names or m.name in member_names:
try:
response = request_patroni(m)
data = json.loads(response.data)
data = json.loads(response.data.decode('utf-8'))
version = data.get('patroni', {}).get('version')
pg_version = data.get('server_version')
pg_version_str = " PostgreSQL {0}".format(format_pg_version(pg_version)) if pg_version else ""
Expand Down
5 changes: 3 additions & 2 deletions patroni/ha.py
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,9 @@ def fetch_node_status(self, member):

try:
response = self.patroni.request(member, timeout=2, retries=0)
logger.info('Got response from %s %s: %s', member.name, member.api_url, response.data.decode('utf-8'))
return _MemberStatus.from_api_response(member, json.loads(response.data))
data = response.data.decode('utf-8')
logger.info('Got response from %s %s: %s', member.name, member.api_url, data)
return _MemberStatus.from_api_response(member, json.loads(data))
except Exception as e:
logger.warning("Request failed to %s: GET %s (%s)", member.name, member.api_url, e)
return _MemberStatus.unknown(member)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_ctl.py
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ def test_version(self, mock_get_dcs):
with patch.object(PoolManager, 'request') as mocked:
result = self.runner.invoke(ctl, ['version'])
assert 'patronictl version' in result.output
mocked.return_value.data = json.dumps({'patroni': {'version': '1.2.3'}, 'server_version': 100001})
mocked.return_value.data = b'{"patroni":{"version":"1.2.3"},"server_version": 100001}'
result = self.runner.invoke(ctl, ['version', 'dummy'])
assert '1.2.3' in result.output
with patch.object(PoolManager, 'request', Mock(side_effect=Exception)):
Expand Down

0 comments on commit 3f71165

Please sign in to comment.