diff options
Diffstat (limited to 'lib/spack/external/_pytest/_code/_py2traceback.py')
| -rw-r--r-- | lib/spack/external/_pytest/_code/_py2traceback.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/spack/external/_pytest/_code/_py2traceback.py b/lib/spack/external/_pytest/_code/_py2traceback.py index a830d9899a..5aacf0a428 100644 --- a/lib/spack/external/_pytest/_code/_py2traceback.py +++ b/lib/spack/external/_pytest/_code/_py2traceback.py @@ -2,8 +2,10 @@ # CHANGES: # - some_str is replaced, trying to create unicode strings # +from __future__ import absolute_import, division, print_function import types + def format_exception_only(etype, value): """Format the exception part of a traceback. @@ -29,7 +31,7 @@ def format_exception_only(etype, value): # would throw another exception and mask the original problem. if (isinstance(etype, BaseException) or isinstance(etype, types.InstanceType) or - etype is None or type(etype) is str): + etype is None or type(etype) is str): return [_format_final_exc_line(etype, value)] stype = etype.__name__ @@ -61,6 +63,7 @@ def format_exception_only(etype, value): lines.append(_format_final_exc_line(stype, value)) return lines + def _format_final_exc_line(etype, value): """Return a list of a single line -- normal case for format_exception_only""" valuestr = _some_str(value) @@ -70,6 +73,7 @@ def _format_final_exc_line(etype, value): line = "%s: %s\n" % (etype, valuestr) return line + def _some_str(value): try: return unicode(value) |