A new release with imports on func level the kerberos dependencies

Author: Gonchik Tsymzhitov

atlassian/VERSION

@@ -1 +1 @@
-1.13.31
+1.14.0

atlassian/bamboo.py

@@ -365,10 +365,11 @@ def create_branch(self, plan_key, branch_name, vcs_branch=None, enabled=False, c
         :return: PUT request
         """
         resource = 'plan/{plan_key}/branch/{branch_name}'.format(plan_key=plan_key, branch_name=branch_name)
+        params = {}
         if vcs_branch:
-            params = {'vcsBranch':vcs_branch}
-            params['enabled'] = 'true' if enabled else 'false'
-            params['cleanupEnabled'] = 'true' if cleanup_enabled else 'false'
+            params = dict(vcsBranch=vcs_branch,
+                          enabled='true' if enabled else 'false',
+                          cleanupEnabled='true' if cleanup_enabled else 'false')
         return self.put(self.resource_url(resource), params=params)
 
     def enable_plan(self, plan_key):
@@ -380,26 +381,26 @@ def enable_plan(self, plan_key):
         resource = 'plan/{plan_key}/enable'.format(plan_key=plan_key)
         return self.post(self.resource_url(resource))
 
-    def execute_build(self, plan_key, stage=None, executeAllStages=True, customRevision=None, **bamboo_variables):
+    def execute_build(self, plan_key, stage=None, execute_all_stages=True, custom_revision=None, **bamboo_variables):
         """
         Fire build execution for specified plan. 
         !IMPORTANT! NOTE: for some reason, this method always execute all stages
         :param plan_key: str TST-BLD
         :param stage: str stage-name
-        :param executeAllStages: bool
-        :param customRevision: str revisionName
+        :param execute_all_stages: bool
+        :param custom_revision: str revisionName
         :param bamboo_variables: dict {variable=value} 
         :return: POST request
         """
         headers = self.form_token_headers
         resource = 'queue/{plan_key}'.format(plan_key=plan_key)
         params = {}
         if stage:
-            executeAllStages = False
+            execute_all_stages = False
             params['stage'] = stage
-        if customRevision:
-            params['customRevision'] = customRevision
-        params['executeAllStages'] = 'true' if executeAllStages else 'false'
+        if custom_revision:
+            params['customRevision'] = custom_revision
+        params['executeAllStages'] = 'true' if execute_all_stages else 'false'
         if bamboo_variables:
             for key, value in bamboo_variables.items():
                 params['bamboo.variable.{}'.format(key)] = value

atlassian/bitbucket.py

@@ -80,7 +80,7 @@ def project_avatar(self, key, content_type='image/png'):
         headers['Accept'] = content_type
         headers['X-Atlassian-Token'] = 'no-check'
 
-        return (self.get(url, not_json_response=True, headers=headers) or {})
+        return self.get(url, not_json_response=True, headers=headers) or {}
 
     def set_project_avatar(self, key, icon, content_type='image/png'):
         """
@@ -92,7 +92,7 @@ def set_project_avatar(self, key, icon, content_type='image/png'):
         headers = {'X-Atlassian-Token': 'no-check'}
         files = {'avatar': ("avatar.png", icon, content_type)}
         url = 'rest/api/1.0/projects/{0}/avatar.png'.format(key)
-        return (self.post(url, files=files, headers=headers) or {})
+        return self.post(url, files=files, headers=headers) or {}
 
     def project_users(self, key, limit=99999, filter_str=None):
         """
@@ -1261,7 +1261,7 @@ def upload_file(self, project, repository, content, message, branch, filename):
             filename=filename)
         return self.put(url, files=data)
 
-    def update_file(self, project, repository, content, message, branch, filename, sourceCommitId):
+    def update_file(self, project, repository, content, message, branch, filename, source_commit_id):
         """
         Update existing file for given branch.
         :param project:
@@ -1270,14 +1270,14 @@ def update_file(self, project, repository, content, message, branch, filename, s
         :param message:
         :param branch:
         :param filename:
-        :param sourceCommitId:
+        :param source_commit_id:
         :return:
         """
         data = {
             "content": content,
             "message": message,
             "branch": branch,
-            "sourceCommitId": sourceCommitId
+            "sourceCommitId": source_commit_id
         }
 
         url = 'rest/api/1.0/projects/{project}/repos/{repository}/browse/{filename}'.format(
@@ -1286,7 +1286,7 @@ def update_file(self, project, repository, content, message, branch, filename, s
             filename=filename)
         return self.put(url, files=data)
 
-    def get_code_insights_report(self, projectKey, repositorySlug, commitId, report_key):
+    def get_code_insights_report(self, project_key, repository_slug, commit_id, report_key):
         """
         Retrieve the specified code-insights report.
         :projectKey: str
@@ -1295,11 +1295,11 @@ def get_code_insights_report(self, projectKey, repositorySlug, commitId, report_
         :report_key: str
         """
         url = "rest/insights/1.0/projects/{projectKey}/repos/{repositorySlug}/commits/{commitId}/reports/{key}".format(
-            projectKey=projectKey, repositorySlug=repositorySlug, commitId=commitId, key=report_key
+            projectKey=project_key, repositorySlug=repository_slug, commitId=commit_id, key=report_key
         )
         return self.get(url)
 
-    def delete_code_insights_report(self, projectKey, repositorySlug, commitId, report_key):
+    def delete_code_insights_report(self, project_key, repository_slug, commit_id, report_key):
         """
         Delete a report for the given commit. Also deletes any annotations associated with this report.
         :projectKey: str
@@ -1308,11 +1308,11 @@ def delete_code_insights_report(self, projectKey, repositorySlug, commitId, repo
         :report_key: str
         """
         url = "rest/insights/1.0/projects/{projectKey}/repos/{repositorySlug}/commits/{commitId}/reports/{key}".format(
-            projectKey=projectKey, repositorySlug=repositorySlug, commitId=commitId, key=report_key
+            projectKey=project_key, repositorySlug=repository_slug, commitId=commit_id, key=report_key
         )
         return self.delete(url)
 
-    def create_code_insights_report(self, projectKey, repositorySlug, commitId, report_key, report_title,
+    def create_code_insights_report(self, project_key, repository_slug, commit_id, report_key, report_title,
                                     **report_params):
         """
         Create a new insight report, or replace the existing one if a report already exists for the given repository, commit, and report key. 
@@ -1326,7 +1326,7 @@ def create_code_insights_report(self, projectKey, repositorySlug, commitId, repo
         :report_params: 
         """
         url = "rest/insights/1.0/projects/{projectKey}/repos/{repositorySlug}/commits/{commitId}/reports/{key}".format(
-            projectKey=projectKey, repositorySlug=repositorySlug, commitId=commitId, key=report_key
+            projectKey=project_key, repositorySlug=repository_slug, commitId=commit_id, key=report_key
         )
         data = {"title": report_title}
         data.update(report_params)

atlassian/rest_client.py

@@ -6,6 +6,7 @@
 from oauthlib.oauth1 import SIGNATURE_RSA
 from requests_oauthlib import OAuth1
 from atlassian.request_utils import get_default_logger
+
 log = get_default_logger(__name__)
 
 
@@ -52,6 +53,11 @@ def _create_kerberos_session(self, kerberos_service):
             import kerberos as kerb
         except ImportError as e:
             log.error(e)
+            try:
+                import kerberos_sspi as kerb
+            except ImportError:
+                log.info("Please, fix issue with dependency of kerberos")
+                return
         __, krb_context = kerb.authGSSClientInit(kerberos_service)
         kerb.authGSSClientStep(krb_context, "")
         auth_header = ("Negotiate " + kerb.authGSSClientResponse(krb_context))

requirements.txt

@@ -2,5 +2,5 @@ six
 requests
 oauthlib
 requests_oauthlib
-kerberos; platform_system != 'Windows'
-kerberos-sspi; platform_system == 'Windows'
+kerberos; platform_system!='Windows'
+kerberos-sspi; platform_system=='Windows'

setup.py

@@ -1,5 +1,4 @@
 import os
-import sys
 from setuptools import find_packages
 from setuptools import setup
 
@@ -32,8 +31,8 @@
         'six',
         'oauthlib',
         'requests_oauthlib',
-        'kerberos-sspi;platform_system=="Windows"',
-        'kerberos;platform_system!="Windows"'
+        'kerberos-sspi ; platform_system=="Windows"',
+        'kerberos ; platform_system!="Windows"'
     ],
     platforms='Platform Independent',