aioqzone 0.11.4.dev1__tar.gz → 0.12.1.dev1__tar.gz

{aioqzone-0.11.4.dev1 → aioqzone-0.12.1.dev1}/PKG-INFO

@@ -1,18 +1,17 @@
 Metadata-Version: 2.1
 Name: aioqzone
-Version: 0.11.4.dev1
+Version: 0.12.1.dev1
 Summary: Python wrapper for Qzone web login and Qzone http api.
 Home-page: https://github.com/aioqzone/aioqzone
 License: AGPL-3.0
 Keywords: qzone-api,autologin,asyncio-spider
 Author: aioqzone
 Author-email: zzzzss990315@gmail.com
-Requires-Python: >=3.7,<4.0
+Requires-Python: >=3.8,<4.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -22,8 +21,7 @@ Classifier: Typing :: Typed
 Requires-Dist: cssselect (>=1.1.0,<2.0.0)
 Requires-Dist: httpx (>=0.23.0,<0.24.0)
 Requires-Dist: lxml (>=4.9.1,<5.0.0)
-Requires-Dist: numpy (>=1.21.6,<1.22.0) ; python_version >= "3.7" and python_version < "3.8"
-Requires-Dist: numpy (>=1.22.3,<2.0.0) ; python_version >= "3.8" and python_version < "4.0"
+Requires-Dist: numpy (>=1.22.3,<2.0.0)
 Requires-Dist: opencv-python-headless (>=4.7.0,<5.0.0)
 Requires-Dist: pydantic (>=1.10.4,<2.0.0)
 Requires-Dist: pytz (>=2022.1,<2023.0)

