python-httpfile 0.0.5__py3-none-any.whl → 0.0.5.2__py3-none-any.whl

httpfile/__init__.py

@@ -106,13 +106,13 @@ class HTTPFileReader(RawIOBase, BinaryIO):
         urlopen = urlopen, 
     ):
         if headers:
-            headers = {**headers, "Accept-Encoding": "identity"}
+            headers = {**headers, "accept-encoding": "identity"}
         else:
-            headers = {"Accept-Encoding": "identity"}
+            headers = {"accept-encoding": "identity"}
         if start > 0:
-            headers["Range"] = f"bytes={start}-"
+            headers["range"] = f"bytes={start}-"
         elif start < 0:
-            headers["Range"] = f"bytes={start}"
+            headers["range"] = f"bytes={start}"
         if urlopen is None:
             urlopen = globals()["urlopen"]
         if callable(url):
@@ -316,7 +316,7 @@ class HTTPFileReader(RawIOBase, BinaryIO):
         url = self.url
         response = self.urlopen(
             url() if callable(url) else url, 
-            headers={**self.headers, "Range": f"bytes={start}-"}
+            headers={**self.headers, "range": f"bytes={start}-"}
         )
         length_new = get_total_length(response)
         if self.length != length_new:
@@ -572,13 +572,13 @@ class AsyncHTTPFileReader(HTTPFileReader):
         urlopen = None, 
     ):
         if headers:
-            headers = {**headers, "Accept-Encoding": "identity"}
+            headers = {**headers, "accept-encoding": "identity"}
         else:
-            headers = {"Accept-Encoding": "identity"}
+            headers = {"accept-encoding": "identity"}
         if start > 0:
-            headers["Range"] = f"bytes={start}-"
+            headers["range"] = f"bytes={start}-"
         elif start < 0:
-            headers["Range"] = f"bytes={start}"
+            headers["range"] = f"bytes={start}"
         if urlopen is None:
             urlopen = globals()["urlopen"]
         if callable(url):
@@ -751,7 +751,7 @@ class AsyncHTTPFileReader(HTTPFileReader):
         url = self.url
         response = await self.urlopen(
             (await url()) if callable(url) else url, 
-            headers={**self.headers, "Range": f"bytes={start}-"}
+            headers={**self.headers, "range": f"bytes={start}-"}
         )
         length_new = get_total_length(response)
         if self.length != length_new:
@@ -1068,33 +1068,17 @@ if find_spec("aiohttp"):
             global _aiohttp_urlopen
             from aiohttp import request, ClientSession
 
-            close_session = True
             if isinstance(urlopen, ClientSession):
                 urlopen = urlopen.get
-                close_session = False
-            if urlopen is None:
+            elif urlopen is None:
                 if _aiohttp_urlopen is None:
                     urlopen = _aiohttp_urlopen = partial(request, "GET")
                 else:
                     urlopen = _aiohttp_urlopen
-            else:
-                func = urlopen
-                if isinstance(func, partial):
-                    func = func.func
-                close_session = not (
-                    isinstance(func, MethodType) and 
-                    isinstance(func.__self__, ClientSession)
-                )
             async def urlopen_wrapper(url: str, headers: None | Mapping = headers):
-                resp = await urlopen(url, headers=headers).__aenter__()
-                async def aclose():
-                    if close_session:
-                        try:
-                            await resp._session.close()
-                        except AttributeError:
-                            pass
-                    resp.close()
-                resp.aclose = aclose
+                ctx = urlopen(url, headers=headers)
+                resp = await ctx.__aenter__()
+                resp.aclose = lambda: ctx.__aexit__(None, None, None)
                 resp.raise_for_status()
                 return resp
             await super().__ainit__(
@@ -1133,7 +1117,7 @@ if find_spec("httpx"):
             if "__del__" not in Client.__dict__:
                 setattr(Client, "__del__", lambda self: self.close())
             session = Client()
-        return session.send(
+        resp = session.send(
             request=session.build_request(
                 method=method, 
                 url=url, 
@@ -1143,6 +1127,8 @@ if find_spec("httpx"):
             follow_redirects=follow_redirects, 
             stream=stream, 
         )
+        setattr(resp, "session", session)
+        return resp
 
     async def httpx_request_async(
         url, 
@@ -1158,7 +1144,7 @@ if find_spec("httpx"):
             if "__del__" not in AsyncClient.__dict__:
                 setattr(AsyncClient, "__del__", lambda self: run_async(self.aclose()))
             session = AsyncClient()
-        return await session.send(
+        resp = await session.send(
             request=session.build_request(
                 method=method, 
                 url=url, 
@@ -1168,6 +1154,8 @@ if find_spec("httpx"):
             follow_redirects=follow_redirects, 
             stream=stream, 
         )
+        setattr(resp, "session", session)
+        return resp
 
     class HttpxFileReader(HTTPFileReader):
 

{python_httpfile-0.0.5.dist-info → python_httpfile-0.0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-httpfile
-Version: 0.0.5
+Version: 0.0.5.2
 Summary: Python httpfile.
 Home-page: https://github.com/ChenyangGao/web-mount-packs/tree/main/python-module/python-httpfile
 License: MIT
@@ -17,6 +17,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries

python_httpfile-0.0.5.2.dist-info/RECORD

@@ -0,0 +1,7 @@
+LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+httpfile/__init__.py,sha256=Yvl34ufRAYFn2-838EsMrI76b35RIUs7Eoe6w1By9nI,39596
+httpfile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_httpfile-0.0.5.2.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
+python_httpfile-0.0.5.2.dist-info/METADATA,sha256=uDfS48QDTCjGCV_6JPeWZFwQZWUnjYnmrM0D-GGK_mw,1573
+python_httpfile-0.0.5.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+python_httpfile-0.0.5.2.dist-info/RECORD,,

{python_httpfile-0.0.5.dist-info → python_httpfile-0.0.5.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.8.1
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any

python_httpfile-0.0.5.dist-info/RECORD

@@ -1,7 +0,0 @@
-LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-httpfile/__init__.py,sha256=2T_eq8cMUIciKfxX2ZQZxm1Uv-XHCHfMqK970i2wjm0,40057
-httpfile/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_httpfile-0.0.5.dist-info/LICENSE,sha256=o5242_N2TgDsWwFhPn7yr8YJNF7XsJM5NxUMtcT97bc,1100
-python_httpfile-0.0.5.dist-info/METADATA,sha256=R4AglpLv8hg9G4Aa5RhNrY_NTJqS5Yk7BB2NeEeA_gk,1520
-python_httpfile-0.0.5.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-python_httpfile-0.0.5.dist-info/RECORD,,