wikidot 3.1.0.dev10__tar.gz → 3.1.0.dev12__tar.gz

{wikidot-3.1.0.dev10/src/wikidot.egg-info → wikidot-3.1.0.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: wikidot
-Version: 3.1.0.dev10
+Version: 3.1.0.dev12
 Summary: Wikidot Utility Library
 Author-email: ukwhatn <ukwhatn@gmail.com>
 Project-URL: Homepage, https://github.com/ukwhatn/wikidot.py
@@ -30,6 +30,7 @@ Requires-Dist: sphinx-rtd-theme>=2.0.0; extra == "docs"
 Requires-Dist: sphinx-intl>=2.1.0; extra == "docs"
 Requires-Dist: myst-parser>=2.0.0; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints>=1.25.3; extra == "docs"
+Dynamic: license-file
 
 # wikidot.py
 

{wikidot-3.1.0.dev10 → wikidot-3.1.0.dev12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wikidot"
-version = "3.1.0dev10"
+version = "3.1.0dev12"
 authors = [{ name = "ukwhatn", email = "ukwhatn@gmail.com" }]
 description = "Wikidot Utility Library"
 readme = "README.md"

{wikidot-3.1.0.dev10 → wikidot-3.1.0.dev12}/src/wikidot/__init__.py

@@ -13,7 +13,7 @@ import sys
 from .module.client import Client
 
 __all__ = ["Client"]
-__version__ = "3.1.0dev10"
+__version__ = "3.1.0dev12"
 
 
 # 全クラス・モジュールを公開する

{wikidot-3.1.0.dev10 → wikidot-3.1.0.dev12}/src/wikidot/common/decorators.py

@@ -19,6 +19,7 @@ def login_required(func):
     1. client という名前の引数
     2. Client クラスのインスタンスである引数
     3. self.client（呼び出し元オブジェクトの属性）
+    4. selfが持つ属性が持つclientクラス（例：self.site.client）
 
     Parameters
     ----------
@@ -52,9 +53,19 @@ def login_required(func):
                     break
 
             # selfに存在するか？
-            if client is None:
+            if client is None and args:
                 if hasattr(args[0], "client"):
                     client = args[0].client
+                else:
+                    # selfが持つ属性にclientが存在するか探索する
+                    for attr_name in dir(args[0]):
+                        if attr_name.startswith("_"):
+                            continue
+                        attr = getattr(args[0], attr_name)
+                        if hasattr(attr, "client"):
+                            client = getattr(attr, "client")
+                            if isinstance(client, Client):
+                                break
 
         if client is None:
             raise ValueError("Client is not found")

{wikidot-3.1.0.dev10 → wikidot-3.1.0.dev12}/src/wikidot/module/client.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from ..common import wd_logger
 from ..common.exceptions import LoginRequiredException
 from ..connector.ajax import AjaxModuleConnectorClient, AjaxModuleConnectorConfig
@@ -31,7 +33,7 @@ class ClientUserMethods:
         """
         self.client = client
 
-    def get(self, name: str, raise_when_not_found: bool = False) -> "AbstractUser":
+    def get(self, name: str, raise_when_not_found: bool = False) -> Optional["AbstractUser"]:
         """
         ユーザー名からユーザーオブジェクトを取得する
 

{wikidot-3.1.0.dev10 → wikidot-3.1.0.dev12}/src/wikidot/module/user.py

@@ -1,6 +1,6 @@
 from collections.abc import Iterator
 from dataclasses import dataclass
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 from bs4 import BeautifulSoup
 
@@ -181,7 +181,7 @@ class User(AbstractUser):
     ip: str | None = None
 
     @staticmethod
-    def from_name(client: "Client", name: str, raise_when_not_found: bool = False) -> "AbstractUser":
+    def from_name(client: "Client", name: str, raise_when_not_found: bool = False) -> Optional["AbstractUser"]:
         """
         ユーザー名からユーザーオブジェクトを取得する
 
@@ -209,7 +209,14 @@ class User(AbstractUser):
         IndexError
             ユーザーが見つからない場合（raise_when_not_foundがFalseの場合）
         """
-        return UserCollection.from_names(client, [name], raise_when_not_found)[0]
+        result = UserCollection.from_names(client, [name], raise_when_not_found)
+        if len(result) == 0:
+            if raise_when_not_found:
+                raise NotFoundException(f"User not found: {name}")
+            else:
+                return None
+
+        return result[0]
 
 
 @dataclass

{wikidot-3.1.0.dev10 → wikidot-3.1.0.dev12/src/wikidot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: wikidot
-Version: 3.1.0.dev10
+Version: 3.1.0.dev12
 Summary: Wikidot Utility Library
 Author-email: ukwhatn <ukwhatn@gmail.com>
 Project-URL: Homepage, https://github.com/ukwhatn/wikidot.py
@@ -30,6 +30,7 @@ Requires-Dist: sphinx-rtd-theme>=2.0.0; extra == "docs"
 Requires-Dist: sphinx-intl>=2.1.0; extra == "docs"
 Requires-Dist: myst-parser>=2.0.0; extra == "docs"
 Requires-Dist: sphinx-autodoc-typehints>=1.25.3; extra == "docs"
+Dynamic: license-file
 
 # wikidot.py