Make methods private.

This commit is contained in:
Rodrigo Girão Serrão
2023-01-12 15:47:58 +00:00
parent dff226efa2
commit a3e54323d9
5 changed files with 22 additions and 19 deletions

View File

@@ -1405,7 +1405,7 @@ class App(Generic[ReturnType], DOMNode):
try: try:
if self.css_path: if self.css_path:
self.stylesheet.read_all(self.css_path) self.stylesheet.read_all(self.css_path)
for path, css, tie_breaker in self.get_default_css(): for path, css, tie_breaker in self._get_default_css():
self.stylesheet.add_source( self.stylesheet.add_source(
css, path=path, is_default_css=True, tie_breaker=tie_breaker css, path=path, is_default_css=True, tie_breaker=tie_breaker
) )

View File

@@ -407,7 +407,7 @@ class Stylesheet:
self.replace_rules(node, node_rules, animate=animate) self.replace_rules(node, node_rules, animate=animate)
node._component_styles.clear() node._component_styles.clear()
for component in node.get_component_classes(): for component in node._get_component_classes():
virtual_node = DOMNode(classes=component) virtual_node = DOMNode(classes=component)
virtual_node._attach(node) virtual_node._attach(node)
self.apply(virtual_node, animate=False) self.apply(virtual_node, animate=False)

View File

@@ -262,9 +262,12 @@ class DOMNode(MessagePump):
if self._classes: if self._classes:
yield "classes", " ".join(self._classes) yield "classes", " ".join(self._classes)
def get_default_css(self) -> list[tuple[str, str, int]]: def _get_default_css(self) -> list[tuple[str, str, int]]:
"""Gets the CSS for this class and inherited from bases. """Gets the CSS for this class and inherited from bases.
Default CSS is inherited from base classes, unless `inherit_css` is set to
`False` when subclassing.
Returns: Returns:
list[tuple[str, str]]: a list of tuples containing (PATH, SOURCE) for this list[tuple[str, str]]: a list of tuples containing (PATH, SOURCE) for this
and inherited from base classes. and inherited from base classes.
@@ -286,7 +289,7 @@ class DOMNode(MessagePump):
return css_stack return css_stack
def get_component_classes(self) -> set[str]: def _get_component_classes(self) -> set[str]:
"""Gets the component classes for this class and inherited from bases. """Gets the component classes for this class and inherited from bases.
Component classes are inherited from base classes, unless Component classes are inherited from base classes, unless

View File

@@ -695,7 +695,7 @@ class Widget(DOMNode):
app (App): App instance. app (App): App instance.
""" """
# Parse the Widget's CSS # Parse the Widget's CSS
for path, css, tie_breaker in self.get_default_css(): for path, css, tie_breaker in self._get_default_css():
self.app.stylesheet.add_source( self.app.stylesheet.add_source(
css, path=path, is_default_css=True, tie_breaker=tie_breaker css, path=path, is_default_css=True, tie_breaker=tie_breaker
) )

View File

@@ -79,7 +79,7 @@ def test_inherited_bindings():
assert list(e._bindings.keys.keys()) == ["e"] assert list(e._bindings.keys.keys()) == ["e"]
def test_get_default_css(): def test__get_default_css():
class A(DOMNode): class A(DOMNode):
pass pass
@@ -96,17 +96,17 @@ def test_get_default_css():
DEFAULT_CSS = "E" DEFAULT_CSS = "E"
node = DOMNode() node = DOMNode()
node_css = node.get_default_css() node_css = node._get_default_css()
a = A() a = A()
a_css = a.get_default_css() a_css = a._get_default_css()
b = B() b = B()
b_css = b.get_default_css() b_css = b._get_default_css()
c = C() c = C()
c_css = c.get_default_css() c_css = c._get_default_css()
d = D() d = D()
d_css = d.get_default_css() d_css = d._get_default_css()
e = E() e = E()
e_css = e.get_default_css() e_css = e._get_default_css()
# Descendants that don't assign to DEFAULT_CSS don't add new CSS to the stack. # Descendants that don't assign to DEFAULT_CSS don't add new CSS to the stack.
assert len(node_css) == len(a_css) == len(b_css) == 0 assert len(node_css) == len(a_css) == len(b_css) == 0
@@ -143,19 +143,19 @@ def test_component_classes_inheritance():
COMPONENT_CLASSES = {"f-1"} COMPONENT_CLASSES = {"f-1"}
node = DOMNode() node = DOMNode()
node_cc = node.get_component_classes() node_cc = node._get_component_classes()
a = A() a = A()
a_cc = a.get_component_classes() a_cc = a._get_component_classes()
b = B() b = B()
b_cc = b.get_component_classes() b_cc = b._get_component_classes()
c = C() c = C()
c_cc = c.get_component_classes() c_cc = c._get_component_classes()
d = D() d = D()
d_cc = d.get_component_classes() d_cc = d._get_component_classes()
e = E() e = E()
e_cc = e.get_component_classes() e_cc = e._get_component_classes()
f = F() f = F()
f_cc = f.get_component_classes() f_cc = f._get_component_classes()
assert node_cc == set() assert node_cc == set()
assert a_cc == {"a-1", "a-2"} assert a_cc == {"a-1", "a-2"}