From c3bef3918d74749510030f4ac51b8a8a772f2ef8 Mon Sep 17 00:00:00 2001 From: Dmitriy Diachkov Date: Fri, 24 Jan 2020 13:03:15 +0300 Subject: [PATCH] Confluence: resolve #412 --- atlassian/confluence.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/atlassian/confluence.py b/atlassian/confluence.py index 186341eaf..e6a790273 100644 --- a/atlassian/confluence.py +++ b/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)