fix: response content is not async

vishes-shell · vishes-shell · commit 37dbc09f02b7 · 2020-02-22T15:38:19.000+03:00
diff --git a/gitlab/tests/test_gitlab.py b/gitlab/tests/test_gitlab.py
@@ -23,7 +23,6 @@
 import unittest
 
 import httpx
-import requests
 from httmock import HTTMock  # noqa
 from httmock import response  # noqa
 from httmock import urlmatch  # noqa
diff --git a/gitlab/utils.py b/gitlab/utils.py
@@ -23,14 +23,14 @@ def __call__(self, chunk):
         print(chunk)
 
 
-def response_content(response, streamed, action, chunk_size):
+async def response_content(response, streamed, action):
     if streamed is False:
         return response.content
 
     if action is None:
         action = _StdoutStream()
 
-    for chunk in response.iter_content(chunk_size=chunk_size):
+    async for chunk in response.aiter_bytes():
         if chunk:
             action(chunk)
 
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
@@ -1566,7 +1566,7 @@ async def content(self, streamed=False, action=None, chunk_size=1024, **kwargs):
         result = await self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action, chunk_size)
+        return await utils.response_content(result, streamed, action)
 
 
 class SnippetManager(CRUDMixin, RESTManager):
@@ -1905,7 +1905,7 @@ async def artifacts(self, streamed=False, action=None, chunk_size=1024, **kwargs
         result = await self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action, chunk_size)
+        return await utils.response_content(result, streamed, action)
 
     @cli.register_custom_action("ProjectJob")
     @exc.on_http_error(exc.GitlabGetError)
@@ -1935,7 +1935,7 @@ async def artifact(
         result = await self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action, chunk_size)
+        return await utils.response_content(result, streamed, action)
 
     @cli.register_custom_action("ProjectJob")
     @exc.on_http_error(exc.GitlabGetError)
@@ -1962,7 +1962,7 @@ async def trace(self, streamed=False, action=None, chunk_size=1024, **kwargs):
         result = await self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action, chunk_size)
+        return await utils.response_content(result, streamed, action)
 
 
 class ProjectJobManager(RetrieveMixin, RESTManager):
@@ -3260,14 +3260,14 @@ async def delete(self, name, **kwargs):
             GitlabAuthenticationError: If authentication is not correct
             GitlabDeleteError: If the server cannot perform the request
         """
-        self.gitlab.http_delete(self.path, query_data={"name": name}, **kwargs)
+        await self.gitlab.http_delete(self.path, query_data={"name": name}, **kwargs)
 
 
 class ProjectFile(SaveMixin, ObjectDeleteMixin, RESTObject):
     _id_attr = "file_path"
     _short_print_attr = "file_path"
 
-    async def decode(self):
+    def decode(self):
         """Returns the decoded content of the file.
 
         Returns:
@@ -3445,10 +3445,10 @@ async def raw(
         file_path = file_path.replace("/", "%2F").replace(".", "%2E")
         path = "%s/%s/raw" % (self.path, file_path)
         query_data = {"ref": ref}
-        result = self.gitlab.http_get(
+        result = await self.gitlab.http_get(
             path, query_data=query_data, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action, chunk_size)
+        return await utils.response_content(result, streamed, action)
 
     @cli.register_custom_action("ProjectFileManager", ("file_path", "ref"))
     @exc.on_http_error(exc.GitlabListError)
@@ -3758,7 +3758,7 @@ async def content(self, streamed=False, action=None, chunk_size=1024, **kwargs):
         result = await self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action, chunk_size)
+        return await utils.response_content(result, streamed, action)
 
 
 class ProjectSnippetManager(CRUDMixin, RESTManager):
@@ -4078,7 +4078,7 @@ async def download(self, streamed=False, action=None, chunk_size=1024, **kwargs)
         result = await self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action, chunk_size)
+        return await utils.response_content(result, streamed, action)
 
 
 class ProjectExportManager(GetWithoutIdMixin, CreateMixin, RESTManager):
@@ -4348,7 +4348,7 @@ async def repository_archive(
         result = await self.manager.gitlab.http_get(
             path, query_data=query_data, raw=True, streamed=streamed, **kwargs
         )
-        return utils.response_content(result, streamed, action, chunk_size)
+        return await utils.response_content(result, streamed, action)
 
     @cli.register_custom_action("Project", ("forked_from_id",))
     @exc.on_http_error(exc.GitlabCreateError)
@@ -4628,7 +4628,7 @@ async def snapshot(
         result = await self.manager.gitlab.http_get(
             path, streamed=streamed, raw=True, **kwargs
         )
-        return utils.response_content(result, streamed, action, chunk_size)
+        return await utils.response_content(result, streamed, action)
 
     @cli.register_custom_action("Project", ("scope", "search"))
     @exc.on_http_error(exc.GitlabSearchError)
