Skip to content

Commit e9adbff

Browse files
authored
Revert "Python 2.7 compatibility (atlassian-api#1087)"
This reverts commit 991e2c2.
1 parent 991e2c2 commit e9adbff

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

atlassian/bamboo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ def results(
369369
elements_key="results",
370370
element_key="result",
371371
label=label,
372-
**params
372+
**params,
373373
)
374374

375375
def latest_results(

atlassian/bitbucket/cloud/repositories/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ def __init__(self, data, *args, **kwargs):
254254
self.__commits = Commits(
255255
"{}/commits".format(self.url),
256256
data={"links": {"commit": {"href": "{}/commit".format(self.url)}}},
257-
**self._new_session_args
257+
**self._new_session_args,
258258
)
259259
self.__default_reviewers = DefaultReviewers("{}/default-reviewers".format(self.url), **self._new_session_args)
260260
self.__issues = Issues("{}/issues".format(self.url), **self._new_session_args)

atlassian/rest_client.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
from json import dumps
44

55
import requests
6-
try:
7-
from oauthlib.oauth1 import SIGNATURE_RSA_SHA512 as SIGNATURE_RSA
8-
except ImportError:
9-
from oauthlib.oauth1 import SIGNATURE_RSA_SHA512
6+
from oauthlib.oauth1 import SIGNATURE_RSA_SHA512
107
from requests import HTTPError
118
from requests_oauthlib import OAuth1, OAuth2
129
from six.moves.urllib.parse import urlencode
@@ -106,7 +103,7 @@ def _create_oauth_session(self, oauth_dict):
106103
oauth = OAuth1(
107104
oauth_dict["consumer_key"],
108105
rsa_key=oauth_dict["key_cert"],
109-
signature_method=SIGNATURE_RSA,
106+
signature_method=SIGNATURE_RSA_SHA512,
110107
resource_owner_key=oauth_dict["access_token"],
111108
resource_owner_secret=oauth_dict["access_token_secret"],
112109
)

0 commit comments

Comments
 (0)