|
7 | 7 | from selenium.webdriver import Firefox # noqa: F401, F403 |
8 | 8 | from selenium.webdriver.common.desired_capabilities import DesiredCapabilities |
9 | 9 | from selenium.webdriver.firefox.options import Options as FirefoxOptions |
| 10 | +from selenium.webdriver.firefox.service import Service as FirefoxService # noqa: F401, F403 |
10 | 11 |
|
11 | 12 | from ..util import cleanup_temp_dir |
12 | 13 |
|
@@ -362,23 +363,19 @@ def default_options(headless=False, download_folder_path=None, user_data_dir=Non |
362 | 363 | temp_dir = tempfile.TemporaryDirectory(prefix="botcity_") |
363 | 364 | user_data_dir = temp_dir.name |
364 | 365 | atexit.register(cleanup_temp_dir, temp_dir) |
365 | | - firefox_profile = webdriver.FirefoxProfile(user_data_dir) |
366 | | - firefox_profile.set_preference("security.default_personal_cert", "Select Automatically") |
367 | | - firefox_profile.set_preference('browser.download.folderList', 2) |
368 | | - firefox_profile.set_preference('browser.download.manager.showWhenStarting', False) |
| 366 | + firefox_options.set_preference("profile", user_data_dir) |
| 367 | + firefox_options.set_preference("security.default_personal_cert", "Select Automatically") |
| 368 | + firefox_options.set_preference('browser.download.folderList', 2) |
| 369 | + firefox_options.set_preference('browser.download.manager.showWhenStarting', False) |
369 | 370 | if not download_folder_path: |
370 | 371 | download_folder_path = os.getcwd() |
371 | | - firefox_profile.set_preference('browser.download.dir', download_folder_path) |
372 | | - firefox_profile.set_preference('general.warnOnAboutConfig', False) |
| 372 | + firefox_options.set_preference('browser.download.dir', download_folder_path) |
| 373 | + firefox_options.set_preference('general.warnOnAboutConfig', False) |
373 | 374 |
|
374 | 375 | mimetypes_to_download = ",".join(FIREFOX_MIMETYPES_TO_DOWNLOAD) |
375 | | - firefox_profile.set_preference("pdfjs.disabled", True) |
376 | | - firefox_profile.set_preference("plugin.disable_full_page_plugin_for_types", mimetypes_to_download) |
377 | | - firefox_profile.set_preference('browser.helperApps.neverAsk.saveToDisk', mimetypes_to_download) |
378 | | - |
379 | | - firefox_profile.update_preferences() |
380 | | - firefox_options.profile = firefox_profile |
381 | | - |
| 376 | + firefox_options.set_preference("pdfjs.disabled", True) |
| 377 | + firefox_options.set_preference("plugin.disable_full_page_plugin_for_types", mimetypes_to_download) |
| 378 | + firefox_options.set_preference('browser.helperApps.neverAsk.saveToDisk', mimetypes_to_download) |
382 | 379 | return firefox_options |
383 | 380 |
|
384 | 381 |
|
|
0 commit comments