Skip to content

Commit 2bb0b6b

Browse files
committed
[py] Fixing stacktrace parser to handle strings as well as objects
1 parent cf5fd16 commit 2bb0b6b

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

py/selenium/webdriver/remote/errorhandler.py

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -213,23 +213,23 @@ def check_response(self, response):
213213
st_value = value.get('stackTrace') or value.get('stacktrace')
214214
if st_value:
215215
if isinstance(st_value, basestring):
216-
st_value = st_value.split('\n')
217-
stacktrace = []
218-
try:
219-
for frame in st_value:
220-
line = self._value_or_default(frame, 'lineNumber', '')
221-
file = self._value_or_default(frame, 'fileName', '<anonymous>')
222-
if line:
223-
file = "%s:%s" % (file, line)
224-
meth = self._value_or_default(frame, 'methodName', '<anonymous>')
225-
if 'className' in frame:
226-
meth = "%s.%s" % (frame['className'], meth)
227-
msg = " at %s (%s)"
228-
msg = msg % (meth, file)
229-
#stacktrace.append(msg)
230-
stacktrace.append(frame)
231-
except TypeError:
232-
pass
216+
stacktrace = st_value.split('\n')
217+
else:
218+
stacktrace = []
219+
try:
220+
for frame in st_value:
221+
line = self._value_or_default(frame, 'lineNumber', '')
222+
file = self._value_or_default(frame, 'fileName', '<anonymous>')
223+
if line:
224+
file = "%s:%s" % (file, line)
225+
meth = self._value_or_default(frame, 'methodName', '<anonymous>')
226+
if 'className' in frame:
227+
meth = "%s.%s" % (frame['className'], meth)
228+
msg = " at %s (%s)"
229+
msg = msg % (meth, file)
230+
stacktrace.append(msg)
231+
except TypeError:
232+
pass
233233
if exception_class == UnexpectedAlertPresentException:
234234
alert_text = None
235235
if 'data' in value:

0 commit comments

Comments
 (0)