seleniumbase 4.50.1__tar.gz → 4.50.2__tar.gz

{seleniumbase-4.50.1/seleniumbase.egg-info → seleniumbase-4.50.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seleniumbase
-Version: 4.50.1
+Version: 4.50.2
 Summary: SeleniumBase is a framework for web crawling, scraping, and testing. Supports pytest. CDP Mode adds stealth. Includes many tools.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -117,7 +117,7 @@ Requires-Dist: iniconfig==2.1.0; python_version < "3.10"
 Requires-Dist: iniconfig==2.3.0; python_version >= "3.10"
 Requires-Dist: pluggy==1.6.0
 Requires-Dist: pytest==8.4.2; python_version < "3.11"
-Requires-Dist: pytest==9.1.0; python_version >= "3.11"
+Requires-Dist: pytest==9.1.1; python_version >= "3.11"
 Requires-Dist: pytest-html==4.0.2
 Requires-Dist: pytest-metadata==3.1.1
 Requires-Dist: pytest-ordering==0.6
@@ -141,7 +141,7 @@ Requires-Dist: allure-python-commons>=2.16.0; extra == "allure"
 Requires-Dist: allure-behave>=2.16.0; extra == "allure"
 Provides-Extra: coverage
 Requires-Dist: coverage>=7.10.7; python_version < "3.10" and extra == "coverage"
-Requires-Dist: coverage>=7.14.1; python_version >= "3.10" and extra == "coverage"
+Requires-Dist: coverage>=7.14.3; python_version >= "3.10" and extra == "coverage"
 Requires-Dist: pytest-cov>=7.1.0; extra == "coverage"
 Provides-Extra: flake8
 Requires-Dist: flake8==7.3.0; extra == "flake8"

{seleniumbase-4.50.1 → seleniumbase-4.50.2}/requirements.txt

@@ -56,7 +56,7 @@ iniconfig==2.1.0;python_version<"3.10"
 iniconfig==2.3.0;python_version>="3.10"
 pluggy==1.6.0
 pytest==8.4.2;python_version<"3.11"
-pytest==9.1.0;python_version>="3.11"
+pytest==9.1.1;python_version>="3.11"
 pytest-html==4.0.2
 pytest-metadata==3.1.1
 pytest-ordering==0.6
@@ -79,7 +79,7 @@ rich>=15.0.0,<16
 # ("pip install -r requirements.txt" also installs this, but "pip install -e ." won't.)
 
 coverage>=7.10.7;python_version<"3.10"
-coverage>=7.14.1;python_version>="3.10"
+coverage>=7.14.3;python_version>="3.10"
 pytest-cov>=7.1.0
 flake8==7.3.0
 mccabe==0.7.0

{seleniumbase-4.50.1 → seleniumbase-4.50.2}/seleniumbase/__version__.py

@@ -1,2 +1,2 @@
 # seleniumbase package
-__version__ = "4.50.1"
+__version__ = "4.50.2"

{seleniumbase-4.50.1 → seleniumbase-4.50.2}/seleniumbase/core/sb_cdp.py

@@ -2163,6 +2163,10 @@ class CDPMethods():
         self.__slow_mode_pause_if_set()
         self.loop.run_until_complete(self.page.wait(0.2))
 
+    def stop(self):
+        """Same as quit()"""
+        self.quit()
+
     def quit(self):
         """Quit the browser in the Pure CDP Mode Sync format."""
         driver = self.driver
@@ -3544,8 +3548,9 @@ class Chrome(CDPMethods):
     def __init__(self, url=None, **kwargs):
         if not url:
             url = "about:blank"
-        driver = cdp_util.start_sync(**kwargs)
         loop = asyncio.new_event_loop()
+        kwargs["loop"] = loop
+        driver = cdp_util.start_sync(**kwargs)
         page = loop.run_until_complete(driver.get(url))
         wait_timeout = 30.0
         if hasattr(sb_config, "_cdp_proxy") and sb_config._cdp_proxy:

{seleniumbase-4.50.1 → seleniumbase-4.50.2}/seleniumbase/fixtures/base_case.py

@@ -16841,13 +16841,13 @@ class BaseCase(unittest.TestCase):
             '<thead id="results-table-head">'
             '<tr style="background-color: #F7F7FD;">'
             '<th style="background-color: #FFF8F8; color: #FF2222;">'
-            'Failed: %s</th>'
+            'Failed: %s </th>'
             '<th style="background-color: #FEFEF9; color: #FFA500;">'
-            'Skipped: %s</th>'
+            'Skipped: %s </th>'
             '<th style="background-color: #F8FFF8; color: #12A212;">'
-            'Passed: %s</th>'
+            'Passed: %s </th>'
             '<th style="background-color: #F9F9F9; color: #8C8C8C;">'
-            'Untested: %s</th>'
+            'Untested: %s </th>'
             '<th style="background-color: #F4F4FF; color: #575792;">'
             'Total: %s</th>'
             "</tr></thead></table>"

{seleniumbase-4.50.1 → seleniumbase-4.50.2}/seleniumbase/undetected/cdp_driver/browser.py

@@ -50,23 +50,29 @@ def deconstruct_browser():
                             _.config.user_data_dir, ignore_errors=False
                         )
                     if not os.path.exists(_.config.user_data_dir):
