seleniumbase 4.28.4__tar.gz → 4.28.4a1__tar.gz

{seleniumbase-4.28.4 → seleniumbase-4.28.4a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.28.4
+Version: 4.28.4a1
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz

{seleniumbase-4.28.4 → seleniumbase-4.28.4a1}/examples/raw_uc_mode.py

@@ -4,7 +4,7 @@ from seleniumbase import SB
 with SB(uc=True, test=True) as sb:
     url = "https://gitlab.com/users/sign_in"
     sb.uc_open_with_reconnect(url, 4)
-    sb.uc_gui_click_cf()
+    sb.uc_gui_handle_cf()
     sb.assert_text("Username", '[for="user_login"]', timeout=3)
     sb.assert_element('label[for="user_login"]')
     sb.highlight('button:contains("Sign in")')

{seleniumbase-4.28.4 → seleniumbase-4.28.4a1}/help_docs/method_summary.md

@@ -1074,10 +1074,6 @@ driver.uc_gui_press_keys(keys)  # Use PyAutoGUI to press a list of keys
 
 driver.uc_gui_write(text)  # Similar to uc_gui_press_keys(), but faster
 
-driver.uc_gui_click_x_y(x, y, timeframe=0.25)  # PyAutoGUI click screen
-
-driver.uc_gui_click_cf(frame="iframe", retry=False, blind=False)  # (*)
-
 driver.uc_gui_handle_cf(frame="iframe")  # PyAutoGUI click CF Turnstile
 
 driver.uc_switch_to_frame(frame="iframe")  # Stealthy switch_to_frame()

seleniumbase-4.28.4a1/seleniumbase/__version__.py

@@ -0,0 +1,2 @@
+# seleniumbase package
+__version__ = "4.28.4a1"

{seleniumbase-4.28.4 → seleniumbase-4.28.4a1}/seleniumbase/core/browser_launcher.py

@@ -660,7 +660,7 @@ def get_gui_element_position(driver, selector):
     return (viewport_x, viewport_y)
 
 
-def uc_gui_click_x_y(driver, x, y, timeframe=0.25, uc_lock=True):
+def uc_gui_click_x_y(driver, x, y, timeframe=0.25):
     install_pyautogui_if_missing(driver)
     import pyautogui
     pyautogui = get_configured_pyautogui(pyautogui)
@@ -671,25 +671,12 @@ def uc_gui_click_x_y(driver, x, y, timeframe=0.25, uc_lock=True):
             " outside screen. (Width: %s, Height: %s)"
             % (x, y, screen_width, screen_height)
         )
-    if uc_lock:
-        gui_lock = fasteners.InterProcessLock(
-            constants.MultiBrowser.PYAUTOGUILOCK
-        )
-        with gui_lock:  # Prevent issues with multiple processes
-            pyautogui.moveTo(x, y, timeframe, pyautogui.easeOutQuad)
-            if timeframe >= 0.25:
-                time.sleep(0.0555)  # Wait if moving at human-speed
-            if "--debug" in sys.argv:
-                print(" <DEBUG> pyautogui.click(%s, %s)" % (x, y))
-            pyautogui.click(x=x, y=y)
-    else:
-        # Called from a method where the gui_lock is already active
-        pyautogui.moveTo(x, y, timeframe, pyautogui.easeOutQuad)
-        if timeframe >= 0.25:
-            time.sleep(0.0555)  # Wait if moving at human-speed
-        if "--debug" in sys.argv:
-            print(" <DEBUG> pyautogui.click(%s, %s)" % (x, y))
-        pyautogui.click(x=x, y=y)
+    pyautogui.moveTo(x, y, timeframe, pyautogui.easeOutQuad)
+    if timeframe >= 0.25:
+        time.sleep(0.0555)  # Wait if moving at human-speed
+    if "--debug" in sys.argv:
+        print(" <DEBUG> pyautogui.click(%s, %s)" % (x, y))
+    pyautogui.click(x=x, y=y)
 
 
 def on_a_cf_turnstile_page(driver):
@@ -738,7 +725,7 @@ def uc_gui_click_cf(driver, frame="iframe", retry=False, blind=False):
                     return
         try:
             selector = "span"
-            element = driver.wait_for_element_present(selector, timeout=2.5)
+            element = driver.wait_for_element_present(selector, timeout=2)
             x = i_x + element.rect["x"] + int(element.rect["width"] / 2) + 1
             y = i_y + element.rect["y"] + int(element.rect["height"] / 2) + 1
             driver.switch_to.default_content()
@@ -751,7 +738,7 @@ def uc_gui_click_cf(driver, frame="iframe", retry=False, blind=False):
         try:
             if x and y:
                 sb_config._saved_cf_x_y = (x, y)
-                uc_gui_click_x_y(driver, x, y, timeframe=0.842, uc_lock=False)
+                uc_gui_click_x_y(driver, x, y, timeframe=0.842)
         except Exception:
             pass
     reconnect_time = (float(constants.UC.RECONNECT_TIME) / 2.0) + 0.5
@@ -763,26 +750,20 @@ def uc_gui_click_cf(driver, frame="iframe", retry=False, blind=False):
     if blind:
         retry = True
     if retry and x and y and on_a_cf_turnstile_page(driver):
-        with gui_lock:  # Prevent issues with multiple processes
-            # Make sure the window is on top
-            page_actions.switch_to_window(
-                driver, driver.current_window_handle, 2, uc_lock=False
-            )
-            driver.switch_to_frame("iframe")
-            if driver.is_element_visible("#success-icon"):
-                driver.switch_to.parent_frame()
-                return
-            if blind:
-                driver.uc_open_with_disconnect(driver.current_url, 3.8)
-                uc_gui_click_x_y(driver, x, y, timeframe=1.05, uc_lock=False)
-            else:
-                driver.uc_open_with_reconnect(driver.current_url, 3.8)
-                if on_a_cf_turnstile_page(driver):
-                    driver.disconnect()
-                    uc_gui_click_x_y(
-                        driver, x, y, timeframe=1.05, uc_lock=False
-                    )
-        driver.reconnect(reconnect_time)
+        driver.switch_to_frame("iframe")
+        if driver.is_element_visible("#success-icon"):
+            driver.switch_to.parent_frame()
+            return
+        if blind:
+            driver.uc_open_with_disconnect(driver.current_url, 3.8)
+            uc_gui_click_x_y(driver, x, y, timeframe=1.05)
+            driver.reconnect(reconnect_time)
+        else:
+            driver.uc_open_with_reconnect(driver.current_url, 3.8)
+            if on_a_cf_turnstile_page(driver):
+                driver.disconnect()
+                uc_gui_click_x_y(driver, x, y, timeframe=1.05)
+                driver.reconnect(reconnect_time)
 
 
 def uc_gui_handle_cf(driver, frame="iframe"):

{seleniumbase-4.28.4 → seleniumbase-4.28.4a1}/seleniumbase.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: seleniumbase
-Version: 4.28.4
+Version: 4.28.4a1
 Summary: A complete web automation framework for end-to-end testing.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz

seleniumbase-4.28.4/seleniumbase/__version__.py

@@ -1,2 +0,0 @@
-# seleniumbase package
-__version__ = "4.28.4"