Skip to content

Commit 991e2c2

Browse files
authored
Python 2.7 compatibility (#1087)
1 parent e183226 commit 991e2c2

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
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: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
from json import dumps
44

55
import requests
6-
from oauthlib.oauth1 import SIGNATURE_RSA_SHA512
6+
try:
7+
from oauthlib.oauth1 import SIGNATURE_RSA_SHA512 as SIGNATURE_RSA
8+
except ImportError:
9+
from oauthlib.oauth1 import SIGNATURE_RSA_SHA512
710
from requests import HTTPError
811
from requests_oauthlib import OAuth1, OAuth2
912
from six.moves.urllib.parse import urlencode
@@ -103,7 +106,7 @@ def _create_oauth_session(self, oauth_dict):
103106
oauth = OAuth1(
104107
oauth_dict["consumer_key"],
105108
rsa_key=oauth_dict["key_cert"],
106-
signature_method=SIGNATURE_RSA_SHA512,
109+
signature_method=SIGNATURE_RSA,
107110
resource_owner_key=oauth_dict["access_token"],
108111
resource_owner_secret=oauth_dict["access_token_secret"],
109112
)

0 commit comments

Comments
 (0)