Skip to content

Commit fb44644

Browse files
gonchikgonchik
authored
Polish and cleanup (atlassian-api#377)
* A new Tempo method * Tempo: add team member * Bugfix * Set workload method * Bump version * Organize the imports * Polish
1 parent b9140ce commit fb44644

File tree

13 files changed

+37
-18
lines changed

13 files changed

+37
-18
lines changed

‎atlassian/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.14.1
1+
1.14.2

‎atlassian/__init__.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
from .confluence import Confluence
2-
from .jira import Jira
1+
from .bamboo import Bamboo
32
from .bitbucket import Bitbucket
43
from .bitbucket import Bitbucket as Stash
5-
from .portfolio import Portfolio
6-
from .bamboo import Bamboo
4+
from .confluence import Confluence
75
from .crowd import Crowd
8-
from .service_desk import ServiceDesk
9-
from .marketplace import MarketPlace
6+
from .jira import Jira
107
from .jira8 import Jira8
8+
from .marketplace import MarketPlace
9+
from .portfolio import Portfolio
10+
from .service_desk import ServiceDesk
1111

1212
__all__ = [
1313
'Confluence',

‎atlassian/bamboo.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# coding=utf-8
22
import logging
3+
34
from requests.exceptions import HTTPError
5+
46
from .rest_client import AtlassianRestAPI
57

68
log = logging.getLogger(__name__)
@@ -196,6 +198,7 @@ def get_vcs_branches(self, plan_key, max_results=25):
196198
"""
197199
Get all vcs names for the current plan
198200
:param plan_key: str TST-BLD
201+
:param max_results
199202
:return:
200203
"""
201204
resource = 'plan/{plan_key}/vcsBranches'.format(plan_key=plan_key)
@@ -302,6 +305,7 @@ def build_result(self, build_key, expand=None, include_all_states=False):
302305
using stages.stage.results.result. All expand parameters should contain results.result prefix.
303306
:param build_key: Should be in the form XX-YY[-ZZ]-99, that is, the last token should be an integer representing
304307
the build number
308+
:param include_all_states
305309
"""
306310
try:
307311
int(build_key.split('-')[-1])

‎atlassian/bitbucket.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# coding=utf-8
22
import logging
3+
34
from .rest_client import AtlassianRestAPI
45

56
log = logging.getLogger(__name__)
@@ -560,7 +561,8 @@ def get_pull_request_settings(self, project, repository):
560561
:param repository:
561562
:return:
562563
"""
563-
url = 'rest/api/1.0/projects/{project}/repos/{repository}/settings/pull-requests'.format(project=project,repository=repository)
564+
url = 'rest/api/1.0/projects/{project}/repos/{repository}/settings/pull-requests'.format(project=project,
565+
repository=repository)
564566
return self.get(url)
565567

566568
def set_pull_request_settings(self, project, repository, data):
@@ -571,7 +573,8 @@ def set_pull_request_settings(self, project, repository, data):
571573
:param data: json body
572574
:return:
573575
"""
574-
url = 'rest/api/1.0/projects/{project}/repos/{repository}/settings/pull-requests'.format(project=project,repository=repository)
576+
url = 'rest/api/1.0/projects/{project}/repos/{repository}/settings/pull-requests'.format(project=project,
577+
repository=repository)
575578
return self.post(url, data=data)
576579

577580
def get_pull_requests(self, project, repository, state='OPEN', order='newest', limit=100, start=0, at=None):
@@ -1074,7 +1077,7 @@ def get_branches_permissions(self, project, repository=None, start=0, limit=25):
10741077
:param limit:
10751078
:return:
10761079
"""
1077-
if repository != None:
1080+
if repository is not None:
10781081
url = 'rest/branch-permissions/2.0/projects/{project}/repos/{repository}/restrictions'.format(
10791082
project=project,
10801083
repository=repository)
@@ -1098,12 +1101,12 @@ def all_branches_permissions(self, project, repository=None):
10981101
"""
10991102
start = 0
11001103
branches_permissions = []
1101-
response = self.get_branches_permissions(project=project, repository=repository, start=start)
1102-
branches_permissions += response.get('values')
1104+
response = self.get_branches_permissions(project=project, repository=repository, start=start)
1105+
branches_permissions += response.get('values')
11031106
while not response.get('isLastPage'):
11041107
start = response.get('nextPageStart')
1105-
response = self.get_branches_permissions(project=project, repository=repository, start=start)
1106-
branches_permissions += response.get('values')
1108+
response = self.get_branches_permissions(project=project, repository=repository, start=start)
1109+
branches_permissions += response.get('values')
11071110
return branches_permissions
11081111

11091112
def reindex(self):

‎atlassian/confluence.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# coding=utf-8
2-
from atlassian import utils
3-
from .rest_client import AtlassianRestAPI
4-
from requests import HTTPError
52
import logging
63
import os
74
import time
85

6+
from requests import HTTPError
7+
8+
from atlassian import utils
9+
from .rest_client import AtlassianRestAPI
10+
911
log = logging.getLogger(__name__)
1012

1113

‎atlassian/crowd.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# coding=utf-8
22
import logging
3+
34
from .rest_client import AtlassianRestAPI
45

56
log = logging.getLogger(__name__)

‎atlassian/jira.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# coding=utf-8
22
import logging
3+
34
from requests.exceptions import HTTPError
5+
46
from .rest_client import AtlassianRestAPI
57

68
log = logging.getLogger(__name__)

‎atlassian/jira8.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# coding=utf-8
22
import logging
3+
34
from .rest_client import AtlassianRestAPI
45

56
log = logging.getLogger(__name__)

‎atlassian/marketplace.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# coding=utf-8
22
import logging
3+
34
from .rest_client import AtlassianRestAPI
45

56
log = logging.getLogger(__name__)

‎atlassian/portfolio.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# coding=utf-8
22
import logging
3+
34
from .rest_client import AtlassianRestAPI
45

56
log = logging.getLogger(__name__)

‎atlassian/request_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import logging
2+
23
from six import PY3
34

45

‎atlassian/rest_client.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# coding=utf-8
22
import json
33
import logging
4-
from six.moves.urllib.parse import urlencode
4+
55
import requests
66
from oauthlib.oauth1 import SIGNATURE_RSA
77
from requests_oauthlib import OAuth1
8+
from six.moves.urllib.parse import urlencode
9+
810
from atlassian.request_utils import get_default_logger
911

1012
log = get_default_logger(__name__)

‎atlassian/service_desk.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# coding=utf-8
22
import logging
3+
34
from .rest_client import AtlassianRestAPI
45

56
log = logging.getLogger(__name__)

0 commit comments

Comments
 (0)