Skip to content

Commit f0f9ea5

Browse files
authored
Merge branch 'trunk' into webkit_service
2 parents cfd881a + 7c9f000 commit f0f9ea5

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

py/selenium/webdriver/remote/remote_connection.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ def execute(self, command, params):
305305
LOGGER.debug("%s %s %s", command_info[0], url, str(trimmed))
306306
return self._request(command_info[0], url, body=data)
307307

308-
def _request(self, method, url, body=None):
308+
def _request(self, method, url, body=None, timeout=120):
309309
"""Send an HTTP request to the remote server.
310310
311311
:Args:
@@ -323,12 +323,12 @@ def _request(self, method, url, body=None):
323323
body = None
324324

325325
if self.keep_alive:
326-
response = self._conn.request(method, url, body=body, headers=headers)
326+
response = self._conn.request(method, url, body=body, headers=headers, timeout=timeout)
327327
statuscode = response.status
328328
else:
329329
conn = self._get_connection_manager()
330330
with conn as http:
331-
response = http.request(method, url, body=body, headers=headers)
331+
response = http.request(method, url, body=body, headers=headers, timeout=timeout)
332332
statuscode = response.status
333333
data = response.data.decode("UTF-8")
334334
LOGGER.debug("Remote response: status=%s | data=%s | headers=%s", response.status, data, response.headers)

scripts/format.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,12 @@ section "Rust"
3131
echo " rustfmt" >&2
3232
bazel run @rules_rust//:rustfmt
3333

34+
# TODO: use bazel target when rules_python supports formatting
35+
section "Python"
36+
echo " python - isort, black, flake8, docformatter" >&2
37+
pip install tox
38+
export TOXENV=linting
39+
tox -c py/tox.ini
40+
3441
section "Copyright"
3542
bazel run //scripts:update_copyright

0 commit comments

Comments
 (0)