cleanups

Author: mxschmitt

meta.yaml

@@ -26,6 +26,7 @@ requirements:
     - greenlet ==1.1.2
     - pyee ==8.1.0
     - websockets ==10.1
+    - psutil ==5.9.0 # [py<38]
     - typing_extensions # [py<39]
 test:
   requires:

playwright/_impl/_connection.py

@@ -195,7 +195,7 @@ async def stop_async(self) -> None:
         self.cleanup()
 
     def cleanup(self) -> None:
-        if self._init_task:
+        if self._init_task and not self._init_task.done():
             self._init_task.cancel()
         for ws_connection in self._child_ws_connections:
             ws_connection._transport.dispose()

playwright/_impl/_transport.py

@@ -110,7 +110,19 @@ def request_stop(self) -> None:
 
     async def wait_until_stopped(self) -> None:
         await self._stopped_future
-        await self._proc.wait()
+        # In Python 3.7, self._proc.wait() hangs because it does not use ThreadedChildWatcher
+        # which is used in Python 3.8+. Hence waiting for child process is skipped in Python 3.7.
+        # See https://bugs.python.org/issue35621
+        # See https://stackoverflow.com/questions/28915607/does-asyncio-support-running-a-subprocess-from-a-non-main-thread/28917653#28917653
+        if sys.version_info >= (3, 8):
+            await self._proc.wait()
+        else:
+            import psutil
+
+            try:
+                psutil.Process(self._proc.pid).wait()
+            except psutil.NoSuchProcess:
+                pass
 
     async def connect(self) -> None:
         self._stopped_future: asyncio.Future = asyncio.Future()

playwright/sync_api/_context_manager.py

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 import asyncio
-import sys
 from typing import Any
 
 from greenlet import greenlet
@@ -74,15 +73,7 @@ def start(self) -> SyncPlaywright:
 
     def __exit__(self, *args: Any) -> None:
         self._connection.stop_sync()
-        # In Python 3.7, self._connection._transport.wait_until_stopped() hangs because
-        # it does not uses ThreadedChildWatcher which is used in Python 3.8+.
-        # Hence waiting for child process is skipped in Python 3.7.
-        # See https://bugs.python.org/issue35621
-        # See https://stackoverflow.com/questions/28915607/does-asyncio-support-running-a-subprocess-from-a-non-main-thread/28917653#28917653
-        if sys.version_info >= (3, 8):
-            self._loop.run_until_complete(
-                self._connection._transport.wait_until_stopped()
-            )
+        self._loop.run_until_complete(self._connection._transport.wait_until_stopped())
         if self._own_loop:
             self._loop.run_until_complete(self._loop.shutdown_asyncgens())
             self._loop.close()

setup.py

@@ -212,6 +212,7 @@ def _download_and_extract_local_driver(
         "greenlet==1.1.2",
         "pyee==8.1.0",
         "typing-extensions;python_version<='3.8'",
+        "psutil==5.9.0;python_version<='3.7'",
     ],
     classifiers=[
         "Topic :: Software Development :: Testing",