From 98a005221f122905d6465203760597c5c711d63a Mon Sep 17 00:00:00 2001 From: Gonchik Tsymzhitov Date: Mon, 13 May 2019 18:15:04 +0300 Subject: [PATCH] Polish --- atlassian/VERSION | 2 +- atlassian/jira.py | 11 +++++++---- examples/jira-tempo-account-customers.py | 2 +- examples/jira-tempo-accounts.py | 2 +- examples/jira-update-project.py | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/atlassian/VERSION b/atlassian/VERSION index 0c86ae8ce..c22268b43 100644 --- a/atlassian/VERSION +++ b/atlassian/VERSION @@ -1 +1 @@ -1.12.15 +1.12.16 diff --git a/atlassian/jira.py b/atlassian/jira.py index 89905de19..b25f1be34 100644 --- a/atlassian/jira.py +++ b/atlassian/jira.py @@ -168,10 +168,13 @@ def user_find_by_user_string(self, username, start=0, limit=50, include_inactive :return: """ url = 'rest/api/2/user/search' - url += "?username={username}&includeActive={include_active}&includeInactive={include_inactive}&startAt={start}&maxResults={limit}".format( - username=username, include_inactive=include_inactive_users, include_active=include_active_users, - start=start, limit=limit) - return self.get(url) + params = {'username': username, + 'includeActive': include_active_users, + 'includeInactive': include_inactive_users, + 'startAt': start, + 'maxResults': limit + } + return self.get(url, params=params) def projects(self, included_archived=None): """Returns all projects which are visible for the currently logged in user. diff --git a/examples/jira-tempo-account-customers.py b/examples/jira-tempo-account-customers.py index f1466570a..45cc50f8f 100644 --- a/examples/jira-tempo-account-customers.py +++ b/examples/jira-tempo-account-customers.py @@ -10,4 +10,4 @@ print("Count of Customers " + str(len(results))) for result in results: - print(result.get('key'), ' ', result.get('name')) \ No newline at end of file + print(result.get('key'), ' ', result.get('name')) diff --git a/examples/jira-tempo-accounts.py b/examples/jira-tempo-accounts.py index caf23ba86..5e2b28cb5 100644 --- a/examples/jira-tempo-accounts.py +++ b/examples/jira-tempo-accounts.py @@ -8,4 +8,4 @@ accounts = jira.tempo_account_get_accounts_by_jira_project(project_id="10140") for account in accounts: print(account) - jira.tempo_account_associate_with_jira_project(account['id'], project_id='10210') \ No newline at end of file + jira.tempo_account_associate_with_jira_project(account['id'], project_id='10210') diff --git a/examples/jira-update-project.py b/examples/jira-update-project.py index f8485974c..ea9c6ccb8 100644 --- a/examples/jira-update-project.py +++ b/examples/jira-update-project.py @@ -12,4 +12,4 @@ } result = jira.update_project('RD', data) -print(result) \ No newline at end of file +print(result)