aioqzone 1.4.3.dev2__tar.gz → 1.4.3.dev4__tar.gz

{aioqzone-1.4.3.dev2 → aioqzone-1.4.3.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 1.4.3.dev2
+Version: 1.4.3.dev4
 Summary: A Python wrapper for Qzone login and H5 APIs.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0

{aioqzone-1.4.3.dev2 → aioqzone-1.4.3.dev4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "1.4.3.dev2"
+version = "1.4.3.dev4"
 description = "A Python wrapper for Qzone login and H5 APIs."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"

{aioqzone-1.4.3.dev2 → aioqzone-1.4.3.dev4}/src/aioqzone/api/h5/raw.py

@@ -2,7 +2,7 @@ import logging
 import re
 from typing import Callable, Dict, List, Optional, Tuple, Union
 
-from lxml.html import fromstring
+from lxml.html import HtmlElement, document_fromstring
 from tenacity import after_log, retry, stop_after_attempt
 
 from aioqzone.api.login import Loginable
@@ -71,7 +71,7 @@ class QzoneH5RawAPI:
             params["g_tk"] = str(self.login.gtk)
             self.client.referer = "https://h5.qzone.qq.com/"
         host = host or self.host
-        return self.client.get(host + path, params=params, **kw)
+        return self.client.get(host + path, params=params, cookies=self.login.cookie, **kw)
 
     def host_post(
         self,
@@ -91,15 +91,12 @@ class QzoneH5RawAPI:
             params["g_tk"] = str(self.login.gtk)
         self.client.referer = "https://h5.qzone.qq.com/"
         host = host or self.host
-        return self.client.post(self.host + path, params=params, data=data, **kw)
+        return self.client.post(
+            self.host + path, params=params, data=data, cookies=self.login.cookie, **kw
+        )
 
     async def _update_cookie_safe(self, *_) -> None:
         await self.login.new_cookie()
-        # update cookies is optional.
-        try:
-            self.client.cookie_jar.update_cookies(self.login.cookie)
-        except:
-            log.warning("Error when updating client cookies", exc_info=True)
 
     def _rtext_handler(
         self,
@@ -158,11 +155,13 @@ class QzoneH5RawAPI:
                 r.raise_for_status()
 
                 html = await r.text()
-                scripts: List = fromstring(html).xpath(
+                scripts: List[HtmlElement] = document_fromstring(html).xpath(
                     'body/script[@type="application/javascript"]'
                 )
                 if not scripts:
                     log.debug("jump to %s", str(r.url))
+                    log.debug(f"request header cookies: {r.request_info.headers['Cookie']}")
+                    log.debug(f"loginman cookies: {self.login.cookie}")
                     raise QzoneError(-3000, "script tag not found")
 
                 texts: List[str] = [s.text for s in scripts]