Skip to content

Commit cb3e423

Browse files
Gonchik TsymzhitovGonchik Tsymzhitov
authored andcommitted
Prepare the 1.14.8, and polish examples and method args
1 parent efa7abf commit cb3e423

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

atlassian/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1.14.7
1+
1.14.8
22

atlassian/bitbucket.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,7 @@ def get_branches_permissions(self, project, repository=None, start=0, limit=25):
12241224
return self.get(url, params=params)
12251225

12261226
def set_branches_permissions(self, project_key, multiple_permissions=False, matcher_type=None, matcher_value=None,
1227-
permission_type=None, repository=None, except_users=[], except_groups=None,
1227+
permission_type=None, repository=None, except_users=None, except_groups=None,
12281228
except_access_keys=None, start=0, limit=25):
12291229
"""
12301230
Create a restriction for the supplied branch or set of branches to be applied to the given repository.
@@ -1244,6 +1244,8 @@ def set_branches_permissions(self, project_key, multiple_permissions=False, matc
12441244
:param limit:
12451245
:return:
12461246
"""
1247+
if except_users is None:
1248+
except_users = []
12471249
if except_groups is None:
12481250
except_groups = []
12491251
if except_access_keys is None:

atlassian/jira.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,9 +1765,7 @@ def tempo_account_get_rate_table_by_account_id(self, account_id):
17651765
:param account_id: the account id.
17661766
:return:
17671767
"""
1768-
params = {}
1769-
params['scopeType'] = "ACCOUNT"
1770-
params['scopeId'] = account_id
1768+
params = {'scopeType': "ACCOUNT", 'scopeId': account_id}
17711769
url = 'rest/tempo-accounts/1/ratetable'
17721770
return self.get(url, params=params)
17731771

atlassian/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def parse_cookie_file(cookie_file):
272272
cookies = {}
273273
with open(cookie_file, 'r') as fp:
274274
for line in fp:
275-
if not re.match(r'^\#', line):
275+
if not re.match(r'^#', line):
276276
line_fields = line.strip().split('\t')
277277
cookies[line_fields[5]] = line_fields[6]
278278
return cookies

tests/test_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# coding: utf8
2-
from atlassian import Jira, Confluence, Bitbucket, Portfolio, Bamboo, Crowd, ServiceDesk
2+
from atlassian import Jira, Confluence, Bitbucket, Bamboo, Crowd, ServiceDesk
33
import os
44

55
BAMBOO_URL = os.environ.get('BAMBOO_URL', 'http://localhost:8085')

0 commit comments

Comments
 (0)