blackteay/DrissionPage
1
0
Fork 0
mirror of https://gitee.com/g1879/DrissionPage.git synced 2024-12-10 04:00:23 +08:00
Code Issues Projects Releases Wiki Activity

改为只用字典存放self._driver_options

Browse Source
This commit is contained in:
g1879 2020-05-25 23:50:53 +08:00
parent 8c87104020
commit 756e2e6e48
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DrissionPage/drission.py
View File

@ -15,7 +15,7 @@ from selenium.common.exceptions import WebDriverException
from selenium.webdriver.chrome.options import Options from selenium.webdriver.chrome.options import Options
from selenium.webdriver.chrome.webdriver import WebDriver from selenium.webdriver.chrome.webdriver import WebDriver
from .config import _dict_to_chrome_options, OptionsManager from .config import _dict_to_chrome_options, OptionsManager, _chrome_options_to_dict
class Drission(object): class Drission(object):
@ -33,7 +33,7 @@ class Drission(object):
self._driver = None self._driver = None
om = OptionsManager(ini_path) om = OptionsManager(ini_path)
self._session_options = session_options or om.get_option('session_options') self._session_options = session_options or om.get_option('session_options')
self._driver_options = driver_options or om.get_option('chrome_options') self._driver_options = _chrome_options_to_dict(driver_options) or om.get_option('chrome_options')
if driver_path: if driver_path:
self._driver_path = driver_path self._driver_path = driver_path
@ -59,14 +59,7 @@ class Drission(object):
def driver(self): def driver(self):
"""获取WebDriver对象，按传入配置信息初始化""" """获取WebDriver对象，按传入配置信息初始化"""
if self._driver is None: if self._driver is None:
if isinstance(self._driver_options, Options): if isinstance(self._driver_options, dict):
options = self._driver_options
if options.debugger_address:
# 因同时设置调试浏览器和其他配置会导致异常，故新建一个对象
debugger_address = options.debugger_address
options = webdriver.ChromeOptions()
options.debugger_address = debugger_address
elif isinstance(self._driver_options, dict):
options = _dict_to_chrome_options(self._driver_options) options = _dict_to_chrome_options(self._driver_options)
else: else:
raise KeyError('Driver options invalid') raise KeyError('Driver options invalid')
@ -84,6 +77,10 @@ class Drission(object):
return self._driver return self._driver
@property
def driver_options(self) -> dict:
return self._driver_options
@property @property
def session_options(self) -> dict: def session_options(self) -> dict:
return self._session_options return self._session_options