From 1c0c385ff1d0be9372273a63377313ceff28e7de Mon Sep 17 00:00:00 2001 From: Vangelis Banos Date: Mon, 15 Apr 2024 18:48:54 +0000 Subject: [PATCH 1/2] Use --headless=new or --headless=chrome if supported Ref: https://developer.chrome.com/docs/chromium/new-headless --- brozzler/chrome.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/brozzler/chrome.py b/brozzler/chrome.py index 1b52bbf..c0eb6ef 100644 --- a/brozzler/chrome.py +++ b/brozzler/chrome.py @@ -61,6 +61,7 @@ def check_version(chrome_exe): "brozzler requires chrome/chromium version 64 or " "later but %s reports version %s" % (chrome_exe, version_str) ) + return major_version class Chrome: @@ -182,7 +183,6 @@ class Chrome: chrome_args = [ self.chrome_exe, "-v", - "--headless", "--remote-debugging-port=%s" % self.port, "--use-mock-keychain", # mac thing "--user-data-dir=%s" % self._chrome_user_data_dir, @@ -205,6 +205,13 @@ class Chrome: "--disable-save-password-bubble", "--disable-sync", ] + major_version = check_version(self.chrome_exe) + if major_version >= 109: + chrome_args.append('--headless=new') + elif 96 <= major_version <= 108: + chrome_args.append('--headless=chrome') + else: + chrome_args.append('--headless') extra_chrome_args = os.environ.get("BROZZLER_EXTRA_CHROME_ARGS") if extra_chrome_args: From 7d580420bac178287fb20944b61b00de2238349f Mon Sep 17 00:00:00 2001 From: Vangelis Banos Date: Mon, 15 Apr 2024 19:23:44 +0000 Subject: [PATCH 2/2] Replace double quote with single quote Fix black warnings --- brozzler/chrome.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/brozzler/chrome.py b/brozzler/chrome.py index c0eb6ef..f3a4841 100644 --- a/brozzler/chrome.py +++ b/brozzler/chrome.py @@ -207,11 +207,11 @@ class Chrome: ] major_version = check_version(self.chrome_exe) if major_version >= 109: - chrome_args.append('--headless=new') + chrome_args.append("--headless=new") elif 96 <= major_version <= 108: - chrome_args.append('--headless=chrome') + chrome_args.append("--headless=chrome") else: - chrome_args.append('--headless') + chrome_args.append("--headless") extra_chrome_args = os.environ.get("BROZZLER_EXTRA_CHROME_ARGS") if extra_chrome_args: