Confluence: resolve #412 (#433)

Author: djachkov

atlassian/confluence.py

@@ -712,9 +712,14 @@ def is_page_content_is_already_updated(self, page_id, body, title=None):
         :param title: Title to compare
         :return: True if the same
         """
-        confluence_content = (((self.get_page_by_id(page_id, expand='body.storage') or {})
-                               .get('body') or {})
-                              .get('storage') or {})
+        if self.advanced_mode:
+            confluence_content = (((self.get_page_by_id(page_id, expand='body.storage').json() or {})
+                    .get('body') or {})
+                    .get('storage') or {})
+        else:
+            confluence_content = (((self.get_page_by_id(page_id, expand='body.storage') or {})
+                    .get('body') or {})
+                    .get('storage') or {})
 
         if title:
             current_title = confluence_content.get('title', None)
@@ -765,7 +770,10 @@ def update_page(self, page_id, title, body, parent_id=None, type='page', represe
             return self.get_page_by_id(page_id)
         else:
             try:
-                version = self.history(page_id)['lastUpdated']['number'] + 1
+                if self.advanced_mode:
+                    version = self.history(page_id).json()['lastUpdated']['number'] + 1
+                else:
+                    version = self.history(page_id)['lastUpdated']['number'] + 1
             except (IndexError, TypeError) as e:
                 log.error("Can't find '{title}' {type}!".format(title=title, type=type))
                 log.debug(e)