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

Author: Gonchik Tsymzhitov

atlassian/confluence.py

@@ -758,12 +758,14 @@ def get_all_templates_from_space(self, space, start=0, limit=20, expand=None):
 
         return response.get("results") or []
 
-    def get_all_spaces(self, start=0, limit=500, expand=None):
+    def get_all_spaces(self, start=0, limit=500, expand=None, space_type=None, space_status=None):
         """
         Get all spaces with provided limit
         :param start: OPTIONAL: The start point of the collection to return. Default: None (0).
         :param limit: OPTIONAL: The limit of the number of pages to return, this may be restricted by
                             fixed system limits. Default: 500
+        :param space_type: OPTIONAL: Filter the list of spaces returned by type (global, personal)
+        :param space_status: OPTIONAL: Filter the list of spaces returned by status (current, archived)
         :param expand: OPTIONAL: additional info, e.g. metadata, icon, description, homepage
         """
         url = "rest/api/space"
@@ -774,7 +776,11 @@ def get_all_spaces(self, start=0, limit=500, expand=None):
             params["limit"] = limit
         if expand:
             params["expand"] = expand
-        return (self.get(url, params=params) or {}).get("results")
+        if space_type:
+            params["type"] = space_type
+        if space_status:
+            params["status"] = space_status
+        return self.get(url, params=params)
 
     def add_comment(self, page_id, text):
         """

atlassian/utils.py

@@ -330,7 +330,7 @@ def parse_cookie_file(cookie_file):
     cookies = {}
     with open(cookie_file, "r") as fp:
         for line in fp:
-            if not re.match(r"^#", line):
+            if not re.match(r"^(#|$)", line):
                 line_fields = line.strip().split("\t")
                 cookies[line_fields[5]] = line_fields[6]
     return cookies