mops 3.4.0__tar.gz → 3.4.2__tar.gz

{mops-3.4.0 → mops-3.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mops
-Version: 3.4.0
+Version: 3.4.2
 Summary: Wrapper of Selenium, Appium and Playwright with single API
 Author-email: Podolian Vladimir <vladimir.podolyan64@gmail.com>
 License: MIT

{mops-3.4.0 → mops-3.4.2}/mops/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '3.4.0'
+__version__ = '3.4.2'
 __project_name__ = 'mops'

{mops-3.4.0 → mops-3.4.2}/mops/base/driver_wrapper.py

@@ -128,7 +128,9 @@ class DriverWrapper(InternalMixin, Logging, DriverWrapperABC):
         if cls.session.sessions_count() == 0:
             cls = super().__new__(cls)
         else:
-            cls = super().__new__(type(f'ShadowDriverWrapper', (cls, ), get_attributes_from_object(cls)))  # noqa
+            attrs = get_attributes_from_object(cls)
+            attrs.pop('_configured', None)
+            cls = super().__new__(type(f'ShadowDriverWrapper', (cls, ), attrs))  # noqa
 
         for name, _ in extract_named_objects(cls, bool).items():
             setattr(cls, name, False)

{mops-3.4.0 → mops-3.4.2}/mops/base/element.py

@@ -169,7 +169,7 @@ class Element(DriverMixin, InternalMixin, Logging, ElementABC, metaclass=Element
 
     @property
     def locator(self) -> str:
-        if not self._is_locator_configured:
+        if self.driver_wrapper and not self._is_locator_configured:
             self._set_locator()
 
         return self._locator
@@ -181,7 +181,7 @@ class Element(DriverMixin, InternalMixin, Logging, ElementABC, metaclass=Element
 
     @property
     def locator_type(self) -> str:
-        if not self._is_locator_configured:
+        if self.driver_wrapper and not self._is_locator_configured:
             self._set_locator()
 
         return self._locator_type
@@ -192,7 +192,7 @@ class Element(DriverMixin, InternalMixin, Logging, ElementABC, metaclass=Element
 
     @property
     def log_locator(self) -> str:
-        if not self._is_locator_configured:
+        if self.driver_wrapper and not self._is_locator_configured:
             self._set_locator()
 
         return self._log_locator

{mops-3.4.0 → mops-3.4.2}/mops/mixins/internal_mixin.py

@@ -6,6 +6,7 @@ from typing import Any
 from mops.utils.internal_utils import (
     extract_named_objects,
     extract_all_named_objects,
+    is_driver_wrapper,
 )
 
 
@@ -49,6 +50,15 @@ class InternalMixin:
         if not hasattr(self, var):
             setattr(self, var, value)
 
+    def _get_protected_attrs(self: Any, current_obj_cls) -> set:
+        if not is_driver_wrapper(self):
+            return set(get_all_static_attributes(current_obj_cls))
+
+        if '_framework_attrs' not in current_obj_cls.__dict__:
+            current_obj_cls._framework_attrs = set(get_all_static_attributes(current_obj_cls))
+
+        return current_obj_cls.__dict__['_framework_attrs']
+
     def _set_static(self: Any, cls) -> None:
         """
         Set static from base cls (Web/Mobile/Play Element/Page etc.)
@@ -57,16 +67,16 @@ class InternalMixin:
         """
         current_obj_cls = self.__class__
 
-        if current_obj_cls.__dict__.get('_configured'):
+        if current_obj_cls.__dict__.get('_configured') is cls:
             return
 
-        existing_attrs = set(get_all_static_attributes(current_obj_cls))
+        protected = self._get_protected_attrs(current_obj_cls)
 
         for name, value in get_static_attributes(cls).items():
-            if name not in existing_attrs:
+            if name not in protected:
                 setattr(current_obj_cls, name, value)
 
-        current_obj_cls._configured = True
+        current_obj_cls._configured = cls
 
     def _repr_builder(self: Any):
         class_name = self.__class__.__name__

{mops-3.4.0 → mops-3.4.2}/mops.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mops
-Version: 3.4.0
+Version: 3.4.2
 Summary: Wrapper of Selenium, Appium and Playwright with single API
 Author-email: Podolian Vladimir <vladimir.podolyan64@gmail.com>
 License: MIT