Skip to content

Commit 589b8db

Browse files
committed
[py]: #11084 - additional f-strings
1 parent 086dfe7 commit 589b8db

File tree

6 files changed

+12
-17
lines changed

6 files changed

+12
-17
lines changed

py/selenium/webdriver/chromium/service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ def __init__(
5757
)
5858

5959
def command_line_args(self) -> typing.List[str]:
60-
return ["--port=%d" % self.port] + self.service_args
60+
return [f"--port={self.port}"] + self.service_args

py/selenium/webdriver/common/service.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,17 @@ def start(self) -> None:
9292
except OSError as err:
9393
if err.errno == errno.ENOENT:
9494
raise WebDriverException(
95-
"'{}' executable needs to be in PATH. {}".format(
96-
os.path.basename(self.path), self.start_error_message
97-
)
95+
f"'{os.path.basename(self.path)}' executable needs to be in PATH. {self.start_error_message}"
9896
)
9997
elif err.errno == errno.EACCES:
10098
raise WebDriverException(
101-
"'{}' executable may have wrong permissions. {}".format(
102-
os.path.basename(self.path), self.start_error_message
103-
)
99+
f"'{os.path.basename(self.path)}' executable may have wrong permissions. {self.start_error_message}"
104100
)
105101
else:
106102
raise
107103
except Exception as e:
108104
raise WebDriverException(
109-
"The executable %s needs to be available in the path. %s\n%s"
110-
% (os.path.basename(self.path), self.start_error_message, str(e))
105+
f"The executable {os.path.basename(self.path)} needs to be available in the path. {self.start_error_message}\n{str(e)}"
111106
)
112107
count = 0
113108
while True:

py/selenium/webdriver/firefox/service.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ def __init__(
6060
# Set a port for CDP
6161
if "--connect-existing" not in self.service_args:
6262
self.service_args.append("--websocket-port")
63-
self.service_args.append("%d" % utils.free_port())
63+
self.service_args.append(f"{utils.free_port()}")
6464

6565
# Set the webdriver port
6666
self.service_args.append("--port")
67-
self.service_args.append("%d" % self.port)
67+
self.service_args.append(f"{self.port}")
6868

6969
def command_line_args(self) -> List[str]:
7070
return self.service_args

py/selenium/webdriver/ie/service.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ def __init__(
4848
Default is "stdout"."""
4949
self.service_args = []
5050
if host:
51-
self.service_args.append("--host=%s" % host)
51+
self.service_args.append(f"--host={host}")
5252
if log_level:
53-
self.service_args.append("--log-level=%s" % log_level)
53+
self.service_args.append(f"--log-level={log_level}")
5454
if log_file:
55-
self.service_args.append("--log-file=%s" % log_file)
55+
self.service_args.append(f"--log-file={log_file}")
5656

5757
super().__init__(
5858
executable_path,
@@ -61,4 +61,4 @@ def __init__(
6161
)
6262

6363
def command_line_args(self) -> List[str]:
64-
return ["--port=%d" % self.port] + self.service_args
64+
return [f"--port={self.port}"] + self.service_args

py/selenium/webdriver/webkitgtk/service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(self, executable_path: str = DEFAULT_EXECUTABLE_PATH, port=0, log_p
3838
super().__init__(executable_path, port, log_file)
3939

4040
def command_line_args(self):
41-
return ["-p", "%d" % self.port]
41+
return ["-p", f"{self.port}"]
4242

4343
def send_remote_shutdown_command(self):
4444
pass

py/selenium/webdriver/wpewebkit/service.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(self, executable_path: str = DEFAULT_EXECUTABLE_PATH, port=0, log_p
3838
super().__init__(executable_path, port, log_file)
3939

4040
def command_line_args(self):
41-
return ["-p", "%d" % self.port]
41+
return ["-p", f"{self.port}"]
4242

4343
def send_remote_shutdown_command(self):
4444
pass

0 commit comments

Comments
 (0)