Skip to content

Ooops. Fixed Python 2.7 import #1088

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 2 commits into from
Dec 4, 2022
Merged

Ooops. Fixed Python 2.7 import #1088

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8515a15
Ooops. Fixed Python 2.7 import
orent Nov 28, 2022
1e5975c
Merge branch 'master' into master
gonchik Dec 4, 2022
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
6 changes: 3 additions & 3 deletions atlassian/rest_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import requests

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