From 65077efd17f51864c18d2597f29be7a8e64bd14a Mon Sep 17 00:00:00 2001
From: kkjj828 <18022238500@189.cn>
Date: Fri, 28 Aug 2020 14:25:04 +0800
Subject: [PATCH] =?UTF-8?q?MixPage=E7=B1=BB=E5=8F=AF=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E5=92=8Crequests=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BADrission=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DrissionPage/mix_page.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/DrissionPage/mix_page.py b/DrissionPage/mix_page.py
index 9d27e43..b6cab5e 100644
--- a/DrissionPage/mix_page.py
+++ b/DrissionPage/mix_page.py
@@ -11,6 +11,7 @@ from requests_html import HTMLSession, Element
 from selenium.webdriver.chrome.webdriver import WebDriver
 from selenium.webdriver.remote.webelement import WebElement
 
+from .config import DriverOptions
 from .drission import Drission
 from .driver_element import DriverElement
 from .driver_page import DriverPage
@@ -32,16 +33,23 @@ class MixPage(Null, SessionPage, DriverPage):
     这些功能由DriverPage和SessionPage类实现。
     """
 
-    def __init__(self, drission: Union[Drission, str] = None, mode: str = 'd', timeout: float = 10):
-        """初始化函数                                                              \n
+    def __init__(self,
+                 drission: Union[Drission, str] = None,
+                 mode: str = 'd',
+                 timeout: float = 10,
+                 driver_options: Union[dict, DriverOptions] = None,
+                 session_options: dict = None):
+        """初始化函数                                                                         \n
         :param drission: 整合了driver和session的类，传入's'或'd'时快速配置相应模式
         :param mode: 默认使用selenium的d模式
+        :param driver_options: 浏览器设置，没有传入drission参数时会用这个设置新建Drission对象
+        :param session_options: requests设置，没有传入drission参数时会用这个设置新建Drission对象
         """
         super().__init__()
         if drission in ['s', 'd', 'S', 'D']:
             mode = drission.lower()
             drission = None
-        self._drission = drission or Drission()
+        self._drission = drission or Drission(driver_options, session_options)
         self._session = None
         self._driver = None
         self._url = None