PlaywrightCapture 1.25.6__tar.gz → 1.25.8__tar.gz

{playwrightcapture-1.25.6 → playwrightcapture-1.25.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PlaywrightCapture
-Version: 1.25.6
+Version: 1.25.8
 Summary: A simple library to capture websites using playwright
 Home-page: https://github.com/Lookyloo/PlaywrightCapture
 License: BSD-3-Clause
@@ -31,7 +31,7 @@ Requires-Dist: playwright-stealth (>=1.0.6,<2.0.0)
 Requires-Dist: puremagic (>=1.26,<2.0)
 Requires-Dist: pydub (>=0.25.1,<0.26.0) ; extra == "recaptcha"
 Requires-Dist: pytz (>=2024.1,<2025.0) ; python_version < "3.9"
-Requires-Dist: setuptools (>=71.0.3,<72.0.0)
+Requires-Dist: setuptools (>=71.1.0,<72.0.0)
 Requires-Dist: tzdata (>=2024.1,<2025.0)
 Requires-Dist: w3lib (>=2.2.1,<3.0.0)
 Project-URL: Repository, https://github.com/Lookyloo/PlaywrightCapture

{playwrightcapture-1.25.6 → playwrightcapture-1.25.8}/playwrightcapture/capture.py

@@ -404,17 +404,27 @@ class Capture():
         device_context_settings = {}
         if self.device_name:
             device_context_settings = self.playwright.devices[self.device_name]
+            # We need to make sure the device_context_settings dict doesn't contains
+            # keys that are set by default in the context creation
+            if context_ua := device_context_settings.pop('user_agent', None):
+                ua = self.user_agent if self.user_agent else context_ua
+            if context_vp := device_context_settings.pop('viewport', self._default_viewport):
+                # Always true, but we also always want to pop it.
+                vp = self.viewport if self.viewport else context_vp
+        else:
+            ua = self.user_agent
+            vp = self.viewport
 
         self.context = await self.browser.new_context(
             record_har_path=self._temp_harfile.name,
             ignore_https_errors=True,
             bypass_csp=True,
             http_credentials=self.http_credentials if self.http_credentials else None,
-            user_agent=self.user_agent if self.user_agent else device_context_settings.pop('user_agent', None),
+            user_agent=ua,
             locale=self.locale if self.locale else None,
             timezone_id=self.timezone_id if self.timezone_id else None,
             color_scheme=self.color_scheme if self.color_scheme else None,
-            viewport=self.viewport if self.viewport else device_context_settings.pop('viewport', self._default_viewport),
+            viewport=vp,
             # For debug only
             # record_video_dir='./videos/',
             **device_context_settings

{playwrightcapture-1.25.6 → playwrightcapture-1.25.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PlaywrightCapture"
-version = "1.25.6"
+version = "1.25.8"
 description = "A simple library to capture websites using playwright"
 authors = ["Raphaël Vinot <raphael.vinot@circl.lu>"]
 license = "BSD-3-Clause"
@@ -28,7 +28,7 @@ SpeechRecognition = {version = "^3.10.4", optional = true}
 pytz = {"version" = "^2024.1", python = "<3.9"}
 tzdata = "^2024.1"
 playwright-stealth = "^1.0.6"
-setuptools = "^71.0.3"
+setuptools = "^71.1.0"
 puremagic = "^1.26"
 async-timeout = {version = "^4.0.3", python = "<3.11"}
 aiohttp = {extras = ["speedups"], version = "^3.9.5"}
@@ -42,8 +42,8 @@ optional = true
 
 [tool.poetry.group.dev.dependencies]
 types-beautifulsoup4 = "^4.12.0.20240511"
-pytest = "^8.2.2"
-mypy = "^1.10.1"
+pytest = "^8.3.1"
+mypy = "^1.11.0"
 types-dateparser = "^1.2.0.20240420"
 types-pytz = "^2024.1.0.20240417"