From 4adfe69ec90499a50a966ae655c05276f14a6acf Mon Sep 17 00:00:00 2001 From: Dave Pearson Date: Mon, 23 Jan 2023 17:37:58 +0000 Subject: [PATCH] Remove TreeNode as a pseudo-widget This encourages importing it from `textual.widgets.tree` instead, keeping it in line with the other changes made for #1637. Note this is a breaking change. --- examples/json_tree.py | 3 ++- src/textual/widgets/__init__.py | 2 -- src/textual/widgets/_tree_node.py | 1 - tests/tree/test_tree_node_children.py | 3 ++- tests/tree/test_tree_node_label.py | 3 ++- tests/tree/test_tree_node_parent.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 src/textual/widgets/_tree_node.py diff --git a/examples/json_tree.py b/examples/json_tree.py index 7380fcc25..45cede3c5 100644 --- a/examples/json_tree.py +++ b/examples/json_tree.py @@ -4,7 +4,8 @@ from pathlib import Path from rich.text import Text from textual.app import App, ComposeResult -from textual.widgets import Header, Footer, Tree, TreeNode +from textual.widgets import Header, Footer, Tree +from textual.widgets.tree import TreeNode class TreeApp(App): diff --git a/src/textual/widgets/__init__.py b/src/textual/widgets/__init__.py index 4628cbe92..295b8bf12 100644 --- a/src/textual/widgets/__init__.py +++ b/src/textual/widgets/__init__.py @@ -23,7 +23,6 @@ if typing.TYPE_CHECKING: from ._static import Static from ._text_log import TextLog from ._tree import Tree - from ._tree_node import TreeNode from ._welcome import Welcome from ..widget import Widget @@ -44,7 +43,6 @@ __all__ = [ "Static", "TextLog", "Tree", - "TreeNode", "Welcome", ] diff --git a/src/textual/widgets/_tree_node.py b/src/textual/widgets/_tree_node.py deleted file mode 100644 index e6c57fb61..000000000 --- a/src/textual/widgets/_tree_node.py +++ /dev/null @@ -1 +0,0 @@ -from ._tree import TreeNode as TreeNode diff --git a/tests/tree/test_tree_node_children.py b/tests/tree/test_tree_node_children.py index eb5c949c0..d6c5c7e4e 100644 --- a/tests/tree/test_tree_node_children.py +++ b/tests/tree/test_tree_node_children.py @@ -1,5 +1,6 @@ import pytest -from textual.widgets import Tree, TreeNode +from textual.widgets import Tree +from textual.widgets.tree import TreeNode def label_of(node: TreeNode[None]): diff --git a/tests/tree/test_tree_node_label.py b/tests/tree/test_tree_node_label.py index e64fcf24d..7d7a04329 100644 --- a/tests/tree/test_tree_node_label.py +++ b/tests/tree/test_tree_node_label.py @@ -1,4 +1,5 @@ -from textual.widgets import Tree, TreeNode +from textual.widgets import Tree +from textual.widgets.tree import TreeNode from rich.text import Text diff --git a/tests/tree/test_tree_node_parent.py b/tests/tree/test_tree_node_parent.py index b9d85af43..87e66ebc4 100644 --- a/tests/tree/test_tree_node_parent.py +++ b/tests/tree/test_tree_node_parent.py @@ -1,4 +1,4 @@ -from textual.widgets import TreeNode, Tree +from textual.widgets import Tree def test_tree_node_parent() -> None: