[py] Fixing stacktrace parser to handle strings as well as objects

SeleniumHQ · Sep 25, 2019 · 2bb0b6b · 2bb0b6b
1 parent cf5fd16
commit 2bb0b6b
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/py/selenium/webdriver/remote/errorhandler.py b/py/selenium/webdriver/remote/errorhandler.py
@@ -213,23 +213,23 @@ def check_response(self, response):
         st_value = value.get('stackTrace') or value.get('stacktrace')
         if st_value:
             if isinstance(st_value, basestring):
-                st_value = st_value.split('\n')
-            stacktrace = []
-            try:
-                for frame in st_value:
-                    line = self._value_or_default(frame, 'lineNumber', '')
-                    file = self._value_or_default(frame, 'fileName', '<anonymous>')
-                    if line:
-                        file = "%s:%s" % (file, line)
-                    meth = self._value_or_default(frame, 'methodName', '<anonymous>')
-                    if 'className' in frame:
-                        meth = "%s.%s" % (frame['className'], meth)
-                    msg = "    at %s (%s)"
-                    msg = msg % (meth, file)
-                    #stacktrace.append(msg)
-                    stacktrace.append(frame)
-            except TypeError:
-                pass
+                stacktrace = st_value.split('\n')
+            else:
+                stacktrace = []
+                try:
+                    for frame in st_value:
+                        line = self._value_or_default(frame, 'lineNumber', '')
+                        file = self._value_or_default(frame, 'fileName', '<anonymous>')
+                        if line:
+                            file = "%s:%s" % (file, line)
+                        meth = self._value_or_default(frame, 'methodName', '<anonymous>')
+                        if 'className' in frame:
+                            meth = "%s.%s" % (frame['className'], meth)
+                        msg = "    at %s (%s)"
+                        msg = msg % (meth, file)
+                        stacktrace.append(msg)
+                except TypeError:
+                    pass
         if exception_class == UnexpectedAlertPresentException:
             alert_text = None
             if 'data' in value: