Skip to content

Commit 0889486

Browse files
symonksymonk
committed
[py]: tidy up some pylint violations; update to use more fstrings
1 parent 82d7891 commit 0889486

1 file changed

Lines changed: 20 additions & 20 deletions

File tree

‎py/selenium/webdriver/support/event_firing_webdriver.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,13 @@ def find_elements(self, by=By.ID, value=None) -> typing.List[WebElement]:
109109
return self._dispatch("find", (by, value, self._driver), "find_elements", (by, value))
110110

111111
def _dispatch(self, l_call, l_args, d_call, d_args):
112-
getattr(self._listener, "before_%s" % l_call)(*l_args)
112+
getattr(self._listener, f"before_{l_call}")(*l_args)
113113
try:
114114
result = getattr(self._driver, d_call)(*d_args)
115-
except Exception as e:
116-
self._listener.on_exception(e, self._driver)
115+
except Exception as exc:
116+
self._listener.on_exception(exc, self._driver)
117117
raise
118-
getattr(self._listener, "after_%s" % l_call)(*l_args)
118+
getattr(self._listener, f"after_{l_call}")(*l_args)
119119
return _wrap_elements(result, self)
120120

121121
def _unwrap_element_args(self, args):
@@ -139,24 +139,24 @@ def __setattr__(self, item, value):
139139
else:
140140
try:
141141
object.__setattr__(self._driver, item, value)
142-
except Exception as e:
143-
self._listener.on_exception(e, self._driver)
142+
except Exception as exc:
143+
self._listener.on_exception(exc, self._driver)
144144
raise
145145

146146
def __getattr__(self, name):
147147
def _wrap(*args, **kwargs):
148148
try:
149149
result = attrib(*args, **kwargs)
150150
return _wrap_elements(result, self)
151-
except Exception as e:
152-
self._listener.on_exception(e, self._driver)
151+
except Exception as exc:
152+
self._listener.on_exception(exc, self._driver)
153153
raise
154154

155155
try:
156156
attrib = getattr(self._driver, name)
157157
return _wrap if callable(attrib) else attrib
158-
except Exception as e:
159-
self._listener.on_exception(e, self._driver)
158+
except Exception as exc:
159+
self._listener.on_exception(exc, self._driver)
160160
raise
161161

162162

@@ -195,13 +195,13 @@ def find_elements(self, by=By.ID, value=None) -> typing.List[WebElement]:
195195
return self._dispatch("find", (by, value, self._driver), "find_elements", (by, value))
196196

197197
def _dispatch(self, l_call, l_args, d_call, d_args):
198-
getattr(self._listener, "before_%s" % l_call)(*l_args)
198+
getattr(self._listener, f"before_{l_call}")(*l_args)
199199
try:
200200
result = getattr(self._webelement, d_call)(*d_args)
201-
except Exception as e:
202-
self._listener.on_exception(e, self._driver)
201+
except Exception as exc:
202+
self._listener.on_exception(exc, self._driver)
203203
raise
204-
getattr(self._listener, "after_%s" % l_call)(*l_args)
204+
getattr(self._listener, f"after_{l_call}")(*l_args)
205205
return _wrap_elements(result, self._ef_driver)
206206

207207
def __setattr__(self, item, value):
@@ -210,24 +210,24 @@ def __setattr__(self, item, value):
210210
else:
211211
try:
212212
object.__setattr__(self._webelement, item, value)
213-
except Exception as e:
214-
self._listener.on_exception(e, self._driver)
213+
except Exception as exc:
214+
self._listener.on_exception(exc, self._driver)
215215
raise
216216

217217
def __getattr__(self, name):
218218
def _wrap(*args, **kwargs):
219219
try:
220220
result = attrib(*args, **kwargs)
221221
return _wrap_elements(result, self._ef_driver)
222-
except Exception as e:
223-
self._listener.on_exception(e, self._driver)
222+
except Exception as exc:
223+
self._listener.on_exception(exc, self._driver)
224224
raise
225225

226226
try:
227227
attrib = getattr(self._webelement, name)
228228
return _wrap if callable(attrib) else attrib
229-
except Exception as e:
230-
self._listener.on_exception(e, self._driver)
229+
except Exception as exc:
230+
self._listener.on_exception(exc, self._driver)
231231
raise
232232

233233

0 commit comments

Comments
 (0)