Merge "Fix python3 compatibility issues"

3 files changed, 5 insertions, 3 deletions

diff --git a/troveclient/apiclient/base.py b/troveclient/apiclient/base.py
index 1b7e35f..e2a2f05 100644
--- a/troveclient/apiclient/base.py
+++ b/troveclient/apiclient/base.py
@@ -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:
diff --git a/troveclient/compat/base.py b/troveclient/compat/base.py
index 24d681c..3301684 100644
--- a/troveclient/compat/base.py
+++ b/troveclient/compat/base.py
@@ -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:
diff --git a/troveclient/compat/client.py b/troveclient/compat/client.py
index b04e008..9dfa284 100644
--- a/troveclient/compat/client.py
+++ b/troveclient/compat/client.py
@@ -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()