+                        logger.debug(
+                            "Temp profile %s was removed."
+                            % _.config.user_data_dir
+                        )
                         break
                     else:
                         time.sleep(0.12)
             except FileNotFoundError:
+                logger.debug(
+                    "Temp profile %s was removed." % _.config.user_data_dir
+                )
                 break
             except (PermissionError, OSError) as e:
                 if attempt == max_attempts - 1:
                     logger.debug(
-                        "Problem removing data dir %s\n"
+                        "Problem removing data dir %s.\n"
                         "Consider checking whether it's there "
-                        "and remove it by hand\nerror: %s"
+                        "and remove it by hand.\nError: %s"
                         % (_.config.user_data_dir, e)
                     )
                     break
                 time.sleep(0.12)
                 continue
-        logging.debug("Temp profile %s was removed." % _.config.user_data_dir)
 
 
 class Browser:
@@ -940,10 +946,12 @@ class Browser:
                     logger.debug("Closed the connection using asyncio.run()")
                 except Exception:
                     pass
+        procs = []
         for _ in range(3):
             try:
                 if connection_id not in sb_config._closed_connection_ids:
                     self._process.terminate()
+                    procs.append(psutil.Process(self._process.pid))
                     logger.debug(
                         "Terminated browser with pid %d successfully."
                         % self._process.pid
@@ -955,20 +963,33 @@ class Browser:
             except (Exception,):
                 try:
                     self._process.kill()
+                    procs.append(psutil.Process(self._process.pid))
                     logger.debug(
                         "Killed browser with pid %d successfully."
                         % self._process.pid
                     )
+                    if connection_id:
+                        sb_config._closed_connection_ids.append(connection_id)
+                        close_success = True
                     break
                 except (Exception,):
                     try:
-                        if hasattr(self, "browser_process_pid"):
+                        if hasattr(self, "_process_pid") and self._process_pid:
                             os.kill(self._process_pid, 15)
+                            try:
+                                procs.append(psutil.Process(self._process_pid))
+                            except Exception:
+                                pass
                             logger.debug(
                                 "Killed browser with pid %d "
                                 "using signal 15 successfully."
-                                % self._process.pid
+                                % self._process_pid
                             )
+                            if connection_id:
+                                sb_config._closed_connection_ids.append(
+                                    connection_id
+                                )
+                                close_success = True
                             break
                     except (TypeError,):
                         logger.info("TypeError", exc_info=True)
@@ -976,16 +997,33 @@ class Browser:
                     except (PermissionError,):
                         logger.info(
                             "Browser already stopped, "
-                            "or no permission to kill. Skip."
+                            "or no permission to kill."
                         )
                         pass
                     except (ProcessLookupError,):
                         logger.info("ProcessLookupError")
-                        pass
+                        break
                     except (Exception,):
                         raise
-            self._process = None
-            self._process_pid = None
+        self._process = None
+        self._process_pid = None
+        if procs:
+            with suppress(Exception):
+                gone, alive = psutil.wait_procs(procs, timeout=0.8)
+                for p in gone:
+                    logger.debug("Process has been terminated: %d." % p.pid)
+                for p in alive:
+                    logger.debug("Process is still alive: %d." % p.pid)
+        if self.config.user_data_dir and not self.config.uses_custom_data_dir:
+            for _ in range(3):
+                try:
+                    time.sleep(0.005)
+                    if os.path.exists(self.config.user_data_dir):
+                        time.sleep(0.005)
+                        shutil.rmtree(self.config.user_data_dir)
+                    break
+                except Exception:
+                    time.sleep(0.12)
         if (
             hasattr(sb_config, "_xvfb_users")
             and isinstance(sb_config._xvfb_users, int)
@@ -1025,18 +1063,33 @@ class Browser:
             def silence_pipe_destruction_errors(unraisable):
                 exc_type = unraisable.exc_type
                 exc_value = unraisable.exc_value
+                exc_value_str = str(exc_value) if exc_value else ""
                 if (
                     exc_type is ValueError
-                    and "I/O operation on closed pipe" in str(exc_value)
+                    and "I/O operation on closed pipe" in exc_value_str
+                ):
+                    return
+                if (
+                    exc_type is RuntimeError
+                    and "Event loop is closed" in exc_value_str
                 ):
                     return
                 default_unraisablehook(unraisable)
 
             sys.unraisablehook = silence_pipe_destruction_errors
             # Automatically restore Python's default behavior at program exit
-            atexit.register(
-                lambda: setattr(sys, "unraisablehook", default_unraisablehook)
-            )
+            # (Looks like this isn't needed, but I'm saving it for reference)
+            # atexit.register(
+            #     lambda: setattr(
+            #         sys, "unraisablehook", default_unraisablehook
+            #     )
+            # )
+
+        # Custom user_data_dirs should be saved while temp ones are removed
+        if os.path.exists("%s" % self.config.user_data_dir):
+            logger.debug("%s still exists." % self.config.user_data_dir)
+        else:
+            logger.debug("%s was removed." % self.config.user_data_dir)
 
     def quit(self):
         self.stop()

{seleniumbase-4.50.1 → seleniumbase-4.50.2}/seleniumbase/undetected/cdp_driver/cdp_util.py

@@ -764,14 +764,8 @@ async def start_async(*args, **kwargs) -> Browser:
 
 
 def start_sync(*args, **kwargs) -> Browser:
-    loop = None
-    if (
-        "loop" in kwargs
-        and kwargs["loop"]
-        and hasattr(kwargs["loop"], "create_task")
-    ):
-        loop = kwargs["loop"]
-    else:
+    loop = kwargs.pop("loop", None)
+    if not (loop and hasattr(loop, "create_task")):
         loop = asyncio.new_event_loop()
     return loop.run_until_complete(start(*args, **kwargs))
 

{seleniumbase-4.50.1 → seleniumbase-4.50.2}/seleniumbase/undetected/cdp_driver/config.py

@@ -25,7 +25,7 @@ __all__ = [
 ]
 
 logger = logging.getLogger(__name__)
-is_posix = sys.platform.startswith(("darwin", "cygwin", "linux", "linux2"))
+is_posix = sys.platform.startswith(("darwin", "cygwin", "linux"))
 
 PathLike = Union[str, pathlib.Path]
 AUTO = None

{seleniumbase-4.50.1 → seleniumbase-4.50.2}/seleniumbase/undetected/cdp_driver/element.py

@@ -372,12 +372,17 @@ class Element:
         arguments = [cdp.runtime.CallArgument(
             object_id=self._remote_object.object_id
         )]
-        script = 'sessionStorage.getItem("pxsid") !== null;'
+        # The next part may be getting detected. Comment-out for now.
+        '''script1 = 'sessionStorage.getItem("pxsid") !== null;'
+        script2 = 'sessionStorage.getItem("PIM-SESSION-ID") !== null;'
         using_px = True
+        using_pim = True
         with suppress(Exception):
-            using_px = await self.tab.evaluate(script)
-        if not using_px:
-            await self.flash_async(0.25)
+            using_px = await self.tab.evaluate(script1)
+        with suppress(Exception):
+            using_pim = await self.tab.evaluate(script2)
+        if not using_px and not using_pim:
+            await self.flash_async(0.25)'''
         await self._tab.send(
             cdp.runtime.call_function_on(
                 "(el) => el.click()",
@@ -506,12 +511,17 @@ class Element:
             logger.warning("Could not calculate box model for %s", self)
             return
         logger.debug("Clicking on location: %.2f, %.2f" % center)
-        script = 'sessionStorage.getItem("pxsid") !== null;'
+        # The next part may be getting detected. Comment-out for now.
+        '''script1 = 'sessionStorage.getItem("pxsid") !== null;'
+        script2 = 'sessionStorage.getItem("PIM-SESSION-ID") !== null;'
         using_px = True
+        using_pim = True
+        with suppress(Exception):
+            using_px = await self.tab.evaluate(script1)
         with suppress(Exception):
-            using_px = await self.tab.evaluate(script)
-        if not using_px:
-            asyncio.create_task(self.flash_async(0.25))
+            using_pim = await self.tab.evaluate(script2)
+        if not using_px and not using_pim:
+            asyncio.create_task(self.flash_async(0.25))'''
         asyncio.create_task(
             self._tab.send(
                 cdp.input_.dispatch_mouse_event(
@@ -570,11 +580,15 @@ class Element:
             logger.debug("Clicking on location: %.2f, %.2f" % center_pos)
         else:
             logger.debug("Clicking on location: %.2f, %.2f" % (x_pos, y_pos))
-        script = 'sessionStorage.getItem("pxsid") !== null;'
+        script1 = 'sessionStorage.getItem("pxsid") !== null;'
+        script2 = 'sessionStorage.getItem("PIM-SESSION-ID") !== null;'
         using_px = True
+        using_pim = True
+        with suppress(Exception):
+            using_px = await self.tab.evaluate(script1)
         with suppress(Exception):
-            using_px = await self.tab.evaluate(script)
-        if not using_px:
+            using_pim = await self.tab.evaluate(script2)
+        if not using_px and not using_pim:
             asyncio.create_task(
                 self.flash_async(
                     x_offset=x_offset - (width / 2),

{seleniumbase-4.50.1 → seleniumbase-4.50.2/seleniumbase.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seleniumbase
-Version: 4.50.1
+Version: 4.50.2
 Summary: SeleniumBase is a framework for web crawling, scraping, and testing. Supports pytest. CDP Mode adds stealth. Includes many tools.
 Home-page: https://github.com/seleniumbase/SeleniumBase
 Author: Michael Mintz
@@ -117,7 +117,7 @@ Requires-Dist: iniconfig==2.1.0; python_version < "3.10"
 Requires-Dist: iniconfig==2.3.0; python_version >= "3.10"
 Requires-Dist: pluggy==1.6.0
 Requires-Dist: pytest==8.4.2; python_version < "3.11"
-Requires-Dist: pytest==9.1.0; python_version >= "3.11"
+Requires-Dist: pytest==9.1.1; python_version >= "3.11"
 Requires-Dist: pytest-html==4.0.2
 Requires-Dist: pytest-metadata==3.1.1
 Requires-Dist: pytest-ordering==0.6
@@ -141,7 +141,7 @@ Requires-Dist: allure-python-commons>=2.16.0; extra == "allure"
 Requires-Dist: allure-behave>=2.16.0; extra == "allure"
 Provides-Extra: coverage
 Requires-Dist: coverage>=7.10.7; python_version < "3.10" and extra == "coverage"
-Requires-Dist: coverage>=7.14.1; python_version >= "3.10" and extra == "coverage"
+Requires-Dist: coverage>=7.14.3; python_version >= "3.10" and extra == "coverage"
 Requires-Dist: pytest-cov>=7.1.0; extra == "coverage"
 Provides-Extra: flake8
 Requires-Dist: flake8==7.3.0; extra == "flake8"

{seleniumbase-4.50.1 → seleniumbase-4.50.2}/seleniumbase.egg-info/requires.txt

@@ -85,7 +85,7 @@ pytest-rerunfailures==16.3
 markdown-it-py==4.2.0
 
 [:python_version >= "3.11"]
-pytest==9.1.0
+pytest==9.1.1
 
 [allure]
 allure-pytest>=2.16.0
@@ -99,7 +99,7 @@ pytest-cov>=7.1.0
 coverage>=7.10.7
 
 [coverage:python_version >= "3.10"]
-coverage>=7.14.1
+coverage>=7.14.3
 
 [flake8]
 flake8==7.3.0

{seleniumbase-4.50.1 → seleniumbase-4.50.2}/setup.py

@@ -220,7 +220,7 @@ setup(
         'iniconfig==2.3.0;python_version>="3.10"',
         'pluggy==1.6.0',
         'pytest==8.4.2;python_version<"3.11"',
-        'pytest==9.1.0;python_version>="3.11"',
+        'pytest==9.1.1;python_version>="3.11"',
         'pytest-html==4.0.2',  # Newer ones had issues
         'pytest-metadata==3.1.1',
         'pytest-ordering==0.6',
@@ -252,7 +252,7 @@ setup(
         # Usage: coverage run -m pytest; coverage html; coverage report
         "coverage": [
             'coverage>=7.10.7;python_version<"3.10"',
-            'coverage>=7.14.1;python_version>="3.10"',
+            'coverage>=7.14.3;python_version>="3.10"',
             'pytest-cov>=7.1.0',
         ],
         # pip install -e .[flake8]