wikidot 3.1.0.dev11__tar.gz → 3.1.0.dev13__tar.gz

{wikidot-3.1.0.dev11/src/wikidot.egg-info → wikidot-3.1.0.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: wikidot
-Version: 3.1.0.dev11
+Version: 3.1.0.dev13
 Summary: Wikidot Utility Library
 Author-email: ukwhatn <ukwhatn@gmail.com>
 Project-URL: Homepage, https://github.com/ukwhatn/wikidot.py
@@ -15,7 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx<0.29,>=0.25
 Requires-Dist: beautifulsoup4<4.14.0,>=4.12.2
-Requires-Dist: lxml<5.4.0,>=4.9.3
+Requires-Dist: lxml<5.5.0,>=4.9.3
 Provides-Extra: build
 Requires-Dist: build; extra == "build"
 Requires-Dist: twine; extra == "build"
@@ -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.dev11 → wikidot-3.1.0.dev13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "wikidot"
-version = "3.1.0dev11"
+version = "3.1.0dev13"
 authors = [{ name = "ukwhatn", email = "ukwhatn@gmail.com" }]
 description = "Wikidot Utility Library"
 readme = "README.md"
@@ -16,7 +16,7 @@ classifiers = [
 dependencies = [
     "httpx >= 0.25,< 0.29",
     "beautifulsoup4 >= 4.12.2,< 4.14.0",
-    "lxml >= 4.9.3,< 5.4.0",
+    "lxml >= 4.9.3,< 5.5.0",
 ]
 
 [project.optional-dependencies]

{wikidot-3.1.0.dev11 → wikidot-3.1.0.dev13}/src/wikidot/__init__.py

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

{wikidot-3.1.0.dev11 → wikidot-3.1.0.dev13}/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.dev11 → wikidot-3.1.0.dev13}/src/wikidot/module/page.py

@@ -477,11 +477,13 @@ class PageCollection(list["Page"]):
 
         for page, responses in zip(pages, responses):
             body = responses.json()["body"]
+            # nbspをスペースに置換
+            body = body.replace(" ", " ")
             html = BeautifulSoup(body, "lxml")
             source_element = html.select_one("div.page-source")
             if source_element is None:
                 raise exceptions.NoElementException("Cannot find source element")
-            source = source_element.text.strip().removeprefix("\t")
+            source = source_element.get_text().strip().removeprefix("\t")
             page.source = PageSource(page, source)
         return pages
 

{wikidot-3.1.0.dev11 → wikidot-3.1.0.dev13}/src/wikidot/module/page_revision.py

@@ -111,13 +111,15 @@ class PageRevisionCollection(list["PageRevision"]):
 
         for revision, response in zip(target_revisions, responses):
             body = response.json()["body"]
+            # nbspをスペースに置換
+            body = body.replace(" ", " ")
             body_html = BeautifulSoup(body, "lxml")
             wiki_text_elem = body_html.select_one("div.page-source")
             if wiki_text_elem is None:
                 raise NoElementException("Wiki text element not found")
             revision.source = PageSource(
                 page=page,
-                wiki_text=wiki_text_elem.text.strip(),
+                wiki_text=wiki_text_elem.get_text().strip(),
             )
 
         return revisions

{wikidot-3.1.0.dev11 → wikidot-3.1.0.dev13}/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.dev11 → wikidot-3.1.0.dev13/src/wikidot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: wikidot
-Version: 3.1.0.dev11
+Version: 3.1.0.dev13
 Summary: Wikidot Utility Library
 Author-email: ukwhatn <ukwhatn@gmail.com>
 Project-URL: Homepage, https://github.com/ukwhatn/wikidot.py
@@ -15,7 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx<0.29,>=0.25
 Requires-Dist: beautifulsoup4<4.14.0,>=4.12.2
-Requires-Dist: lxml<5.4.0,>=4.9.3
+Requires-Dist: lxml<5.5.0,>=4.9.3
 Provides-Extra: build
 Requires-Dist: build; extra == "build"
 Requires-Dist: twine; extra == "build"
@@ -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.dev11 → wikidot-3.1.0.dev13}/src/wikidot.egg-info/requires.txt

@@ -1,6 +1,6 @@
 httpx<0.29,>=0.25
 beautifulsoup4<4.14.0,>=4.12.2
-lxml<5.4.0,>=4.9.3
+lxml<5.5.0,>=4.9.3
 
 [build]
 build