openstack
/
python-troveclient
Code Issues Proposed changes

Merge "Fix python3 compatibility issues"

This commit is contained in:
Zuul 2018-09-09 12:25:18 +00:00 committed by Gerrit Code Review
parent 0ce6255bfd 4021a1062b
commit 492b89fa7d
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
troveclient/apiclient/base.py
View File

@ -458,6 +458,8 @@ class Resource(object):
pass
def __getattr__(self, k):
if k == "__setstate__":
raise AttributeError(k)
if k not in self.__dict__:
# NOTE(bcwaldon): disallow lazy-loading if already loaded once
if not self.is_loaded:

2
troveclient/compat/base.py
View File

@ -246,7 +246,7 @@ class Resource(object):
return None
def _add_details(self, info):
for (k, v) in info.iteritems():
for (k, v) in info.items():
try:
setattr(self, k, v)
except AttributeError:

4
troveclient/compat/client.py
View File

@ -200,9 +200,9 @@ class TroveHTTPClient(httplib2.Http):
if 'body' in kwargs:
kwargs['body'] = json.dumps(kwargs['body'])
def morph_response_body(self, body_string):
def morph_response_body(self, raw_body):
try:
return json.loads(body_string)
return json.loads(raw_body.decode())
except ValueError:
raise exceptions.ResponseFormatError()