From 4b211b238ad5f53a1530f23912553d70f6fbc6b1 Mon Sep 17 00:00:00 2001 From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com> Date: Fri, 11 Oct 2024 13:32:36 +0800 Subject: [PATCH 1/7] Fallback to default dict if not set --- sphinx/search/zh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx/search/zh.py b/sphinx/search/zh.py index 4905eb84474..f0503ecefba 100644 --- a/sphinx/search/zh.py +++ b/sphinx/search/zh.py @@ -234,7 +234,7 @@ def __init__(self, options: dict[str, str]) -> None: def init(self, options: dict[str, str]) -> None: if JIEBA: - dict_path = options.get('dict') + dict_path = options.get('dict', jieba.get_dict_file().name) if dict_path and os.path.isfile(dict_path): jieba.load_userdict(dict_path) From b41d2fc591ddde73974f1c8de7193d595839992b Mon Sep 17 00:00:00 2001 From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com> Date: Fri, 11 Oct 2024 20:21:09 +0800 Subject: [PATCH 2/7] directly get the default dict path --- sphinx/search/zh.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sphinx/search/zh.py b/sphinx/search/zh.py index f0503ecefba..7588966f065 100644 --- a/sphinx/search/zh.py +++ b/sphinx/search/zh.py @@ -234,7 +234,8 @@ def __init__(self, options: dict[str, str]) -> None: def init(self, options: dict[str, str]) -> None: if JIEBA: - dict_path = options.get('dict', jieba.get_dict_file().name) + default_dict_path = os.path.join(os.path.dirname(jieba.__file__), "dict.txt") + dict_path = options.get('dict', default_dict_path) if dict_path and os.path.isfile(dict_path): jieba.load_userdict(dict_path) From 46753b903d29fb3d080e7c260c8020e24e5bb663 Mon Sep 17 00:00:00 2001 From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com> Date: Fri, 11 Oct 2024 20:27:58 +0800 Subject: [PATCH 3/7] format --- sphinx/search/zh.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sphinx/search/zh.py b/sphinx/search/zh.py index 7588966f065..b0d3345e5fd 100644 --- a/sphinx/search/zh.py +++ b/sphinx/search/zh.py @@ -234,7 +234,9 @@ def __init__(self, options: dict[str, str]) -> None: def init(self, options: dict[str, str]) -> None: if JIEBA: - default_dict_path = os.path.join(os.path.dirname(jieba.__file__), "dict.txt") + default_dict_path = os.path.join( + os.path.dirname(jieba.__file__), "dict.txt" + ) dict_path = options.get('dict', default_dict_path) if dict_path and os.path.isfile(dict_path): jieba.load_userdict(dict_path) From 6ca14b6142a4a3f30593ac97487f0dbeddf65b57 Mon Sep 17 00:00:00 2001 From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com> Date: Fri, 11 Oct 2024 20:30:17 +0800 Subject: [PATCH 4/7] single quote --- sphinx/search/zh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx/search/zh.py b/sphinx/search/zh.py index b0d3345e5fd..8345d1ab0a3 100644 --- a/sphinx/search/zh.py +++ b/sphinx/search/zh.py @@ -235,7 +235,7 @@ def __init__(self, options: dict[str, str]) -> None: def init(self, options: dict[str, str]) -> None: if JIEBA: default_dict_path = os.path.join( - os.path.dirname(jieba.__file__), "dict.txt" + os.path.dirname(jieba.__file__), 'dict.txt' ) dict_path = options.get('dict', default_dict_path) if dict_path and os.path.isfile(dict_path): From 7f0577548d429a0edb2db93a98868b4187becfec Mon Sep 17 00:00:00 2001 From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com> Date: Tue, 15 Oct 2024 10:07:58 +0800 Subject: [PATCH 5/7] not rely on __file__ --- sphinx/search/zh.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sphinx/search/zh.py b/sphinx/search/zh.py index 8345d1ab0a3..df48e25f154 100644 --- a/sphinx/search/zh.py +++ b/sphinx/search/zh.py @@ -2,6 +2,7 @@ from __future__ import annotations +import inspect import os import re @@ -235,7 +236,7 @@ def __init__(self, options: dict[str, str]) -> None: def init(self, options: dict[str, str]) -> None: if JIEBA: default_dict_path = os.path.join( - os.path.dirname(jieba.__file__), 'dict.txt' + os.path.dirname(inspect.getfile(jieba)), jieba.DEFAULT_DICT_NAME ) dict_path = options.get('dict', default_dict_path) if dict_path and os.path.isfile(dict_path): From 2b69df33e48e7666106b1e3a4b74a28ee9b63415 Mon Sep 17 00:00:00 2001 From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com> Date: Fri, 18 Oct 2024 14:46:12 +0800 Subject: [PATCH 6/7] Revert "not rely on __file__" This reverts commit 7f0577548d429a0edb2db93a98868b4187becfec. --- sphinx/search/zh.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sphinx/search/zh.py b/sphinx/search/zh.py index df48e25f154..8345d1ab0a3 100644 --- a/sphinx/search/zh.py +++ b/sphinx/search/zh.py @@ -2,7 +2,6 @@ from __future__ import annotations -import inspect import os import re @@ -236,7 +235,7 @@ def __init__(self, options: dict[str, str]) -> None: def init(self, options: dict[str, str]) -> None: if JIEBA: default_dict_path = os.path.join( - os.path.dirname(inspect.getfile(jieba)), jieba.DEFAULT_DICT_NAME + os.path.dirname(jieba.__file__), 'dict.txt' ) dict_path = options.get('dict', default_dict_path) if dict_path and os.path.isfile(dict_path): From 1276ec71875d2b42fe98bd809c44fb60402eb994 Mon Sep 17 00:00:00 2001 From: Kun Jinkao <45487685+Snoopy1866@users.noreply.github.com> Date: Fri, 18 Oct 2024 14:48:58 +0800 Subject: [PATCH 7/7] dynamically get default dict name --- sphinx/search/zh.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sphinx/search/zh.py b/sphinx/search/zh.py index 8345d1ab0a3..1634c128517 100644 --- a/sphinx/search/zh.py +++ b/sphinx/search/zh.py @@ -235,7 +235,7 @@ def __init__(self, options: dict[str, str]) -> None: def init(self, options: dict[str, str]) -> None: if JIEBA: default_dict_path = os.path.join( - os.path.dirname(jieba.__file__), 'dict.txt' + os.path.dirname(jieba.__file__), jieba.DEFAULT_DICT_NAME ) dict_path = options.get('dict', default_dict_path) if dict_path and os.path.isfile(dict_path):