Maintain support for versions of Python <3.6 (#1204)

* Python2: Remove trailing commas after ** unpacking operators

In Python2 it's not valid to have a comma after a final argument using
the ** unpacking operator.  Add fmt: skip to preserve Black formatting.

* Python2: Use six.moves.urllib

atlassian/bamboo.py

@@ -70,8 +70,8 @@ def base_list_call(
         max_results,
         label=None,
         start_index=0,
-        **kwargs,
-    ):
+        **kwargs
+    ):  # fmt: skip
         flags = []
         params = {"max-results": max_results}
         if expand:
@@ -383,8 +383,8 @@ def results(
             elements_key="results",
             element_key="result",
             label=label,
-            **params,
-        )
+            **params
+        )  # fmt: skip
 
     def latest_results(
         self,
@@ -572,8 +572,8 @@ def execute_build(
         stage=None,
         execute_all_stages=True,
         custom_revision=None,
-        **bamboo_variables,
-    ):
+        **bamboo_variables
+    ):  # fmt: skip
         """
         Fire build execution for specified plan.
         !IMPORTANT! NOTE: for some reason, this method always execute all stages

atlassian/bitbucket/__init__.py

@@ -2378,8 +2378,8 @@ def create_code_insights_report(
         commit_id,
         report_key,
         report_title,
-        **report_params,
-    ):
+        **report_params
+    ):  # fmt: skip
         """
         Create a new insight report, or replace the existing one
         if a report already exists for the given repository_slug, commit, and report key.

atlassian/bitbucket/cloud/common/comments.py

@@ -10,8 +10,8 @@ def __init__(self, data, *args, **kwargs):
             *args,
             data=data,
             expected_type="pullrequest_comment",
-            **kwargs,
-        )
+            **kwargs
+        )  # fmt: skip
 
     @property
     def raw(self):

atlassian/bitbucket/cloud/repositories/__init__.py

@@ -257,8 +257,8 @@ def __init__(self, data, *args, **kwargs):
         self.__commits = Commits(
             "{}/commits".format(self.url),
             data={"links": {"commit": {"href": "{}/commit".format(self.url)}}},
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
         self.__default_reviewers = DefaultReviewers("{}/default-reviewers".format(self.url), **self._new_session_args)
         self.__deployment_environments = DeploymentEnvironments(
             "{}/environments".format(self.url), **self._new_session_args

atlassian/bitbucket/cloud/repositories/commits.py

@@ -139,8 +139,8 @@ def get_build(self, key):
         """
         return Build(
             super(Commit, self).get(self.url_joiner("statuses/build", key)),
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
 
     def comments(self):
         """

atlassian/bitbucket/cloud/repositories/defaultReviewers.py

@@ -14,8 +14,8 @@ def __get_object(self, data):
         return DefaultReviewer(
             self.url_joiner(self.url, data["uuid"]),
             data,
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
 
     def add(self, user):
         """

atlassian/bitbucket/cloud/repositories/deploymentEnvironments.py

@@ -2,7 +2,7 @@
 
 from ..base import BitbucketCloudBase
 
-from urllib.parse import urlunsplit, urlsplit
+from six.moves.urllib.parse import urlunsplit, urlsplit
 
 
 class DeploymentEnvironments(BitbucketCloudBase):
@@ -13,8 +13,8 @@ def __get_object(self, data):
         return DeploymentEnvironment(
             self.url_joiner(self.url, data["uuid"]),
             data,
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
 
     def each(self):
         """
@@ -141,8 +141,8 @@ def __get_object(self, data):
         return DeploymentEnvironmentVariable(
             self.url,
             data,
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
 
     def create(self, key, value, secured):
         """

atlassian/bitbucket/cloud/repositories/groupPermissions.py

@@ -11,8 +11,8 @@ def __get_object(self, data):
         return GroupPermission(
             self.url,
             data,
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
 
     def each(self, q=None, sort=None):
         """

atlassian/bitbucket/cloud/repositories/pipelines.py

@@ -14,8 +14,8 @@ def __get_object(self, data):
         return Pipeline(
             self.url_joiner(self.url, data["uuid"]),
             data,
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
 
     def trigger(self, branch="master", type="custom", commit=None, pattern=None, variables=None):
         """
@@ -110,8 +110,8 @@ def __get_object(self, data):
         return Step(
             "{}/steps/{}".format(self.url, data["uuid"]),
             data,
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
 
     @property
     def uuid(self):
@@ -146,8 +146,8 @@ def pullrequest(self):
             return PullRequest(
                 target["pullrequest"]["links"]["self"]["href"],
                 target["pullrequest"],
-                **self._new_session_args,
-            )
+                **self._new_session_args
+            )  # fmt: skip
         else:
             return None
 

atlassian/bitbucket/cloud/repositories/repositoryVariables.py

@@ -11,8 +11,8 @@ def __get_object(self, data):
         return RepositoryVariable(
             self.url_joiner(self.url, data["uuid"]),
             data,
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
 
     def create(self, key, value, secured):
         """

atlassian/bitbucket/cloud/workspaces/permissions.py

@@ -12,8 +12,8 @@ def __get_object_workspace_membership(self, data):
         return WorkspaceMembership(
             self.url,
             data,
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
 
     def __get_object_repository_permission(self, data):
         return RepositoryPermission(self.url, data, **self._new_session_args)

atlassian/bitbucket/server/projects/__init__.py

@@ -113,13 +113,13 @@ def __init__(self, data, *args, **kwargs):
         self.__groups = Groups(
             self._sub_url("permissions/groups"),
             "PROJECT",
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
         self.__users = Users(
             self._sub_url("permissions/users"),
             "PROJECT",
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
         self.__repos = Repositories(self._sub_url("repos"), **self._new_session_args)
 
     def delete(self):

atlassian/bitbucket/server/projects/repos/__init__.py

@@ -84,13 +84,13 @@ def __init__(self, data, *args, **kwargs):
         self.__groups = Groups(
             self._sub_url("permissions/groups"),
             "REPO",
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
         self.__users = Users(
             self._sub_url("permissions/users"),
             "REPO",
-            **self._new_session_args,
-        )
+            **self._new_session_args
+        )  # fmt: skip
 
     def __get_object(self, data):
         return Repository(data, **self._new_session_args)

examples/jira/jira_project_leaders.py

@@ -1,5 +1,6 @@
 # coding=utf-8
-from urllib.parse import quote
+
+from six.moves.urllib.parse import quote
 
 from atlassian import Jira