Clean variables and review conditions for polish

Author: Gonchik Tsymzhitov

atlassian/bitbucket.py

@@ -2597,18 +2597,18 @@ def get_repositories(self, workspace, role=None, query=None, sort=None, number=1
         :param sort: Field by which the results should be sorted.
         """
         resource = "repositories/{workspace}".format(workspace=workspace)
-        
+
         params = {
             "pagelen": number,
             "page": page
-            }
-        if not role is None:
+        }
+        if role is not None:
             params["role"] = role
-        if not query is None:
+        if query is not None:
             params["query"] = query
-        if not sort is None:
+        if sort is not None:
             params["sort"] = sort
-        
+
         return self.get(self.resource_url(resource), params=params)
 
     def get_branch_restrictions(self, workspace, repository, kind=None, pattern=None, number=10, page=1):
@@ -2618,16 +2618,15 @@ def get_branch_restrictions(self, workspace, repository, kind=None, pattern=None
         resource = "repositories/{workspace}/{repository}/branch-restrictions".format(
             workspace=workspace, repository=repository)
         params = {"pagelen": number, "page": page}
-        if not kind is None:
+        if kind is not None:
             params["kind"] = kind
-        if not pattern is None:
+        if pattern is not None:
             params["pattern"] = pattern
 
         return self.get(self.resource_url(resource), params=params)
 
     def add_branch_restriction(self, workspace, repository, kind, branch_match_kind="glob",
-                                branch_pattern = "*", branch_type = None,
-                                users = None, groups = None, value = None):
+                               branch_pattern="*", branch_type=None, users=None, groups=None, value=None):
         """
         Add a new branch restriction.
 
@@ -2661,13 +2660,13 @@ def add_branch_restriction(self, workspace, repository, kind, branch_match_kind=
         if branch_match_kind == "branching_model":
             data["branch_type"] = branch_type
 
-        if not users is None:
+        if users is not None:
             data["users"] = users
 
-        if not groups is None:
+        if groups is not None:
             data["groups"] = groups
 
-        if not value is None:
+        if value is not None:
             data["value"] = value
 
         return self.post(self.resource_url(resource), data=data)
@@ -2691,15 +2690,14 @@ def delete_branch_restriction(self, workspace, repository, id):
 
         return self.delete(self.resource_url(resource))
 
-    
     def get_default_reviewers(self, workspace, repository, number=10, page=1):
         """
         Get all default reviewers for the repository.
         """
         resource = "repositories/{workspace}/{repository}/default-reviewers".format(
             workspace=workspace, repository=repository)
         params = {"pagelen": number, "page": page}
-        
+
         return self.get(self.resource_url(resource), params=params)
 
     def add_default_reviewer(self, workspace, repository, user):

atlassian/confluence.py

@@ -111,7 +111,6 @@ def get_child_id_list(self, page_id, type='page', start=None, limit=None):
         child_id_list = [child['id'] for child in child_page]
         return child_id_list
 
-
     def get_child_pages(self, page_id):
         """
         Get child pages for the provided page_id

atlassian/jira.py

@@ -531,7 +531,7 @@ def get_project_permission_scheme(self, project_id_or_key, expand=None):
         :return: data of project permission scheme
         """
         url = 'rest/api/2/project/{}/permissionscheme'.format(project_id_or_key)
-        params={}
+        params = {}
         if expand:
             params['expand'] = expand
         return self.get(url, params=params)
@@ -1305,7 +1305,7 @@ def set_issue_status(self, issue_key, status_name, fields=None):
         url = 'rest/api/2/issue/{issue_key}/transitions'.format(issue_key=issue_key)
         transition_id = self.get_transition_id_to_status_name(issue_key, status_name)
         data = {'transition': {'id': transition_id}}
-        if fields != None:
+        if fields is not None:
             data['fields'] = fields
         return self.post(url, data=data)
 
@@ -1757,15 +1757,20 @@ def create_priority_scheme(self, data):
 
     # api/2/project/{projectKeyOrId}/priorityscheme
     # Resource for associating priority schemes and projects.
-    def get_priority_scheme_of_project(self, project_key_or_id):
+    def get_priority_scheme_of_project(self, project_key_or_id, expand=None):
         """
         Gets a full representation of a priority scheme in JSON format used by specified project.
+        Resource for associating priority scheme schemes and projects.
         User must be global administrator or project administrator.
         :param project_key_or_id:
+        :param expand: notificationSchemeEvents,user,group,projectRole,field,all
         :return:
         """
-        url = 'rest/api/2/project/{}/priorityscheme'.format(project_key_or_id)
-        return self.get(url)
+        params = {}
+        if expand:
+            params["expand"] = expand
+        url = "rest/api/2/project/{}/priorityscheme".format(project_key_or_id)
+        return self.get(url, params=params)
 
     def assign_priority_scheme_for_project(self, project_key_or_id, priority_scheme_id):
         """
@@ -1782,19 +1787,6 @@ def assign_priority_scheme_for_project(self, project_key_or_id, priority_scheme_
         data = {"id": priority_scheme_id}
         return self.put(url, data=data)
 
-    def get_priority_scheme_of_project(self, project_key_or_id, expand=None):
-        """
-        Resource for associating priority scheme schemes and projects.
-        :param project_key_or_id:
-        :param expand: notificationSchemeEvents,user,group,projectRole,field,all
-        :return:
-        """
-        params = {}
-        if expand:
-            params["expand"] = expand
-        url = "rest/api/2/project/{}/priorityscheme".format(project_key_or_id)
-        return self.get(url, params=params)
-
     # Application properties
     def get_property(self, key=None, permission_level=None, key_filter=None):
         """

atlassian/rest_client.py

@@ -137,6 +137,7 @@ def request(self, method='GET', path='/', data=None, json=None, flags=None, para
             url += urlencode(params or {})
         if flags:
             url += ('&' if params else '') + '&'.join(flags or [])
+        json_dump = None
         if files is None:
             data = None if not data else json.dumps(data)
             json_dump = None if not json else json.dumps(json)
@@ -192,7 +193,7 @@ def get(self, path, data=None, flags=None, params=None, headers=None, not_json_r
                 return response.text
 
     def post(self, path, data=None, json=None, headers=None, files=None, params=None, trailing=None):
-        response = self.request('POST', path=path, data=data, json=None, headers=headers, files=files, params=params,
+        response = self.request('POST', path=path, data=data, json=json, headers=headers, files=files, params=params,
                                 trailing=trailing)
         if self.advanced_mode:
             return response