Skip to content

Commit 57faa36

Browse files
committed
[py] Add client_config property and update deprecation messages
1 parent 88479dc commit 57faa36

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

py/selenium/webdriver/remote/remote_connection.py

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,10 @@ class RemoteConnection:
168168
extra_headers = None
169169
user_agent = f"selenium/{__version__} (python {system})"
170170

171+
@property
172+
def client_config(self):
173+
return self._client_config
174+
171175
@classmethod
172176
def get_timeout(cls):
173177
""":Returns:
@@ -176,7 +180,7 @@ def get_timeout(cls):
176180
Remote Connection
177181
"""
178182
warnings.warn(
179-
"get_timeout() in RemoteConnection is deprecated, get timeout from ClientConfig instance instead",
183+
"get_timeout() in RemoteConnection is deprecated, get timeout from client_config instead",
180184
DeprecationWarning,
181185
stacklevel=2,
182186
)
@@ -190,7 +194,7 @@ def set_timeout(cls, timeout):
190194
- timeout - timeout value for http requests in seconds
191195
"""
192196
warnings.warn(
193-
"set_timeout() in RemoteConnection is deprecated, set timeout to ClientConfig instance in constructor instead",
197+
"set_timeout() in RemoteConnection is deprecated, set timeout in client_config instead",
194198
DeprecationWarning,
195199
stacklevel=2,
196200
)
@@ -200,7 +204,7 @@ def set_timeout(cls, timeout):
200204
def reset_timeout(cls):
201205
"""Reset the http request timeout to socket._GLOBAL_DEFAULT_TIMEOUT."""
202206
warnings.warn(
203-
"reset_timeout() in RemoteConnection is deprecated, use reset_timeout() in ClientConfig instance instead",
207+
"reset_timeout() in RemoteConnection is deprecated, use reset_timeout() in client_config instead",
204208
DeprecationWarning,
205209
stacklevel=2,
206210
)
@@ -215,7 +219,7 @@ def get_certificate_bundle_path(cls):
215219
REQUESTS_CA_BUNDLE env variable if set.
216220
"""
217221
warnings.warn(
218-
"get_certificate_bundle_path() in RemoteConnection is deprecated, get ca_certs from ClientConfig instance instead",
222+
"get_certificate_bundle_path() in RemoteConnection is deprecated, get ca_certs from client_config instead",
219223
DeprecationWarning,
220224
stacklevel=2,
221225
)
@@ -231,7 +235,7 @@ def set_certificate_bundle_path(cls, path):
231235
- path - path of a .pem encoded certificate chain.
232236
"""
233237
warnings.warn(
234-
"set_certificate_bundle_path() in RemoteConnection is deprecated, set ca_certs to ClientConfig instance in constructor instead",
238+
"set_certificate_bundle_path() in RemoteConnection is deprecated, set ca_certs in client_config instead",
235239
DeprecationWarning,
236240
stacklevel=2,
237241
)
@@ -328,35 +332,35 @@ def __init__(
328332

329333
if remote_server_addr:
330334
warnings.warn(
331-
"setting remote_server_addr in RemoteConnection() is deprecated, set in ClientConfig instance instead",
335+
"setting remote_server_addr in RemoteConnection() is deprecated, set in client_config instead",
332336
DeprecationWarning,
333337
stacklevel=2,
334338
)
335339

336340
if not keep_alive:
337341
warnings.warn(
338-
"setting keep_alive in RemoteConnection() is deprecated, set in ClientConfig instance instead",
342+
"setting keep_alive in RemoteConnection() is deprecated, set in client_config instead",
339343
DeprecationWarning,
340344
stacklevel=2,
341345
)
342346

343347
if ignore_certificates:
344348
warnings.warn(
345-
"setting ignore_certificates in RemoteConnection() is deprecated, set in ClientConfig instance instead",
349+
"setting ignore_certificates in RemoteConnection() is deprecated, set in client_config instead",
346350
DeprecationWarning,
347351
stacklevel=2,
348352
)
349353

350354
if init_args_for_pool_manager:
351355
warnings.warn(
352-
"setting init_args_for_pool_manager in RemoteConnection() is deprecated, set in ClientConfig instance instead",
356+
"setting init_args_for_pool_manager in RemoteConnection() is deprecated, set in client_config instead",
353357
DeprecationWarning,
354358
stacklevel=2,
355359
)
356360

357361
if ignore_proxy:
358362
warnings.warn(
359-
"setting ignore_proxy in RemoteConnection() is deprecated, set in ClientConfig instance instead",
363+
"setting ignore_proxy in RemoteConnection() is deprecated, set in client_config instead",
360364
DeprecationWarning,
361365
stacklevel=2,
362366
)

0 commit comments

Comments
 (0)