Skip to content

Commit 608668c

Browse files
committed
fix(async): fix typos in code
1 parent cda364d commit 608668c

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

gitlab/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
from .client import AsyncGitlab, Gitlab
2121
from .const import *
22+
from .exceptions import *
2223

2324
__title__ = "python-gitlab"
2425
__version__ = "2.0.1"

gitlab/client.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717
"""Wrapper for the GitLab API."""
1818

19+
import asyncio
1920
import importlib
2021
import time
2122
from typing import Union

gitlab/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ def __call__(self, chunk):
2626

2727

2828
async def aresponse_content(response, streamed, action):
29+
response = await response
2930
if streamed is False:
3031
return response.content
3132

gitlab/v4/objects.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ def unblock(self, **kwargs):
356356
"""
357357
path = "/users/%s/unblock" % self.id
358358
server_data = self.manager.gitlab.http_post(path, **kwargs)
359-
return self._change_state( server_data, "active")
359+
return self._change_state(server_data, "active")
360360

361361
@cli.register_custom_action("User")
362362
@exc.on_http_error(exc.GitlabDeactivateError)
@@ -1070,7 +1070,7 @@ class GroupMemberManager(CRUDMixin, RESTManager):
10701070
_update_attrs = (("access_level",), ("expires_at",))
10711071

10721072
@awaitable_postprocess
1073-
def _all_postprocess(self, sever_data):
1073+
def _all_postprocess(self, server_data):
10741074
return [self._obj_cls(self, item) for item in server_data]
10751075

10761076
@cli.register_custom_action("GroupMemberManager")
@@ -1724,7 +1724,7 @@ def protect(self, developers_can_push=False, developers_can_merge=False, **kwarg
17241724
"developers_can_merge": developers_can_merge,
17251725
}
17261726
server_data = self.manager.gitlab.http_put(path, post_data=post_data, **kwargs)
1727-
return self._change_protected( server_data, True)
1727+
return self._change_protected(server_data, True)
17281728

17291729
@cli.register_custom_action("ProjectBranch")
17301730
@exc.on_http_error(exc.GitlabProtectError)
@@ -1741,7 +1741,7 @@ def unprotect(self, **kwargs):
17411741
id = self.get_id().replace("/", "%2F")
17421742
path = "%s/%s/unprotect" % (self.manager.path, id)
17431743
server_data = self.manager.gitlab.http_put(path, **kwargs)
1744-
return self._change_protected( server_data, False)
1744+
return self._change_protected(server_data, False)
17451745

17461746

17471747
class ProjectBranchManager(NoUpdateMixin, RESTManager):
@@ -2957,7 +2957,7 @@ def commits(self, **kwargs):
29572957

29582958
path = "%s/%s/commits" % (self.manager.path, self.get_id())
29592959
data_list = self.manager.gitlab.http_list(path, as_list=False, **kwargs)
2960-
return self._commits_postprocess(server_data)
2960+
return self._commits_postprocess(data_list)
29612961

29622962
@cli.register_custom_action("ProjectMergeRequest")
29632963
@exc.on_http_error(exc.GitlabListError)
@@ -3214,7 +3214,7 @@ def merge_requests(self, **kwargs):
32143214
"""
32153215
path = "%s/%s/merge_requests" % (self.manager.path, self.get_id())
32163216
data_list = self.manager.gitlab.http_list(path, as_list=False, **kwargs)
3217-
return self._merge_requests_postprocess(server_data)
3217+
return self._merge_requests_postprocess(data_list)
32183218

32193219

32203220
class ProjectMilestoneManager(CRUDMixin, RESTManager):
@@ -4592,7 +4592,7 @@ def housekeeping(self, **kwargs):
45924592
return self.manager.gitlab.http_post(path, **kwargs)
45934593

45944594
@awaitable_postprocess
4595-
def _upload_postprocess(self, sever_data):
4595+
def _upload_postprocess(self, server_data):
45964596
return {
45974597
"alt": server_data["alt"],
45984598
"url": server_data["url"],
@@ -4642,7 +4642,7 @@ def upload(self, filename, filedata=None, filepath=None, **kwargs):
46424642
file_info = {"file": (filename, filedata)}
46434643
data = self.manager.gitlab.http_post(url, files=file_info)
46444644

4645-
return self._upload_post_process(data)
4645+
return self._upload_postprocess(data)
46464646

46474647
@cli.register_custom_action("Project", optional=("wiki",))
46484648
@exc.on_http_error(exc.GitlabGetError)

tools/python_test_v4_async.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ async def main():
628628
assert len(await admin_project.issues.list(state="closed")) == 1
629629
assert len(await admin_project.issues.list(state="opened")) == 2
630630
assert len(await admin_project.issues.list(milestone="milestone1")) == 1
631-
assert (await (await m1.issues()).next()).title == "my issue 1"
631+
assert (await (await m1.issues()).anext()).title == "my issue 1"
632632
size = len(await issue1.notes.list())
633633
note = await issue1.notes.create({"body": "This is an issue note"})
634634
assert len(await issue1.notes.list()) == size + 1

0 commit comments

Comments
 (0)