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

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.
@ -675,11 +671,9 @@ class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
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.