feat(async): fixup some errors in async implementation

vishes-shell · vishes-shell · commit a14383bd5250 · 2020-02-28T23:24:55.000+03:00
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
@@ -18,6 +18,7 @@
 import warnings
 
 from .client import AsyncGitlab, Gitlab
+from .const import *
 
 __title__ = "python-gitlab"
 __version__ = "2.0.1"
@@ -27,5 +28,3 @@
 __copyright__ = "Copyright 2013-2019 Gauvain Pocentek"
 
 warnings.filterwarnings("default", category=DeprecationWarning, module="^gitlab")
-
-__all__ = [Gitlab, AsyncGitlab]
diff --git a/gitlab/base.py b/gitlab/base.py
@@ -226,7 +226,7 @@ async def __anext__(self):
         return await self.anext()
 
     async def anext(self):
-        data = await self._list.next()
+        data = await self._list.anext()
         return self._obj_cls(self.manager, data)
 
     @property
diff --git a/gitlab/client.py b/gitlab/client.py
@@ -17,10 +17,13 @@
 """Wrapper for the GitLab API."""
 
 import importlib
-from typing import Any
+import time
+from typing import Union
 
-import gitlab.config
 import httpx
+
+import gitlab
+import gitlab.config
 from gitlab import exceptions as exc
 from gitlab import utils
 from gitlab.exceptions import on_http_error
@@ -41,7 +44,7 @@ def _sanitize(value):
 
 
 class BaseGitlab:
-    _httpx_client_class: Any[httpx.Client, httpx.AsyncClient]
+    _httpx_client_class: Union[httpx.Client, httpx.AsyncClient]
 
     """Represents a GitLab server connection.
 
@@ -73,7 +76,7 @@ def __init__(
         http_password=None,
         timeout=None,
         api_version="4",
-        session=None,
+        client=None,
         per_page=None,
         pagination=None,
         order_by=None,
@@ -85,7 +88,7 @@ def __init__(
         #: Timeout to use for requests to gitlab server
         self.timeout = timeout
         #: Headers that will be used in request to GitLab
-        self.headers = {"User-Agent": "%s/%s" % (__title__, __version__)}
+        self.headers = {"User-Agent": "%s/%s" % (gitlab.__title__, gitlab.__version__)}
 
         #: Whether SSL certificates should be validated
         self.ssl_verify = ssl_verify
@@ -97,8 +100,7 @@ def __init__(
         self.job_token = job_token
         self._set_auth_info()
 
-        #: Create a session object for requests
-        self.session = session or requests.Session()
+        self.client = client or self._get_client()
 
         self.per_page = per_page
         self.pagination = pagination
@@ -239,7 +241,7 @@ def version(self):
         """
         raise NotImplemented
 
-    async def lint(self, content, **kwargs):
+    def lint(self, content, **kwargs):
         """Validate a gitlab CI configuration.
 
         Args:
@@ -673,7 +675,7 @@ def http_request(
                     if "Retry-After" in result.headers:
                         wait_time = int(result.headers["Retry-After"])
                     cur_retries += 1
-                    await asyncio.sleep(wait_time)
+                    time.sleep(wait_time)
                     continue
 
             error_message = result.content
diff --git a/gitlab/exceptions.py b/gitlab/exceptions.py
@@ -272,13 +272,13 @@ def wrapped_f(*args, **kwargs):
                 if not asyncio.iscoroutine(result):
                     return result
 
-                async def awaiter():
+                async def awaiter(result):
                     try:
-                        await result
+                        return await result
                     except GitlabHttpError as e:
                         raise error(e.error_message, e.response_code, e.response_body)
 
-                return awaiter
+                return awaiter(result)
 
         return wrapped_f
 
diff --git a/gitlab/mixins.py b/gitlab/mixins.py
@@ -25,24 +25,21 @@
 from gitlab import utils
 
 
-def update_attrs():
+def update_attrs(f):
     """Update attrs with returned server_data
 
     Updates object if data returned or coroutine
     """
 
-    def wrap(f):
-        @functools.wraps(f)
-        def wrapped_f(self, *args, **kwargs):
-            server_data = f(*args, **kwargs)
-            if asyncio.iscoroutine(server_data):
-                return self._aupdate_attrs(server_data)
-            else:
-                return self._update_attrs(server_data)
-
-        return wrapped_f
+    @functools.wraps(f)
+    def wrapped_f(self, *args, **kwargs):
+        server_data = f(self, *args, **kwargs)
+        if asyncio.iscoroutine(server_data):
+            return self._aupdate_attrs(server_data)
+        else:
+            return self._update_attrs(server_data)
 
-    return wrap
+    return wrapped_f
 
 
 class GetMixin:
@@ -128,7 +125,7 @@ def _list_or_object_list(self, server_data):
 
     async def _alist_or_object_list(self, server_data):
         server_data = await server_data
-        return self._list_or_object_list
+        return self._list_or_object_list(server_data)
 
     @exc.on_http_error(exc.GitlabListError)
     def list(self, **kwargs):
@@ -325,7 +322,7 @@ def update(self, id=None, new_data=None, **kwargs):
         return http_method(path, post_data=new_data, files=files, **kwargs)
 
 
-class SetMixin(object):
+class SetMixin:
     @exc.on_http_error(exc.GitlabSetError)
     def set(self, key, value, **kwargs):
         """Create or update the object.
