Commit bc973d4
authored
Merge pull request python-gitlab#729 from xarx00/PR-bugfix-716
Fix for python-gitlab#716: %d replaced by %s1 file changed
Lines changed: 10 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -909,7 +909,7 @@ def transfer_project(self, to_project_id, **kwargs): | |||
| 909 | 909 | GitlabAuthenticationError: If authentication is not correct | |
| 910 | 910 | GitlabTransferProjectError: If the project could not be transfered | |
| 911 | 911 | """ | |
| 912 | - path = '/groups/%d/projects/%d' % (self.id, to_project_id) | ||
| 912 | + path = '/groups/%s/projects/%s' % (self.id, to_project_id) | ||
| 913 | 913 | self.manager.gitlab.http_post(path, **kwargs) | |
| 914 | 914 | ||
| 915 | 915 | @cli.register_custom_action('Group', ('scope', 'search')) | |
@@ -930,7 +930,7 @@ def search(self, scope, search, **kwargs): | |||
| 930 | 930 | GitlabList: A list of dicts describing the resources found. | |
| 931 | 931 | """ | |
| 932 | 932 | data = {'scope': scope, 'search': search} | |
| 933 | - path = '/groups/%d/search' % self.get_id() | ||
| 933 | + path = '/groups/%s/search' % self.get_id() | ||
| 934 | 934 | return self.manager.gitlab.http_list(path, query_data=data, **kwargs) | |
| 935 | 935 | ||
| 936 | 936 | @cli.register_custom_action('Group', ('cn', 'group_access', 'provider')) | |
@@ -949,7 +949,7 @@ def add_ldap_group_link(self, cn, group_access, provider, **kwargs): | |||
| 949 | 949 | GitlabAuthenticationError: If authentication is not correct | |
| 950 | 950 | GitlabCreateError: If the server cannot perform the request | |
| 951 | 951 | """ | |
| 952 | - path = '/groups/%d/ldap_group_links' % self.get_id() | ||
| 952 | + path = '/groups/%s/ldap_group_links' % self.get_id() | ||
| 953 | 953 | data = {'cn': cn, 'group_access': group_access, 'provider': provider} | |
| 954 | 954 | self.manager.gitlab.http_post(path, post_data=data, **kwargs) | |
| 955 | 955 | ||
@@ -967,7 +967,7 @@ def delete_ldap_group_link(self, cn, provider=None, **kwargs): | |||
| 967 | 967 | GitlabAuthenticationError: If authentication is not correct | |
| 968 | 968 | GitlabDeleteError: If the server cannot perform the request | |
| 969 | 969 | """ | |
| 970 | - path = '/groups/%d/ldap_group_links' % self.get_id() | ||
| 970 | + path = '/groups/%s/ldap_group_links' % self.get_id() | ||
| 971 | 971 | if provider is not None: | |
| 972 | 972 | path += '/%s' % provider | |
| 973 | 973 | path += '/%s' % cn | |
@@ -985,7 +985,7 @@ def ldap_sync(self, **kwargs): | |||
| 985 | 985 | GitlabAuthenticationError: If authentication is not correct | |
| 986 | 986 | GitlabCreateError: If the server cannot perform the request | |
| 987 | 987 | """ | |
| 988 | - path = '/groups/%d/ldap_sync' % self.get_id() | ||
| 988 | + path = '/groups/%s/ldap_sync' % self.get_id() | ||
| 989 | 989 | self.manager.gitlab.http_post(path, **kwargs) | |
| 990 | 990 | ||
| 991 | 991 | ||
@@ -3216,7 +3216,7 @@ def download(self, streamed=False, action=None, chunk_size=1024, **kwargs): | |||
| 3216 | 3216 | Returns: | |
| 3217 | 3217 | str: The blob content if streamed is False, None otherwise | |
| 3218 | 3218 | """ | |
| 3219 | - path = '/projects/%d/export/download' % self.project_id | ||
| 3219 | + path = '/projects/%s/export/download' % self.project_id | ||
| 3220 | 3220 | result = self.manager.gitlab.http_get(path, streamed=streamed, | |
| 3221 | 3221 | raw=True, **kwargs) | |
| 3222 | 3222 | return utils.response_content(result, streamed, action, chunk_size) | |
@@ -3717,7 +3717,7 @@ def snapshot(self, wiki=False, streamed=False, action=None, | |||
| 3717 | 3717 | Returns: | |
| 3718 | 3718 | str: The uncompressed tar archive of the repository | |
| 3719 | 3719 | """ | |
| 3720 | - path = '/projects/%d/snapshot' % self.get_id() | ||
| 3720 | + path = '/projects/%s/snapshot' % self.get_id() | ||
| 3721 | 3721 | result = self.manager.gitlab.http_get(path, streamed=streamed, | |
| 3722 | 3722 | raw=True, **kwargs) | |
| 3723 | 3723 | return utils.response_content(result, streamed, action, chunk_size) | |
@@ -3740,7 +3740,7 @@ def search(self, scope, search, **kwargs): | |||
| 3740 | 3740 | GitlabList: A list of dicts describing the resources found. | |
| 3741 | 3741 | """ | |
| 3742 | 3742 | data = {'scope': scope, 'search': search} | |
| 3743 | - path = '/projects/%d/search' % self.get_id() | ||
| 3743 | + path = '/projects/%s/search' % self.get_id() | ||
| 3744 | 3744 | return self.manager.gitlab.http_list(path, query_data=data, **kwargs) | |
| 3745 | 3745 | ||
| 3746 | 3746 | @cli.register_custom_action('Project') | |
@@ -3755,7 +3755,7 @@ def mirror_pull(self, **kwargs): | |||
| 3755 | 3755 | GitlabAuthenticationError: If authentication is not correct | |
| 3756 | 3756 | GitlabCreateError: If the server failed to perform the request | |
| 3757 | 3757 | """ | |
| 3758 | - path = '/projects/%d/mirror/pull' % self.get_id() | ||
| 3758 | + path = '/projects/%s/mirror/pull' % self.get_id() | ||
| 3759 | 3759 | self.manager.gitlab.http_post(path, **kwargs) | |
| 3760 | 3760 | ||
| 3761 | 3761 | @cli.register_custom_action('Project', ('to_namespace', )) | |
@@ -3772,7 +3772,7 @@ def transfer_project(self, to_namespace, **kwargs): | |||
| 3772 | 3772 | GitlabAuthenticationError: If authentication is not correct | |
| 3773 | 3773 | GitlabTransferProjectError: If the project could not be transfered | |
| 3774 | 3774 | """ | |
| 3775 | - path = '/projects/%d/transfer' % (self.id,) | ||
| 3775 | + path = '/projects/%s/transfer' % (self.id,) | ||
| 3776 | 3776 | self.manager.gitlab.http_put(path, | |
| 3777 | 3777 | post_data={"namespace": to_namespace}, | |
| 3778 | 3778 | **kwargs) | |
0 commit comments