mops 3.5.0__tar.gz → 3.5.2__tar.gz

{mops-3.5.0 → mops-3.5.2}/PKG-INFO

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

{mops-3.5.0 → mops-3.5.2}/mops/__init__.py

@@ -1,4 +1,4 @@
 """Wrapper of Selenium, Appium and Playwright with a single API."""
 
-__version__ = '3.5.0'
+__version__ = '3.5.2'
 __project_name__ = 'mops'

{mops-3.5.0 → mops-3.5.2}/mops/abstraction/driver_wrapper_abc.py

@@ -44,6 +44,8 @@ class DriverWrapperABC(ABC):
     is_simulator: bool = False
     is_real_device: bool = False
 
+    is_cdp: bool = False
+
     browser_name: str | None = None
 
     @cached_property

{mops-3.5.0 → mops-3.5.2}/mops/base/driver_wrapper.py

@@ -128,6 +128,8 @@ class DriverWrapper(InternalMixin, Logging, DriverWrapperABC):
     is_simulator: bool = False
     is_real_device: bool = False
 
+    is_cdp: bool = False
+
     browser_name: str | None = None
 
     def __new__(cls, *args: Any, **kwargs: Any) -> Self:

{mops-3.5.0 → mops-3.5.2}/mops/playwright/play_driver.py

@@ -175,12 +175,19 @@ class PlayDriver(Logging, DriverWrapperABC):
 
         :return: :obj:`None`
         """
-        if trace_path:
+        if trace_path and not self.is_cdp:
             with contextlib.suppress(PlaywrightError):
                 self.context.tracing.stop(path=trace_path)
 
-        self._base_driver.close()
-        self.context.close()
+        if self.is_cdp:
+            with contextlib.suppress(PlaywrightError):
+                self._base_driver.close()
+
+            with contextlib.suppress(PlaywrightError):
+                self.context.close()
+        else:
+            self._base_driver.close()
+            self.context.close()
 
     def set_cookie(self, cookies: list[dict]) -> PlayDriver:
         """
@@ -298,7 +305,10 @@ class PlayDriver(Logging, DriverWrapperABC):
 
         :return: The size of the inner window as a :class:`.Size` object.
         """
-        return Size(**self.driver.viewport_size)
+        viewport = self.driver.viewport_size
+        if viewport is None:
+            return Size(width=0, height=0)
+        return Size(**viewport)
 
     def get_window_size(self) -> Size:
         """

{mops-3.5.0 → mops-3.5.2}/mops/selenium/core/core_driver.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 from functools import cached_property
 import time
 from typing import TYPE_CHECKING, Any
@@ -223,7 +224,11 @@ class CoreDriver(Logging, DriverWrapperABC):
 
         :return: :obj:`None`
         """
-        self.driver.quit()
+        if self.is_cdp:
+            with contextlib.suppress(SeleniumWebDriverException):
+                self.driver.quit()
+        else:
+            self.driver.quit()
 
     def set_cookie(self, cookies: list[dict]) -> CoreDriver:
         """

{mops-3.5.0 → mops-3.5.2}/mops/utils/decorators.py

@@ -69,7 +69,6 @@ def wait_condition(method: Callable) -> Callable:
         validate_timeout(timeout)
         validate_silent(silent)
 
-        should_increase_delay = self.driver_wrapper.is_appium
         delay = WAIT_METHODS_DELAY
         is_log_needed = not silent
         start_time = time.time()
@@ -89,8 +88,7 @@ def wait_condition(method: Callable) -> Callable:
 
             time.sleep(delay)
 
-            if should_increase_delay:
-                delay = increase_delay(delay)
+            delay = increase_delay(delay)
 
         result.exc._timeout = timeout
         raise result.exc

{mops-3.5.0 → mops-3.5.2}/mops.egg-info/PKG-INFO

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