Skip to content

Python 2.7 compatibility #1087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2022
Merged

Python 2.7 compatibility #1087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion atlassian/bamboo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ def results(
elements_key="results",
element_key="result",
label=label,
**params,
**params
)

def latest_results(
Expand Down
2 changes: 1 addition & 1 deletion atlassian/bitbucket/cloud/repositories/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ 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
)
self.__default_reviewers = DefaultReviewers("{}/default-reviewers".format(self.url), **self._new_session_args)
self.__issues = Issues("{}/issues".format(self.url), **self._new_session_args)
Expand Down
7 changes: 5 additions & 2 deletions atlassian/rest_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
from json import dumps

import requests
from oauthlib.oauth1 import SIGNATURE_RSA_SHA512
try:
from oauthlib.oauth1 import SIGNATURE_RSA_SHA512 as SIGNATURE_RSA
except ImportError:
from oauthlib.oauth1 import SIGNATURE_RSA_SHA512
from requests import HTTPError
from requests_oauthlib import OAuth1, OAuth2
from six.moves.urllib.parse import urlencode
Expand Down Expand Up @@ -103,7 +106,7 @@ def _create_oauth_session(self, oauth_dict):
oauth = OAuth1(
oauth_dict["consumer_key"],
rsa_key=oauth_dict["key_cert"],
signature_method=SIGNATURE_RSA_SHA512,
signature_method=SIGNATURE_RSA,
resource_owner_key=oauth_dict["access_token"],
resource_owner_secret=oauth_dict["access_token_secret"],
)
Expand Down