Merge branch 'master' of https://github.com/AstroMatt/atlassian-python-api

Author: Gonchik Tsymzhitov

.whitesource

@@ -0,0 +1,8 @@
+{
+  "checkRunSettings": {
+    "vulnerableCheckRunConclusionLevel": "failure"
+  },
+  "issueSettings": {
+    "minSeverityLevel": "LOW"
+  }
+}

atlassian/bamboo.py

@@ -7,7 +7,7 @@
 
 class Bamboo(AtlassianRestAPI):
     def _get_generator(self, path, elements_key='results', element_key='result', data=None, flags=None,
-                       params=None, headers=None):
+                       params=None, headers=None, max_results=None):
         """
         Generic method to return a generator with the results returned from Bamboo. It is intended to work for
         responses in the form:
@@ -27,22 +27,21 @@ def _get_generator(self, path, elements_key='results', element_key='result', dat
         :param path: URI for the resource
         :return: generator with the contents of response[elements_key][element_key]
         """
-        size = 1
         start_index = 0
-        while size:
-            params['start-index'] = start_index
-            response = self.get(path, data, flags, params, headers)
-            results = response[elements_key]
-            size = results['size']
-            # Check if start index was reset when reaching the end of the pages list
-            if results['start-index'] < start_index:
-                break
-            for r in results[element_key]:
-                yield r
-            start_index += results['max-result']
-
-    def base_list_call(self, resource, expand, favourite, clover_enabled, max_results, label=None, start_index=0,
-                       **kwargs):
+        params['start-index'] = start_index
+        response = self.get(path, data, flags, params, headers)
+        results = response[elements_key]
+        size = 0 
+
+        # Check if we still can get results
+        if size > max_results or results['size'] == 0:
+            return
+        for r in results[element_key]:
+            size += 1
+            yield r
+        start_index += results['max-result']
+
+    def base_list_call(self, resource, expand, favourite, clover_enabled, max_results, label=None, start_index=0, **kwargs):
         flags = []
         params = {'max-results': max_results}
         if expand:
@@ -57,10 +56,11 @@ def base_list_call(self, resource, expand, favourite, clover_enabled, max_result
         if 'elements_key' in kwargs and 'element_key' in kwargs:
             return self._get_generator(self.resource_url(resource), flags=flags, params=params,
                                        elements_key=kwargs['elements_key'],
-                                       element_key=kwargs['element_key'])
+                                       element_key=kwargs['element_key'],
+                                       max_results=max_results)
         params['start-index'] = start_index
         return self.get(self.resource_url(resource), flags=flags, params=params)
-
+        
     def get_custom_expiry(self, limit=25):
         """
         Get list of all plans where user has admin permission and which override global expiry settings. 
@@ -372,6 +372,16 @@ def create_branch(self, plan_key, branch_name, vcs_branch=None, enabled=False, c
                           cleanupEnabled='true' if cleanup_enabled else 'false')
         return self.put(self.resource_url(resource), params=params)
 
+    def get_branch_info(self, plan_key, branch_name):
+        """
+        Get information about a plan branch
+        :param plan_key: 
+        :param branch_name: 
+        :return:
+        """
+        resource = 'plan/{plan_key}/branch/{branch_name}'.format(plan_key=plan_key, branch_name=branch_name)
+        return self.get(self.resource_url(resource))
+    
     def enable_plan(self, plan_key):
         """
         Enable plan.

atlassian/confluence.py

@@ -443,7 +443,7 @@ def attach_content(self, content, name, content_type='application/binary', page_
             path = 'rest/api/content/{page_id}/child/attachment'.format(page_id=page_id)
             # Check if there is already a file with the same name
             attachments = self.get(path=path, headers=headers, params={'filename': name})
-            if attachments['size']:
+            if attachments.get('size'):
                 path = path + '/' + attachments['results'][0]['id'] + '/data'
             return self.post(path=path, data=data, headers=headers,
                              files={'file': (name, content, content_type)})