From 423a880196e5185d75b434cb3a63230fe2091e37 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Wed, 29 Jun 2022 14:34:28 +0200 Subject: [PATCH 1/2] Fix deprecation warnings emitted when using `firefox`. --- CHANGES.rst | 2 +- src/gocept/selenium/webdriver.py | 27 ++++++++++++++------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 7606892..52d61c4 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ Changelog 7.1 (unreleased) ---------------- -- Nothing changed yet. +- Fix deprecation warnings emitted when using ``firefox``. 7.0 (2022-06-28) diff --git a/src/gocept/selenium/webdriver.py b/src/gocept/selenium/webdriver.py index 24fbc07..f24f18b 100644 --- a/src/gocept/selenium/webdriver.py +++ b/src/gocept/selenium/webdriver.py @@ -14,7 +14,6 @@ from selenium.common.exceptions import JavascriptException from selenium.common.exceptions import WebDriverException -from selenium.webdriver.firefox.firefox_profile import FirefoxProfile import atexit import gocept.selenium.wd_selenese import os @@ -89,24 +88,26 @@ def get_firefox_webdriver_args(self): if self['headless']: options.add_argument('-headless') - profile = FirefoxProfile( - os.environ.get( - 'GOCEPT_WEBDRIVER_FF_PROFILE', - os.environ.get('GOCEPT_SELENIUM_FF_PROFILE'))) - profile.native_events_enabled = True - profile.update_preferences() + profile_path = os.environ.get( + 'GOCEPT_WEBDRIVER_FF_PROFILE', + os.environ.get('GOCEPT_SELENIUM_FF_PROFILE')) + if profile_path: + options.set_preference('profile', profile_path) + + # profile.native_events_enabled = True + # profile.update_preferences() # Save downloads always to disk into a predefined dir. - profile.set_preference("browser.download.folderList", 2) - profile.set_preference( + options.set_preference("browser.download.folderList", 2) + options.set_preference( "browser.download.manager.showWhenStarting", False) - profile.set_preference( + options.set_preference( "browser.download.dir", str(self['selenium_download_dir'])) - profile.set_preference( + options.set_preference( "browser.helperApps.neverAsk.saveToDisk", "application/pdf") - profile.set_preference("pdfjs.disabled", True) + options.set_preference("pdfjs.disabled", True) - return {'options': options, 'firefox_profile': profile} + return {'options': options} def get_edge_webdriver_args(self): options = selenium.webdriver.edge.options.Options() From c4067d92fc306d5e0adf9bf6054f78f987709104 Mon Sep 17 00:00:00 2001 From: Michael Howitz Date: Wed, 29 Jun 2022 16:04:05 +0200 Subject: [PATCH 2/2] Remove commented code. [skip ci] --- src/gocept/selenium/webdriver.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/gocept/selenium/webdriver.py b/src/gocept/selenium/webdriver.py index f24f18b..2f58f3a 100644 --- a/src/gocept/selenium/webdriver.py +++ b/src/gocept/selenium/webdriver.py @@ -94,9 +94,6 @@ def get_firefox_webdriver_args(self): if profile_path: options.set_preference('profile', profile_path) - # profile.native_events_enabled = True - # profile.update_preferences() - # Save downloads always to disk into a predefined dir. options.set_preference("browser.download.folderList", 2) options.set_preference(