From 65a8fc314f6360ea5070f113c8da63f5f444e94b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=A2=81=E9=B9=8F=E5=A0=83?= Date: Sun, 20 Apr 2025 08:59:26 +0000 Subject: [PATCH] Fix encode during show(stdout=True) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张梁鹏堃 --- Fix-encode-during-show-stdout-True.patch | 30 ++++++++++++++++++++++++ python-treelib.spec | 8 +++++-- 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 Fix-encode-during-show-stdout-True.patch diff --git a/Fix-encode-during-show-stdout-True.patch b/Fix-encode-during-show-stdout-True.patch new file mode 100644 index 0000000..69357f9 --- /dev/null +++ b/Fix-encode-during-show-stdout-True.patch @@ -0,0 +1,30 @@ +From 7f124327e8954bbcda68c2832f20b1d0d7a4808b Mon Sep 17 00:00:00 2001 +From: kiraskyler <80014218+kiraskyler@users.noreply.github.com> +Date: Sat, 1 Mar 2025 23:35:22 +0800 +Subject: [PATCH] Fix encode during show(stdout=True) (#230) + +Co-authored-by: niuwanli +--- + treelib/tree.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/treelib/tree.py b/treelib/tree.py +index e27200f..b16baa4 100644 +--- a/treelib/tree.py ++++ b/treelib/tree.py +@@ -948,6 +948,7 @@ def show( + :param reverse: the ``reverse`` param for sorting :class:`Node` objects in the same level. + :param line_type: + :param data_property: the property on the node data object to be printed. ++ :param stdout: if True print it, if False return printing. + :param sorting: if True perform node sorting, if False return + nodes in original insertion order. In latter case @key and + @reverse parameters are ignored. +@@ -975,7 +976,7 @@ def write(line): + print("Tree is empty") + + if stdout: +- print(self._reader.encode("utf-8")) ++ print(self._reader) + else: + return self._reader diff --git a/python-treelib.spec b/python-treelib.spec index a8f7ccb..8931528 100644 --- a/python-treelib.spec +++ b/python-treelib.spec @@ -1,11 +1,12 @@ %global _empty_manifest_terminate_build 0 Name: python-treelib Version: 1.7.0 -Release: 1 +Release: 2 Summary: A Python 2/3 implementation of tree structure. License: Apache-2.0 URL: https://github.com/caesar0301/treelib Source0: https://files.pythonhosted.org/packages/d8/ec/962387a2bd7ece011f47cfa08f06f832fc9fd41b31f4f0007b8b7948eb93/treelib-1.7.0.tar.gz +Patch0001: Fix-encode-during-show-stdout-True.patch BuildArch: noarch @@ -29,7 +30,7 @@ Provides: python3-treelib-doc This is a simple tree data structure implementation in python. %prep -%autosetup -n treelib-%{version} +%autosetup -n treelib-%{version} -p1 %build %py3_build @@ -69,6 +70,9 @@ mv %{buildroot}/doclist.lst . %{_docdir}/* %changelog +* Sun Apr 20 2025 zhangliangpengkun - 1.7.0-2 +- DESC:Fix encode during show(stdout=True) + * Tue Nov 05 2024 xiaozai - 1.7.0-1 - Update package to version 1.7.0 - Remove deprecated plugins -- Gitee