Merge branch 'master' into issues_161_HTTPError.__init__()-missing-2-required-positional-arguments--'req'-and-'res'

Author: omarryhan

aiogoogle/__version__.py

@@ -2,7 +2,7 @@
 __about__ = "Async Google API client"
 __description__ = __about__
 __url__ = "https://github.com/omarryhan/aiogoogle"
-__version_info__ = ("5", "15", "0")
+__version_info__ = ("5", "17", "0")
 __version__ = ".".join(__version_info__)
 __author__ = "Omar Ryhan"
 __author_email__ = "omarryhan@gmail.com"

aiogoogle/sessions/aiohttp_session.py

@@ -35,7 +35,19 @@ async def _read_file(file_name):
         return await file.read()
 
 
-class AiohttpSession(ClientSession, AbstractSession):
+class AiohttpSession(AbstractSession):
+    def __init__(self, *args, **kwargs):
+        self._session = ClientSession(*args, **kwargs)
+    
+    async def __aenter__(self):
+        return self
+    
+    async def __aexit__(self, exc_type, exc, tb):
+        await self._session.close()
+    
+    async def close(self):
+        await self._session.close()
+
     async def send(
         self,
         *requests,
@@ -122,7 +134,7 @@ async def fire_request(request):
 
                         request.headers.update({"Content-Type": f"{req_content_type}; boundary={mpwriter.boundary}"})
 
-                        return await self.request(
+                        return await self._session.request(
                             method=request.method,
                             url=request.media_upload.upload_path,
                             headers=request.headers,
@@ -136,7 +148,7 @@ async def fire_request(request):
                     read_file = await request.media_upload.read_file(_read_file)
                     if request.upload_file_content_type:
                         request.headers.update({"Content-Type": request.upload_file_content_type})
-                    return await self.request(
+                    return await self._session.request(
                         method=request.method,
                         url=request.media_upload.upload_path,
                         headers=request.headers,
@@ -148,7 +160,7 @@ async def fire_request(request):
                     )
             # Else, if no file upload
             else:
-                return await self.request(
+                return await self._session.request(
                     method=request.method,
                     url=request.url,
                     headers=request.headers,