Skip to content

Commit d572430

Browse files
_modify_sub_elements reworked for Element
1 parent a0a3002 commit d572430

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

mops/base/element.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def __full_init__(self, driver_wrapper: Any = None):
131131
self.driver_wrapper = get_driver_wrapper_from_object(driver_wrapper)
132132

133133
self._modify_object()
134-
self._modify_children()
134+
self._modify_sub_elements()
135135

136136
if not self._initialized:
137137
self.__init_base_class__()
@@ -763,13 +763,16 @@ def _get_all_elements(self, sources: Union[tuple, list]) -> List[Any]:
763763

764764
return wrapped_elements
765765

766-
def _modify_children(self):
766+
def _modify_sub_elements(self):
767767
"""
768768
Initializing of attributes with type == Element.
769769
Required for classes with base == Element.
770770
"""
771-
self.sub_elements = get_child_elements_with_names(self, Element)
772-
initialize_objects(self, self.sub_elements, Element)
771+
self.sub_elements = {}
772+
773+
if type(self) is not Element:
774+
self.sub_elements = get_child_elements_with_names(self, Element)
775+
initialize_objects(self, self.sub_elements, Element)
773776

774777
def _modify_object(self):
775778
"""

mops/base/group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def __init__(
7272
driver_wrapper=driver_wrapper,
7373
)
7474

75-
def _modify_children(self) -> None:
75+
def _modify_sub_elements(self) -> None:
7676
"""
7777
Initializing of attributes with type == Group/Element.
7878
Required for classes with base == Group.

mops/base/page.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def __init__(
8484

8585
self._init_locals = locals()
8686
self._modify_page_driver_wrapper(driver_wrapper)
87-
self._modify_children()
87+
self._modify_sub_elements()
8888
self._safe_setter('__base_obj_id', id(self))
8989

9090
self.page_elements: List[Element] = get_child_elements(self, Element)
@@ -192,7 +192,7 @@ def is_page_opened(self, with_elements: bool = False, with_url: bool = False) ->
192192

193193
return result
194194

195-
def _modify_children(self):
195+
def _modify_sub_elements(self):
196196
"""
197197
Initializing of attributes with type == Element.
198198
Required for classes with base == Page.

0 commit comments

Comments
 (0)