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

用127.0.0.1替换localhost

Browse Source
This commit is contained in:
g1879 2023-03-23 10:00:58 +08:00
parent 7dc8650b37
commit de9ec26418
6 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DrissionPage/chromium_base.py
View File

@ -57,7 +57,7 @@ class ChromiumBase(BasePage):
:param none: 用于后代继承 :param none: 用于后代继承
:return: None :return: None
""" """
self.address = address self.address = address.replace('localhost', '127.0.0.1').lstrip('http://').lstrip('https://')
def _set_runtime_settings(self): def _set_runtime_settings(self):
self._timeouts = Timeout(self) self._timeouts = Timeout(self)

3
DrissionPage/chromium_page.py
View File

@ -57,7 +57,8 @@ class ChromiumPage(ChromiumBase):
else: else:
raise TypeError('只能接收ChromiumDriver或ChromiumOptions类型参数。') raise TypeError('只能接收ChromiumDriver或ChromiumOptions类型参数。')
self.address = self._driver_options.debugger_address self.address = self._driver_options.debugger_address.replace('localhost',
'127.0.0.1').lstrip('http://').lstrip('https://')
def _set_runtime_settings(self): def _set_runtime_settings(self):
"""设置运行时用到的属性""" """设置运行时用到的属性"""

5
DrissionPage/commons/browser.py
View File

@ -21,12 +21,11 @@ def connect_browser(option):
:param option: DriverOptions对象 :param option: DriverOptions对象
:return: chrome 路径和进程对象组成的元组 :return: chrome 路径和进程对象组成的元组
""" """
debugger_address = option.debugger_address debugger_address = option.debugger_address.replace('localhost', '127.0.0.1').lstrip('http://').lstrip('https://')
chrome_path = option.browser_path chrome_path = option.browser_path
debugger_address = debugger_address[7:] if debugger_address.startswith('http://') else debugger_address
ip, port = debugger_address.split(':') ip, port = debugger_address.split(':')
if ip not in ('127.0.0.1', 'localhost'): if ip != '127.0.0.1':
test_connect(ip, port) test_connect(ip, port)
return None, None return None, None

3
DrissionPage/configs/chromium_options.py
View File

@ -115,6 +115,7 @@ class ChromiumOptions(object):
@debugger_address.setter @debugger_address.setter
def debugger_address(self, address): def debugger_address(self, address):
"""设置浏览器地址，格式ip:port""" """设置浏览器地址，格式ip:port"""
address = address.replace('localhost', '127.0.0.1').lstrip('http://').lstrip('https://')
self._debugger_address = address self._debugger_address = address
@property @property
@ -313,7 +314,7 @@ class ChromiumOptions(object):
self._auto_port = False self._auto_port = False
if debugger_address is not None: if debugger_address is not None:
self._debugger_address = debugger_address self.debugger_address = debugger_address
if download_path is not None: if download_path is not None:
self._download_path = str(download_path) self._download_path = str(download_path)

3
DrissionPage/easy_set.py
View File

@ -89,7 +89,8 @@ def set_paths(driver_path=None,
om.set_item('chrome_options', 'debugger_address', f'127.0.0.1:{local_port}') om.set_item('chrome_options', 'debugger_address', f'127.0.0.1:{local_port}')
if debugger_address is not None: if debugger_address is not None:
om.set_item('chrome_options', 'debugger_address', debugger_address) address = debugger_address.replace('localhost', '127.0.0.1').lstrip('http://').lstrip('https://')
om.set_item('chrome_options', 'debugger_address', address)
if download_path is not None: if download_path is not None:
om.set_item('paths', 'download_path', format_path(download_path)) om.set_item('paths', 'download_path', format_path(download_path))

3
DrissionPage/web_page.py
View File

@ -83,7 +83,8 @@ class WebPage(SessionPage, ChromiumPage, BasePage):
else: else:
raise TypeError('driver_or_options参数只能接收ChromiumDriver, ChromiumOptions、None或False。') raise TypeError('driver_or_options参数只能接收ChromiumDriver, ChromiumOptions、None或False。')
self.address = self._driver_options.debugger_address self.address = self._driver_options.debugger_address.replace('localhost',
'127.0.0.1').lstrip('http://').lstrip('https://')
# Session配置 # Session配置
if isinstance(se_opt, Session): if isinstance(se_opt, Session):