Mirrors
/
undetected-chromedriver
mirror of https://github.com/ultrafunkamsterdam/undetected-chromedriver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

This commit is contained in:
UltrafunkAmsterdam 2022-11-20 22:05:04 +01:00
parent 73f554f659
commit 0ce879001f
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
undetected_chromedriver/__init__.py
View File

@ -19,11 +19,7 @@ by UltrafunkAmsterdam (https://github.com/ultrafunkamsterdam)
""" """
<<<<<<< HEAD
__version__ = "3.1.5r5"
=======
__version__ = "3.1.6" __version__ = "3.1.6"
>>>>>>> 2742ff582d3d104ed8708b0ad7922b2166d65a52
import inspect import inspect
@ -127,7 +123,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
use_subprocess=True, use_subprocess=True,
debug=False, debug=False,
no_sandbox=True, no_sandbox=True,
**kw **kw,
): ):
""" """
Creates a new instance of the chrome driver. Creates a new instance of the chrome driver.
@ -231,8 +227,8 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
and will be greeted with an error, since the program exists before chrome has a change to launch. and will be greeted with an error, since the program exists before chrome has a change to launch.
in that case you can set this to `True`. The browser will start via subprocess, and will keep running most of times. in that case you can set this to `True`. The browser will start via subprocess, and will keep running most of times.
! setting it to True comes with NO support when being detected. ! ! setting it to True comes with NO support when being detected. !
no_sandbox: bool, optional, default=True no_sandbox: bool, optional, default=True
uses the --no-sandbox option, and additionally does suppress the "unsecure option" status bar uses the --no-sandbox option, and additionally does suppress the "unsecure option" status bar
this option has a default of True since many people seem to run this as root (....) , and chrome does not start this option has a default of True since many people seem to run this as root (....) , and chrome does not start
when running as root without using --no-sandbox flag. when running as root without using --no-sandbox flag.
@ -426,7 +422,7 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
for attr_name in ("creationflags", "creation_flags"): for attr_name in ("creationflags", "creation_flags"):
if hasattr(service, attr_name): if hasattr(service, attr_name):
setattr(service, attr_name, service_creationflags) setattr(service, attr_name, service_creationflags)
break break
else: else:
service = None service = None
@ -672,14 +668,12 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
def clear_cdp_listeners(self): def clear_cdp_listeners(self):
if self.reactor and isinstance(self.reactor, Reactor): if self.reactor and isinstance(self.reactor, Reactor):
self.reactor.handlers.clear() self.reactor.handlers.clear()
def window_new(self): def window_new(self):
self.execute( self.execute(
selenium.webdriver.remote.command.Command.NEW_WINDOW, selenium.webdriver.remote.command.Command.NEW_WINDOW, {"type": "window"}
{"type": "window"}
) )
def tab_new(self, url: str): def tab_new(self, url: str):
""" """
this opens a url in a new tab. this opens a url in a new tab.