pymobiledevice3 6.0.0__tar.gz → 6.0.1__tar.gz

{pymobiledevice3-6.0.0 → pymobiledevice3-6.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 6.0.0
+Version: 6.0.1
 Summary: Pure python3 implementation for working with iDevices (iPhone, etc...)
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>

{pymobiledevice3-6.0.0 → pymobiledevice3-6.0.1}/pymobiledevice3/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '6.0.0'
-__version_tuple__ = version_tuple = (6, 0, 0)
+__version__ = version = '6.0.1'
+__version_tuple__ = version_tuple = (6, 0, 1)
 
-__commit_id__ = commit_id = 'g135400891'
+__commit_id__ = commit_id = 'g782364170'

{pymobiledevice3-6.0.0 → pymobiledevice3-6.0.1}/pymobiledevice3/services/web_protocol/alert.py

@@ -5,22 +5,22 @@ class Alert:
         """
         self.session = session
 
-    def accept(self):
+    async def accept(self):
         """Accepts the alert available."""
-        self.session.accept_current_javascript_dialog()
+        await self.session.accept_current_javascript_dialog()
 
-    def dismiss(self):
+    async def dismiss(self):
         """Dismisses the alert available."""
-        self.session.dismiss_current_javascript_dialog()
+        await self.session.dismiss_current_javascript_dialog()
 
-    def send_keys(self, text: str):
+    async def send_keys(self, text: str):
         """
         Send Keys to the Alert.
         :param text: Text to send to prompts.
         """
-        self.session.set_user_input_for_current_javascript_prompt(text)
+        await self.session.set_user_input_for_current_javascript_prompt(text)
 
     @property
-    def text(self) -> str:
+    async def text(self) -> str:
         """Gets the text of the Alert."""
-        return self.session.message_of_current_javascript_dialog()
+        return await self.session.message_of_current_javascript_dialog()

{pymobiledevice3-6.0.0 → pymobiledevice3-6.0.1}/pymobiledevice3/services/web_protocol/driver.py

@@ -127,9 +127,9 @@ class WebDriver(SeleniumApi):
         """Gets the screenshot of the current window as a base64 encoded string."""
         return await self.session.screenshot_as_base64()
 
-    def get_window_position(self) -> Point:
+    async def get_window_position(self) -> Point:
         """Gets the x,y position of the current window."""
-        rect = self.get_window_rect()
+        rect = await self.get_window_rect()
         return Point(x=rect.x, y=rect.y)
 
     async def get_window_rect(self) -> Rect:

{pymobiledevice3-6.0.0 → pymobiledevice3-6.0.1}/pymobiledevice3/services/web_protocol/element.py

@@ -54,7 +54,7 @@ class WebElement(SeleniumApi):
 
     async def find_element(self, by=By.ID, value=None):
         """Find an element given a By strategy and locator."""
-        elem = self.session.find_elements(by, value, root=self.id_)
+        elem = await self.session.find_elements(by, value, root=self.id_)
         return None if elem is None else WebElement(self.session, elem)
 
     async def find_elements(self, by=By.ID, value=None):
@@ -180,9 +180,9 @@ class WebElement(SeleniumApi):
             "}"
         )
 
-    def is_editable(self) -> bool:
+    async def is_editable(self) -> bool:
         """Returns whether the element is editable."""
-        return self._evaluate_js_function(IS_EDITABLE)
+        return await self._evaluate_js_function(IS_EDITABLE)
 
     async def _compute_layout(self, scroll_if_needed=True, use_viewport=False):
         try:

pymobiledevice3-6.0.1/pymobiledevice3/services/web_protocol/selenium_api.py

@@ -0,0 +1,91 @@
+from abc import ABC, abstractmethod
+from base64 import b64decode
+
+from pymobiledevice3.services.web_protocol.automation_session import By
+
+
+class SeleniumApi(ABC):
+    @abstractmethod
+    async def find_element(self, by=By.ID, value=None):
+        pass
+
+    @abstractmethod
+    async def find_elements(self, by=By.ID, value=None):
+        pass
+
+    @property
+    @abstractmethod
+    async def screenshot_as_base64(self) -> str:
+        pass
+
+    async def find_element_by_class_name(self, name):
+        return await self.find_element(By.CLASS_NAME, name)
+
+    async def find_element_by_css_selector(self, css_selector):
+        return await self.find_element(By.CSS_SELECTOR, css_selector)
+
+    async def find_element_by_id(self, id_):
+        return await self.find_element(value=id_)
+
+    async def find_element_by_link_text(self, link_text):
+        return await self.find_element(By.LINK_TEXT, link_text)
+
+    async def find_element_by_name(self, name):
+        return await self.find_element(By.NAME, name)
+
+    async def find_element_by_partial_link_text(self, link_text):
+        return await self.find_element(By.PARTIAL_LINK_TEXT, link_text)
+
+    async def find_element_by_tag_name(self, name):
+        return await self.find_element(By.TAG_NAME, name)
+
+    async def find_element_by_xpath(self, xpath):
+        return await self.find_element(By.XPATH, xpath)
+
+    async def find_elements_by_class_name(self, name):
+        return await self.find_elements(By.CLASS_NAME, name)
+
+    async def find_elements_by_css_selector(self, css_selector):
+        return await self.find_elements(By.CSS_SELECTOR, css_selector)
+
+    async def find_elements_by_id(self, id_):
+        return await self.find_elements(value=id_)
+
+    async def find_elements_by_link_text(self, link_text):
+        return await self.find_elements(By.LINK_TEXT, link_text)
+
+    async def find_elements_by_name(self, name):
+        return await self.find_elements(By.NAME, name)
+
+    async def find_elements_by_partial_link_text(self, link_text):
+        return await self.find_elements(By.PARTIAL_LINK_TEXT, link_text)
+
+    async def find_elements_by_tag_name(self, name):
+        return await self.find_elements(By.TAG_NAME, name)
+
+    async def find_elements_by_xpath(self, xpath):
+        return await self.find_elements(By.XPATH, xpath)
+
+    async def screenshot(self, filename):
+        png = await self.screenshot_as_png()
+        try:
+            with open(filename, "wb") as f:
+                f.write(png)
+        except OSError:
+            return False
+        return True
+
+    async def screenshot_as_png(self) -> bytes:
+        return b64decode((await self.screenshot_as_base64).encode("ascii"))
+
+    async def get_screenshot_as_base64(self) -> str:
+        return await self.screenshot_as_base64
+
+    async def get_screenshot_as_file(self, filename):
+        return await self.screenshot(filename)
+
+    async def get_screenshot_as_png(self):
+        return await self.screenshot_as_png()
+
+    async def save_screenshot(self, filename) -> bool:
+        return await self.screenshot(filename)

{pymobiledevice3-6.0.0 → pymobiledevice3-6.0.1}/pymobiledevice3/services/web_protocol/switch_to.py

@@ -11,10 +11,12 @@ class SwitchTo:
         self.session = session
 
     @property
-    def active_element(self) -> WebElement:
+    async def active_element(self) -> WebElement:
         """Returns the element with focus, or BODY if nothing has focus."""
-        self.session.wait_for_navigation_to_complete()
-        elem = self.session.evaluate_js_function("function() { return document.activeElement; }", include_frame=False)
+        await self.session.wait_for_navigation_to_complete()
+        elem = await self.session.evaluate_js_function(
+            "function() { return document.activeElement; }", include_frame=False
+        )
         return WebElement(self.session, elem)
 
     @property
@@ -22,11 +24,11 @@ class SwitchTo:
         """Switches focus to an alert on the page."""
         return Alert(self.session)
 
-    def default_content(self):
+    async def default_content(self):
         """Switch focus to the default frame."""
-        self.session.switch_to_browsing_context("")
+        await self.session.switch_to_browsing_context("")
 
-    def frame(self, frame_reference):
+    async def frame(self, frame_reference):
         """
         Switches focus to the specified frame, by index, name, or web element.
         :param frame_reference: The name of the window to switch to, an integer representing the index,
@@ -35,32 +37,34 @@ class SwitchTo:
         if isinstance(frame_reference, (int, WebElement)):
             frame = frame_reference
         elif isinstance(frame_reference, str):
-            elem = self.session.find_elements(By.ID, frame_reference)
+            elem = await self.session.find_elements(By.ID, frame_reference)
             if elem is None:
-                elem = self.session.find_elements(By.NAME, frame_reference)
+                elem = await self.session.find_elements(By.NAME, frame_reference)
             frame = WebElement(self.session, elem)
         else:
             raise TypeError()
 
-        self.session.wait_for_navigation_to_complete()
+        await self.session.wait_for_navigation_to_complete()
         if isinstance(frame, int):
-            self.session.switch_to_frame(frame_ordinal=frame)
+            await self.session.switch_to_frame(frame_ordinal=frame)
         else:
-            self.session.switch_to_frame(frame_handle=frame)
+            await self.session.switch_to_frame(frame_handle=frame)
 
-    def new_window(self, type_=""):
+    async def new_window(self, type_=""):
         """Switches to a new top-level browsing context."""
-        self.session.switch_to_window(self.session.create_window(type_))
+        await self.session.switch_to_window(self.session.create_window(type_))
 
-    def parent_frame(self):
+    async def parent_frame(self):
         """
         Switches focus to the parent context. If the current context is the top
         level browsing context, the context remains unchanged.
         """
-        self.session.wait_for_navigation_to_complete()
-        self.session.switch_to_browsing_context_frame(self.session.top_level_handle, self.session.current_parent_handle)
-        self.session.switch_to_browsing_context(self.session.current_parent_handle)
+        await self.session.wait_for_navigation_to_complete()
+        await self.session.switch_to_browsing_context_frame(
+            self.session.top_level_handle, self.session.current_parent_handle
+        )
+        await self.session.switch_to_browsing_context(self.session.current_parent_handle)
 
-    def window(self, window_name):
+    async def window(self, window_name):
         """Switches focus to the specified window."""
-        self.session.switch_to_window(window_name)
+        await self.session.switch_to_window(window_name)

{pymobiledevice3-6.0.0 → pymobiledevice3-6.0.1}/pymobiledevice3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymobiledevice3
-Version: 6.0.0
+Version: 6.0.1
 Summary: Pure python3 implementation for working with iDevices (iPhone, etc...)
 Author-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>
 Maintainer-email: doronz88 <doron88@gmail.com>, matan <matan1008@gmail.com>

pymobiledevice3-6.0.0/pymobiledevice3/services/web_protocol/selenium_api.py

@@ -1,91 +0,0 @@
-from abc import ABC, abstractmethod
-from base64 import b64decode
-
-from pymobiledevice3.services.web_protocol.automation_session import By
-
-
-class SeleniumApi(ABC):
-    @abstractmethod
-    def find_element(self, by=By.ID, value=None):
-        pass
-
-    @abstractmethod
-    def find_elements(self, by=By.ID, value=None):
-        pass
-
-    @property
-    @abstractmethod
-    def screenshot_as_base64(self):
-        pass
-
-    def find_element_by_class_name(self, name):
-        return self.find_element(By.CLASS_NAME, name)
-
-    def find_element_by_css_selector(self, css_selector):
-        return self.find_element(By.CSS_SELECTOR, css_selector)
-
-    def find_element_by_id(self, id_):
-        return self.find_element(value=id_)
-
-    def find_element_by_link_text(self, link_text):
-        return self.find_element(By.LINK_TEXT, link_text)
-
-    def find_element_by_name(self, name):
-        return self.find_element(By.NAME, name)
-
-    def find_element_by_partial_link_text(self, link_text):
-        return self.find_element(By.PARTIAL_LINK_TEXT, link_text)
-
-    def find_element_by_tag_name(self, name):
-        return self.find_element(By.TAG_NAME, name)
-
-    def find_element_by_xpath(self, xpath):
-        return self.find_element(By.XPATH, xpath)
-
-    def find_elements_by_class_name(self, name):
-        return self.find_elements(By.CLASS_NAME, name)
-
-    def find_elements_by_css_selector(self, css_selector):
-        return self.find_elements(By.CSS_SELECTOR, css_selector)
-
-    def find_elements_by_id(self, id_):
-        return self.find_elements(value=id_)
-
-    def find_elements_by_link_text(self, link_text):
-        return self.find_elements(By.LINK_TEXT, link_text)
-
-    def find_elements_by_name(self, name):
-        return self.find_elements(By.NAME, name)
-
-    def find_elements_by_partial_link_text(self, link_text):
-        return self.find_elements(By.PARTIAL_LINK_TEXT, link_text)
-
-    def find_elements_by_tag_name(self, name):
-        return self.find_elements(By.TAG_NAME, name)
-
-    def find_elements_by_xpath(self, xpath):
-        return self.find_elements(By.XPATH, xpath)
-
-    def screenshot(self, filename):
-        png = self.screenshot_as_png()
-        try:
-            with open(filename, "wb") as f:
-                f.write(png)
-        except OSError:
-            return False
-        return True
-
-    def screenshot_as_png(self):
-        return b64decode(self.screenshot_as_base64.encode("ascii"))
-
-    def get_screenshot_as_base64(self):
-        return self.screenshot_as_base64
-
-    def get_screenshot_as_file(self, filename):
-        return self.screenshot(filename)
-
-    def get_screenshot_as_png(self):
-        return self.screenshot_as_png()
-
-    def save_screenshot(self, filename) -> bool:
-        return self.screenshot(filename)