Skip to content

Commit 3ae9054

Browse files
resolved merge conflicts
1 parent 89af175 commit 3ae9054

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

py/python.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
1616
<excludeFolder url="file://$MODULE_DIR$/venv" />
1717
</content>
18-
<orderEntry type="jdk" jdkName="Python 3.9 (py)" jdkType="Python SDK" />
18+
<orderEntry type="jdk" jdkName="Python 3.11" jdkType="Python SDK" />
1919
<orderEntry type="sourceFolder" forTests="false" />
2020
</component>
2121
<component name="sonarModuleSettings">

py/selenium/webdriver/common/service.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ def __init__(
5454
env: typing.Optional[typing.Mapping[typing.Any, typing.Any]] = None,
5555
**kwargs,
5656
) -> None:
57+
print("__init__ Main Service")
5758
if isinstance(log_output, str):
5859
self.log_output = open(log_output, "a+", encoding="utf-8")
5960
elif log_output is subprocess.STDOUT:

py/selenium/webdriver/ie/service.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ def __init__(
3939
- executable_path : Path to the IEDriver
4040
- port : Port the service is running on
4141
- host : IP address the service port is bound
42-
- log_level : Level of logging of service, may be "FATAL", "ERROR", "WARN", "INFO", "DEBUG", "TRACE".
43-
Default is "FATAL".
42+
- log_level : Level of logging of service, may be "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL".
43+
Default is "WARNING".
4444
- log_output: (Optional) int representation of STDOUT/DEVNULL, any IO instance or String path to file.
4545
Default is "stdout".
4646
"""
@@ -53,7 +53,6 @@ def __init__(
5353

5454
if log_level:
5555
self._service_args.append(f"--log-level={log_level}")
56-
5756
super().__init__(
5857
executable_path,
5958
port=port,

0 commit comments

Comments
 (0)