Update close method

Author: elacuesta

scrapy_playwright/handler.py

@@ -362,8 +362,6 @@ async def close(self) -> None:
             logger.info("Closing download handler")
             await super().close()
             await self._close()
-            if self.config.use_threaded_loop:
-                _ThreadedLoopAdapter.stop(id(self))
 
     else:
 
@@ -372,8 +370,6 @@ def close(self) -> Deferred:  # pylint: disable=invalid-overridden-method
             logger.info("Closing download handler")
             yield super().close()
             yield self._deferred_from_coro(self._close())
-            if self.config.use_threaded_loop:
-                _ThreadedLoopAdapter.stop(id(self))
 
     async def _close(self) -> None:
         with suppress(TargetClosedError):
@@ -386,6 +382,8 @@ async def _close(self) -> None:
             await self.playwright_context_manager.__aexit__()
         if self.playwright:
             await self.playwright.stop()
+        if self.config.use_threaded_loop:
+            _ThreadedLoopAdapter.stop(id(self))
 
     if _SCRAPY_ASYNC_API:
 

tests/__init__.py

@@ -10,6 +10,8 @@
 from scrapy.http.response.html import HtmlResponse
 from scrapy.utils.test import get_crawler
 
+from scrapy_playwright.handler import _SCRAPY_ASYNC_API
+
 
 logger = logging.getLogger("scrapy-playwright-tests")
 
@@ -54,7 +56,10 @@ async def make_handler(settings_dict: Optional[dict] = None):
     else:
         yield handler
     finally:
-        await handler._close()
+        if _SCRAPY_ASYNC_API:
+            await handler.close()
+        else:
+            await handler._close()
 
 
 def assert_correct_response(response: HtmlResponse, request: Request) -> None: