Change returns althrough get instead of brackets

Author: Gonchik Tsymzhitov

atlassian/confluence.py

@@ -46,7 +46,7 @@ def get_page_child_by_type(self, page_id, type='page', start=None, limit=None):
         url = 'rest/api/content/{page_id}/child/{type}'.format(page_id=page_id, type=type)
         log.info(url)
         try:
-            return self.get(url, params=params).get('results')
+            return (self.get(url, params=params) or {}).get('results')
         except IndexError as e:
             log.error(e)
             return None
@@ -66,7 +66,7 @@ def get_page_space(self, page_id):
         :param page_id: content ID
         :return:
         """
-        return self.get_page_by_id(page_id, expand='space')['space']['key']
+        return ((self.get_page_by_id(page_id, expand='space') or {}).get('space') or {}).get('key')
 
     def get_page_by_title(self, space, title, start=None, limit=None):
         """
@@ -91,7 +91,7 @@ def get_page_by_title(self, space, title, start=None, limit=None):
             params['title'] = str(title)
         url = 'rest/api/content'
         try:
-            return self.get(url, params=params).get('results')[0]
+            return (self.get(url, params=params) or {}).get('results')[0]
         except IndexError as e:
             log.error(e)
             return None
@@ -159,7 +159,7 @@ def get_all_pages_from_space(self, space, start=0, limit=500):
         url = 'rest/api/content?spaceKey={space}&limit={limit}&start={start}'.format(space=space,
                                                                                      limit=limit,
                                                                                      start=start)
-        return self.get(url)['results']
+        return (self.get(url) or {}).get('results')
 
     def get_all_pages_from_space_trash(self, space, start=0, limit=500, status='trashed'):
         """
@@ -460,7 +460,7 @@ def get_page_ancestors(self, page_id):
         :return: get properties
         """
         url = 'rest/api/content/{page_id}?expand=ancestors'.format(page_id=page_id)
-        return self.get(path=url).get('ancestors')
+        return (self.get(path=url) or {}).get('ancestors')
 
     def clean_all_caches(self):
         """ Clean all caches from cache management"""

atlassian/jira.py

@@ -292,11 +292,11 @@ def issue_create_or_update(self, fields):
     def get_issue_transitions(self, issue_key):
         url = 'rest/api/2/issue/{issue_key}?expand=transitions.fields&fields=status'.format(issue_key=issue_key)
         return [{'name': transition['name'], 'id': int(transition['id']), 'to': transition['to']['name']}
-                for transition in self.get(url)['transitions']]
+                for transition in (self.get(url) or {}).get('transitions')]
 
     def get_status_id_from_name(self, status_name):
         url = 'rest/api/2/status/{name}'.format(name=status_name)
-        return int(self.get(url)['id'])
+        return int((self.get(url) or {}).get('id'))
 
     def get_transition_id_to_status_name(self, issue_key, status_name):
         for transition in self.get_issue_transitions(issue_key):
@@ -313,7 +313,7 @@ def set_issue_status(self, issue_key, status_name):
 
     def get_issue_status(self, issue_key):
         url = 'rest/api/2/issue/{issue_key}?fields=status'.format(issue_key=issue_key)
-        return self.get(url)['fields']['status']['name']
+        return (self.get(url) or {}).get('fields').get('status').get('name')
 
     def component(self, component_id):
         return self.get('rest/api/2/component/{component_id}'.format(component_id=component_id))