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

Author: Gonchik Tsymzhitov

atlassian/confluence.py

@@ -846,7 +846,7 @@ def attach_content(
                 "comment": comment,
                 "minorEdit": "true",
             }
-            headers = {"X-Atlassian-Token": "nocheck", "Accept": "application/json"}
+            headers = {"X-Atlassian-Token": "no-check", "Accept": "application/json"}
             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})

atlassian/rest_client.py

@@ -87,21 +87,10 @@ def __exit__(self, *_):
     def _create_basic_session(self, username, password):
         self._session.auth = (username, password)
 
-    def _create_kerberos_session(self, kerberos_service):
-        try:
-            import kerberos as kerb
-        except ImportError as e:
-            log.debug(e)
-            try:
-                import kerberos_sspi as kerb
-            except ImportError:
-                raise ImportError("No kerberos implementation available")
-        __, krb_context = kerb.authGSSClientInit(kerberos_service)
-        kerb.authGSSClientStep(krb_context, "")
-        auth_header = "Negotiate " + kerb.authGSSClientResponse(krb_context)
-        self._update_header("Authorization", auth_header)
-        response = self._session.get(self.url, verify=self.verify_ssl)
-        response.raise_for_status()
+    def _create_kerberos_session(self, _):
+        from requests_kerberos import HTTPKerberosAuth, OPTIONAL
+
+        self._session.auth = HTTPKerberosAuth(mutual_authentication=OPTIONAL)
 
     def _create_oauth_session(self, oauth_dict):
         oauth = OAuth1(

docs/index.rst

@@ -105,27 +105,25 @@ Or Kerberos *(installation with kerberos extra necessary)*:
 
 .. code-block:: python
 
-    kerberos_service = 'HTTP/jira.localhost@YOUR.DOMAIN.COM'
-
     jira = Jira(
         url='http://localhost:8080',
-        kerberos=kerberos_service)
+        kerberos={})
 
     confluence = Confluence(
         url='http://localhost:8090',
-        kerberos=kerberos_service)
+        kerberos={})
 
     bitbucket = Bitbucket(
         url='http://localhost:7990',
-        kerberos=kerberos_service)
+        kerberos={})
 
     service_desk = ServiceDesk(
         url='http://localhost:8080',
-        kerberos=kerberos_service)
+        kerberos={})
 
     xray = Xray(
         url='http://localhost:8080',
-        kerberos=kerberos_service)
+        kerberos={})
 
 Or reuse cookie file:
 

requirements.txt

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

setup.py

@@ -26,12 +26,7 @@
     include_package_data=True,
     zip_safe=False,
     install_requires=["deprecated", "requests", "six", "oauthlib", "requests_oauthlib"],
-    extras_require={
-        "kerberos": [
-            'kerberos-sspi ; platform_system=="Windows"',
-            'kerberos ; platform_system!="Windows"',
-        ]
-    },
+    extras_require={"kerberos": ['requests-kerberos']},
     platforms="Platform Independent",
     classifiers=[
         "Development Status :: 4 - Beta",