{aioqzone-0.11.4.dev1 → aioqzone-0.12.1.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aioqzone"
-version = "0.11.4.dev1"
+version = "0.12.1.dev1"
 description = "Python wrapper for Qzone web login and Qzone http api."
 authors = ["aioqzone <zzzzss990315@gmail.com>"]
 license = "AGPL-3.0"
@@ -27,16 +27,13 @@ exclude = ["*.js"]
 "Bug Tracker" = "https://github.com/aioqzone/aioqzone/issues"
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.8"
 httpx = "~0.23.0"
 pydantic = "^1.10.4"
 pytz = "^2022.1"
 lxml = "^4.9.1"
 cssselect = "^1.1.0"
-numpy = [
-    { version = "~1.21.6", python = ">=3.7,<3.8" },
-    { version = "^1.22.3", python = "^3.8" },
-]
+numpy = "^1.22.3"
 opencv-python-headless = "^4.7.0"
 rsa = "^4.8"
 
@@ -53,10 +50,7 @@ pytest-asyncio = "~0.20.1"
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-pre-commit = [
-    { version = "^2.20.0", python = ">=3.7,<3.8" },
-    { version = "^3.0.1", python = "^3.8" },
-]
+pre-commit = "^3.0.1"
 black = "^22.12.0"
 isort = "^5.11.2"
 
@@ -92,4 +86,4 @@ line_length = 99
 
 [tool.black]
 line-length = 99
-target-version = ['py37']
+target-version = ['py38']

{aioqzone-0.11.4.dev1 → aioqzone-0.12.1.dev1}/setup.py

@@ -14,6 +14,9 @@ package_dir = \
 packages = \
 ['aioqzone',
  'aioqzone.api',
+ 'aioqzone.api.h5',
+ 'aioqzone.api.loginman',
+ 'aioqzone.api.web',
  'aioqzone.event',
  'aioqzone.type',
  'aioqzone.utils',
@@ -32,18 +35,15 @@ install_requires = \
 ['cssselect>=1.1.0,<2.0.0',
  'httpx>=0.23.0,<0.24.0',
  'lxml>=4.9.1,<5.0.0',
+ 'numpy>=1.22.3,<2.0.0',
  'opencv-python-headless>=4.7.0,<5.0.0',
  'pydantic>=1.10.4,<2.0.0',
  'pytz>=2022.1,<2023.0',
  'rsa>=4.8,<5.0']
 
-extras_require = \
-{':python_version >= "3.7" and python_version < "3.8"': ['numpy>=1.21.6,<1.22.0'],
- ':python_version >= "3.8" and python_version < "4.0"': ['numpy>=1.22.3,<2.0.0']}
-
 setup_kwargs = {
     'name': 'aioqzone',
-    'version': '0.11.4.dev1',
+    'version': '0.12.1.dev1',
     'description': 'Python wrapper for Qzone web login and Qzone http api.',
     'long_description': '# aioqzone\n\naioqzone封装了一些Qzone接口。\n\n[![python](https://img.shields.io/pypi/pyversions/aioqzone?logo=python&logoColor=white)][home]\n[![QQQR](https://github.com/aioqzone/aioqzone/actions/workflows/qqqr.yml/badge.svg?branch=beta&event=schedule)](https://github.com/aioqzone/aioqzone/actions/workflows/qqqr.yml)\n[![version](https://img.shields.io/pypi/v/aioqzone?logo=python)][pypi]\n[![black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)\n\n[English](README_en.md) | 简体中文\n\n> 1. ⚠️ aioqzone 仍在开发阶段，任何功能和接口都有可能在未来的版本中发生变化。\n> 2. 🆘 **欢迎有意协助开发/维护的中文开发者**。不仅限于本仓库，[aioqzone][org] 所属的任何仓库都需要您的帮助。\n\n## 功能和特点\n\n### Qzone 功能\n\n- [x] 二维码登录\n- [x] 密码登录 (受限)\n- [x] 计算验证码答案\n- [ ] 通过网络环境检测\n- [x] 爬取HTML说说\n- [x] 爬取说说详细内容\n- [x] 爬取空间相册\n- [x] 点赞/取消赞\n- [x] 发布(仅文字)/修改/删除说说\n- [ ] 评论相关\n\n### 为什么选择 aioqzone\n\n- [x] 完整的 IDE 类型支持 (typing)\n- [x] API 结果类型验证 (pydantic)\n- [x] 异步设计\n- [x] 易于二次开发\n- [x] [文档支持](https://aioqzone.github.io/aioqzone)\n\n__在做了:__\n\n- [ ] 完善的测试覆盖\n\n## node 依赖\n\n- `jssupport.jsjson.AstLoader` 不需要借助其他进程；\n- 要使用 `jssupport.execjs` 和 `jssupport.jsjson.NodeLoader`，您（至少）需要安装 `Node.js` >= v14；\n- 要使用 `jssupport.jsdom`，您需要安装 `jsdom` 和 `canvas` 两个 npm 包。\n- 验证码部分需要使用 `canvas`，因此您需要正确配置运行环境内的 font config ([#45](https://github.com/aioqzone/aioqzone/issues/45)).\n\n## 包描述\n\n|包名    |简述  |\n|-----------|-------------------|\n|aioqzone   |封装Qzone API  |\n|jssupport  |执行JS            |\n|qqqr       |网页登录    |\n\n## 例子\n\n这些仓库提供了一些 aioqzone 的实际使用示例。\n\n### aioqzone 的插件们\n\n- [aioqzone-feed][aioqzone-feed]: 提供了操作 feed 的简单接口\n\n## 许可证\n\n```\nCopyright (C) 2022 aioqzone.\n\nThis program is free software: you can redistribute it and/or modify\nit under the terms of the GNU Affero General Public License as published\nby the Free Software Foundation, either version 3 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU Affero General Public License for more details.\n\nYou should have received a copy of the GNU Affero General Public License\nalong with this program.  If not, see <https://www.gnu.org/licenses/>.\n```\n\n- aioqzone 以 [AGPL-3.0](LICENSE) 开源.\n- [免责声明](https://aioqzone.github.io/aioqzone/disclaimers.html)\n\n\n[home]: https://github.com/aioqzone/aioqzone "Python wrapper for Qzone web login and Qzone http api"\n[aioqzone-feed]: https://github.com/aioqzone/aioqzone-feed "aioqzone plugin providing higher level api for processing feed"\n[pypi]: https://pypi.org/project/aioqzone\n[org]: https://github.com/aioqzone\n',
     'author': 'aioqzone',
@@ -55,8 +55,7 @@ setup_kwargs = {
     'packages': packages,
     'package_data': package_data,
     'install_requires': install_requires,
-    'extras_require': extras_require,
-    'python_requires': '>=3.7,<4.0',
+    'python_requires': '>=3.8,<4.0',
 }
 
 

aioqzone-0.12.1.dev1/src/aioqzone/api/__init__.py

@@ -0,0 +1,5 @@
+# from .h5 import QzoneH5API
+from .loginman import Loginable, MixedLoginMan
+from .web import QzoneWebAPI
+
+__all__ = ["Loginable", "MixedLoginMan", "QzoneWebAPI"]

aioqzone-0.12.1.dev1/src/aioqzone/api/h5/__init__.py

@@ -0,0 +1,3 @@
+from .model import QzoneH5API
+
+__all__ = ["QzoneH5API"]

aioqzone-0.12.1.dev1/src/aioqzone/api/h5/model.py

@@ -0,0 +1,2 @@
+class QzoneH5API:
+    pass

aioqzone-0.12.1.dev1/src/aioqzone/api/h5/raw.py

@@ -0,0 +1,11 @@
+from aioqzone.api.loginman import Loginable
+from qqqr.utils.net import ClientAdapter
+
+
+class QzoneH5RawAPI:
+    host = "https://user.qzone.qq.com"
+
+    def __init__(self, client: ClientAdapter, loginman: Loginable) -> None:
+        super().__init__()
+        self.client = client
+        self.login = loginman

aioqzone-0.11.4.dev1/src/aioqzone/api/loginman.py → aioqzone-0.12.1.dev1/src/aioqzone/api/loginman/__init__.py

@@ -5,21 +5,21 @@ Users can inherit these managers and implement their own caching logic.
 
 import asyncio
 import logging
-from enum import Enum
-from typing import Dict, List, Optional, Union
+from typing import Dict, Optional, Sequence
 
 from httpx import ConnectError, HTTPError
 
+from aioqzone.event.login import LoginMethod, QREvent, UPEvent
+from aioqzone.exception import LoginError, SkipLoginInterrupt
 from jssupport.exception import JsImportError, JsRuntimeError, NodeNotFoundError
 from qqqr.constant import QzoneAppid, QzoneProxy, StatusCode
-from qqqr.event.login import QrEvent, UpEvent
+from qqqr.event import Emittable, EventManager
 from qqqr.exception import HookError, TencentLoginError, UserBreak
 from qqqr.qr import QrLogin
 from qqqr.up import UpLogin
 from qqqr.utils.net import ClientAdapter
 
-from ..event.login import Loginable, LoginMethod, QREvent, UPEvent
-from ..exception import LoginError, SkipLoginInterrupt
+from ._base import Loginable
 
 log = logging.getLogger(__name__)
 JsError = JsRuntimeError, JsImportError, NodeNotFoundError
@@ -44,7 +44,7 @@ class ConstLoginMan(Loginable):
         return self._cookie
 
 
-class UPLoginMan(Loginable[UPEvent]):
+class UPLoginMan(Loginable, Emittable[UPEvent]):
     """Login manager for username-password login.
     This manager may trigger :meth:`~aioqzone.event.login.LoginEvent.LoginSuccess` and
     :meth:`~aioqzone.event.login.LoginEvent.LoginFailed` hook.
@@ -116,14 +116,14 @@ class UPLoginMan(Loginable[UPEvent]):
                 exit(1)
 
 
-class QRLoginMan(Loginable[QREvent]):
+class QRLoginMan(Loginable, Emittable[QREvent]):
     """Login manager for QR login.
     This manager may trigger :meth:`~aioqzone.event.login.LoginEvent.LoginSuccess` and
     :meth:`~aioqzone.event.login.LoginEvent.LoginFailed` hook.
     """
 
     def __init__(self, client: ClientAdapter, uin: int, refresh_time: int = 6) -> None:
-        Loginable.__init__(self, uin)
+        super().__init__(uin)
         self.client = client
         self.refresh = refresh_time
         self.qrlogin = QrLogin(self.client, QzoneAppid, QzoneProxy)
@@ -189,15 +189,6 @@ class QRLoginMan(Loginable[QREvent]):
             self.hook.refresh_flag.clear()
 
 
-class QrStrategy(str, Enum):
-    """Represents QR strategy."""
-
-    force = "force"
-    prefer = "prefer"
-    allow = "allow"
-    forbid = "forbid"
-
-
 class MixedLoginEvent(QREvent, UPEvent):
     def __instancecheck__(self, o: object) -> bool:
         return isinstance(o, QREvent) and isinstance(o, UPEvent)
@@ -206,48 +197,52 @@ class MixedLoginEvent(QREvent, UPEvent):
         return issubclass(cls, QREvent) and issubclass(cls, UPEvent)
 
 
-class MixedLoginMan(Loginable[MixedLoginEvent]):
-    """A login manager that will try methods according to the given :class:`.QrStrategy`."""
+class MixedLoginMan(EventManager[QREvent, UPEvent], Loginable):
+    """A login manager that will try methods according to the given :class:`.QrStrategy`.
+
+    .. versionchanged:: 0.12.0
+
+        Make it a :class:`EventManager`.
+    """
 
     def __init__(
         self,
         client: ClientAdapter,
         uin: int,
-        strategy: QrStrategy,
+        order: Sequence[LoginMethod],
         pwd: Optional[str] = None,
         refresh_time: int = 6,
     ) -> None:
         super().__init__(uin)
-        self.strategy = strategy
-        self._order: List[Loginable] = []
-        if strategy != QrStrategy.force:
+        self.order = tuple(dict.fromkeys(order))
+        self.loginables: Dict[LoginMethod, Loginable] = {}
+        if LoginMethod.qr in self.order:
+            self.loginables[LoginMethod.qr] = QRLoginMan(
+                client=client, uin=uin, refresh_time=refresh_time
+            )
+        if LoginMethod.up in self.order:
             assert pwd
-            self._order.append(UPLoginMan(client, uin, pwd))
-        if strategy != QrStrategy.forbid:
-            self._order.append(QRLoginMan(client, uin, refresh_time))
-        if strategy == QrStrategy.prefer:
-            self._order = self._order[::-1]
-
-        # use a unified task store
-        self._tasks = self._order[0]._tasks
-        for i in self._order:
-            i._tasks = self._tasks
-
-    def register_hook(self, hook: Union[MixedLoginEvent, QrEvent, UpEvent]):
-        for c in self._order:
-            if isinstance(c, QRLoginMan) and isinstance(hook, QREvent):
-                c.register_hook(hook)
-            if isinstance(c, UPLoginMan) and isinstance(hook, UPEvent):
-                c.register_hook(hook)
-
-    def ordered_methods(self) -> List[Loginable]:
+            self.loginables[LoginMethod.up] = UPLoginMan(client=client, uin=uin, pwd=pwd)
+        self.init_hooks()
+
+    def init_hooks(self):
+        if LoginMethod.qr in self.order:
+            c = self.loginables[LoginMethod.qr]
+            if isinstance(c, Emittable):
+                c.register_hook(self.inst_of(QREvent))
+        if LoginMethod.up in self.order:
+            c = self.loginables[LoginMethod.up]
+            if isinstance(c, Emittable):
+                c.register_hook(self.inst_of(UPEvent))
+
+    def ordered_methods(self) -> Sequence[LoginMethod]:
         """Subclasses can inherit this method to choose a subset of `._order` according to its own policy.
 
         :return: a subset of `._order`.
 
         .. versionadded:: 0.9.8.dev1
         """
-        return self._order
+        return list(self.order)
 
     async def _new_cookie(self) -> Dict[str, str]:
         """
@@ -265,7 +260,8 @@ class MixedLoginMan(Loginable[MixedLoginEvent]):
 
         user_break = None
 
-        for c in methods:
+        for m in methods:
+            c = self.loginables[m]
             try:
                 return await c._new_cookie()
             except (TencentLoginError, _NextMethodInterrupt, HookError) as e:
@@ -274,18 +270,30 @@ class MixedLoginMan(Loginable[MixedLoginEvent]):
             except UserBreak as e:
                 user_break = e
                 log.debug("Mixed loginman received UserBreak, continue.")
-            except SystemExit as e:
+            except SystemExit:
                 log.debug("Mixed loginman captured System Exit, reraise.")
-                raise e
+                raise
 
         if user_break:
             raise UserBreak from user_break
 
-        if self.strategy == "forbid":
+        if LoginMethod.qr not in methods:
             hint = "您可能被限制账密登陆. 扫码登陆仍然可行."
-        elif self.strategy != "force":
+        elif LoginMethod.up not in methods:
             hint = "您可能已被限制登陆."
         else:
             hint = "你在睡觉！"
 
-        raise LoginError(hint, self.strategy)
+        raise LoginError(hint, methods_tried=methods)
+
+
+strategy_to_order = dict(
+    forbid=[LoginMethod.up],
+    allow=[LoginMethod.up, LoginMethod.qr],
+    prefer=[LoginMethod.qr, LoginMethod.up],
+    force=[LoginMethod.qr],
+)
+"""We provide a mapping to transform old "strategy" manner to new "order" manner.
+
+.. versionadded:: 0.12.0
+"""

aioqzone-0.11.4.dev1/src/aioqzone/event/login.py → aioqzone-0.12.1.dev1/src/aioqzone/api/loginman/_base.py

@@ -1,55 +1,12 @@
 import asyncio
 from abc import ABC, abstractmethod
-from enum import Enum
 from time import time
-from typing import Dict, Optional, TypeVar
+from typing import Dict
 
-from qqqr.event import Emittable, Event
-from qqqr.event.login import QrEvent as _qrevt
-from qqqr.event.login import UpEvent as _upevt
 from qqqr.utils.encrypt import gtk
 
 
-class LoginMethod(str, Enum):
-    qr = "qr"
-    up = "up"
-
-
-class LoginEvent(Event):
-    """Defines usual events happens during login."""
-
-    async def LoginFailed(self, meth: LoginMethod, msg: Optional[str] = None):
-        """Will be emitted on login failed.
-
-        :param meth: indicate what login method this login attempt used
-        :param msg: Err msg, defaults to None.
-        """
-        pass
-
-    async def LoginSuccess(self, meth: LoginMethod):
-        """Will be emitted after login success.
-
-        :param meth: indicate what login method this login attempt used
-        """
-        pass
-
-
-LgEvt = TypeVar("LgEvt", bound=LoginEvent)
-
-
-class QREvent(LoginEvent, _qrevt):
-    """Defines usual events happens during QR login."""
-
-    pass
-
-
-class UPEvent(LoginEvent, _upevt):
-    """Defines usual events happens during password login."""
-
-    pass
-
-
-class Loginable(ABC, Emittable[LgEvt]):
+class Loginable(ABC):
     """Abstract class represents a login manager.
     It is a :class:`Emittable` class which can emit :class:`LoginEvent`.
     """

aioqzone-0.12.1.dev1/src/aioqzone/api/web/__init__.py

@@ -0,0 +1,3 @@
+from .model import QzoneWebAPI
+
+__all__ = ["QzoneWebAPI"]

aioqzone-0.11.4.dev1/src/aioqzone/api/__init__.py → aioqzone-0.12.1.dev1/src/aioqzone/api/web/model.py

@@ -6,22 +6,27 @@ from typing import List, Optional
 
 from pydantic import ValidationError
 
-from ..type.internal import AlbumData
-from ..type.resp import *
-from .raw import QzoneApi
+from aioqzone.type.internal import AlbumData
+from aioqzone.type.resp import *
+
+from .raw import QzoneWebRawAPI
 
 log = logging.getLogger(__name__)
 
 
-class DummyQapi(QzoneApi):
-    """A wrapper of :class:`.QzoneApi`. It will validate the returns from :class:`.QzoneApi`,
-    and return a typed response. The value returned is usually a :class:`BaseModel`, sometimes
-    just a basic type if not needed."""
+class QzoneWebAPI(QzoneWebRawAPI):
+    """A wrapper of :class:`.QzoneWebRawAPI`. It will validate the returns from :class:`.QzoneWebRawAPI`,
+    and return a typed response. The value returned is usually one or more :class:`BaseModel`, sometimes
+    just a basic type if not needed.
+
+    .. versionchanged:: 0.12.1
+        rename to ``QzoneWebAPI``
+    """
 
     async def feeds3_html_more(
         self, pagenum: int, count: int = 10, *, aux: Optional[FeedMoreAux] = None
     ) -> FeedMoreResp:
-        """This will call :meth:`.QzoneApi.feeds3_html_more`.
+        """This will call :meth:`.QzoneWebRawAPI.feeds3_html_more`.
 
         :param aux: :obj:`~.FeedMoreResp.aux` field of last return (pagenum - 1).
         :return: a validated and typed response with a list of :obj:`~.FeedMoreResp.feeds` and :obj:`~.FeedMoreResp.aux` info.

{aioqzone-0.11.4.dev1/src/aioqzone/api → aioqzone-0.12.1.dev1/src/aioqzone/api/web}/raw.py

@@ -10,29 +10,33 @@ from urllib.parse import parse_qs
 
 from httpx import HTTPStatusError
 
-import aioqzone.api.constant as const
+import aioqzone.api.web.constant as const
+from aioqzone.api.loginman import Loginable
+from aioqzone.exception import CorruptError, QzoneError
+from aioqzone.type.internal import AlbumData, LikeData
+from aioqzone.utils.regex import response_callback
+from aioqzone.utils.time import time_ms
 from jssupport.jsjson import JsonValue, json_loads
 from qqqr.utils.daug import du
 from qqqr.utils.net import ClientAdapter, raise_for_status
 
-from ..event.login import Loginable
-from ..exception import CorruptError, QzoneError
-from ..type.internal import AlbumData, LikeData
-from ..utils.regex import response_callback
-from ..utils.time import time_ms
-
 logger = logging.getLogger(__name__)
 
 StrDict = Dict[str, JsonValue]
 
 
-class QzoneApi:
-    """Just a wrapper for Qzone http interface. No type validating."""
+class QzoneWebRawAPI:
+    """Just a wrapper for Qzone http interface. No type validating.
+
+    .. versionchanged:: 0.12.1
+        rename to ``QzoneWebRawAPI``
+    """
 
     encoding = "utf-8"
     host = "https://user.qzone.qq.com"
 
     def __init__(self, client: ClientAdapter, loginman: Loginable) -> None:
+        super().__init__()
         self.client = client
         self.login = loginman
 

aioqzone-0.12.1.dev1/src/aioqzone/event/__init__.py

@@ -0,0 +1,7 @@
+"aioqzone interface defination"
+
+from qqqr.event import Emittable, Event, EventManager
+
+from .login import LoginEvent, LoginMethod, QREvent, UPEvent
+
+__all__ = ["Emittable", "Event", "EventManager", "LoginMethod", "LoginEvent", "QREvent", "UPEvent"]

aioqzone-0.12.1.dev1/src/aioqzone/event/login.py

@@ -0,0 +1,42 @@
+from enum import Enum
+from typing import Dict, Optional, TypeVar
+
+from qqqr.event import Event
+from qqqr.event.login import QrEvent as _qrevt
+from qqqr.event.login import UpEvent as _upevt
+
+
+class LoginMethod(str, Enum):
+    qr = "qr"
+    up = "up"
+
+
+class LoginEvent(Event):
+    """Defines usual events happens during login."""
+
+    async def LoginFailed(self, meth: LoginMethod, msg: Optional[str] = None):
+        """Will be emitted on login failed.
+
+        :param meth: indicate what login method this login attempt used
+        :param msg: Err msg, defaults to None.
+        """
+        pass
+
+    async def LoginSuccess(self, meth: LoginMethod):
+        """Will be emitted after login success.
+
+        :param meth: indicate what login method this login attempt used
+        """
+        pass
+
+
+class QREvent(LoginEvent, _qrevt):
+    """Defines usual events happens during QR login."""
+
+    pass
+
+
+class UPEvent(LoginEvent, _upevt):
+    """Defines usual events happens during password login."""
+
+    pass

{aioqzone-0.11.4.dev1 → aioqzone-0.12.1.dev1}/src/aioqzone/exception.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, Sequence
 
 
 class QzoneError(RuntimeError):
@@ -11,7 +11,7 @@ class QzoneError(RuntimeError):
         self.rdict = rdict
         if len(args) > 0 and isinstance(args[0], str):
             self.msg = args[0]
-        RuntimeError.__init__(self, *args)
+        super().__init__(self, *args)
 
     def __str__(self) -> str:
         return f"Code {self.code}: {self.msg}"
@@ -20,14 +20,14 @@ class QzoneError(RuntimeError):
 class LoginError(RuntimeError):
     """Login failed for some reasons."""
 
-    def __init__(self, msg: str, strategy: Optional[str] = None) -> None:
+    def __init__(self, msg: str, methods_tried: Optional[Sequence] = None) -> None:
         msg = "登陆失败: " + msg
-        super().__init__(msg, strategy)
+        super().__init__(msg, methods_tried)
         self.msg = msg
-        self.strategy = strategy
+        self.methods_tried = methods_tried or []
 
     def __str__(self) -> str:
-        return f"{self.msg} (strategy={self.strategy})"
+        return f"{self.msg} (tried={self.methods_tried})"
 
 
 class CorruptError(ValueError):

{aioqzone-0.11.4.dev1 → aioqzone-0.12.1.dev1}/src/aioqzone/type/resp.py

@@ -12,7 +12,7 @@ from .entity import HasConEntity, HasContent
 
 # Below are the response reps of Qzone Apis.
 class FeedRep(BaseModel):
-    """Represents a feed in :meth:`~aioqzone.api.DummyQapi.feeds3_html_more`.
+    """Represents a feed in :meth:`~aioqzone.api.QzoneWebAPI.feeds3_html_more`.
     The feed content is in html format.
     """
 

{aioqzone-0.11.4.dev1 → aioqzone-0.12.1.dev1}/src/jssupport/execjs.py

@@ -33,6 +33,7 @@ class Partial:
         :param asis: If True, the argument's :meth:`repr` will be saved directly.
         Otherwise we will look for some appropriate "repr" for an argument.
         """
+        super().__init__()
         self.func = name
         self.args = args
         self.asis = asis
@@ -101,6 +102,7 @@ class ExecJS:
         assert self.loop_policy_check(), "loop policy cannot be `WindowsSelectorEventLoopPolicy`"
 
     def __init__(self):
+        super().__init__()
         self.check_all()
         self.setup = []
         self.run = []
@@ -172,5 +174,5 @@ class ExecJS:
         return await self(prop)
 
 
-if sys.platform == "win32":
+if sys.platform == "win32" and sys.version_info < (3, 8):
     asyncio.set_event_loop_policy(asyncio.WindowsProactorEventLoopPolicy())