eric: comparison DebugClients/Python/coverage/execfile.py

-:bedab77d0fa3
+:d6c795b5ce33
 """Execute files of Python code."""
 import marshal
 import os
+import struct
 import sys
 import types
 from coverage.backward import BUILTINS
 from coverage.backward import PYC_MAGIC_NUMBER, imp, importlib_util_find_spec
-from coverage.misc import ExceptionDuringRun, NoCode, NoSource, isolate_module
+from coverage.misc import CoverageException, ExceptionDuringRun, NoCode, NoSource, isolate_module
 from coverage.phystokens import compile_unicode
 from coverage.python import get_python_source
 os = isolate_module(os)
 # Set sys.path correctly.
 old_path0 = sys.path[0]
 sys.path[0] = path0 if path0 is not None else my_path0
 try:
-# Make a code object somehow.
+try:
-if filename.endswith((".pyc", ".pyo")):
+# Make a code object somehow.
-code = make_code_from_pyc(filename)
+if filename.endswith((".pyc", ".pyo")):
-else:
+code = make_code_from_pyc(filename)
-code = make_code_from_py(filename)
+else:
+code = make_code_from_py(filename)
+except CoverageException:
+raise
+except Exception as exc:
+msg = "Couldn't run {filename!r} as Python code: {exc.__class__.__name__}: {exc}"
+raise CoverageException(msg.format(filename=filename, exc=exc))
 # Execute the code object.
 try:
 exec(code, main_mod.__dict__)
 except SystemExit:
 # The user called sys.exit().  Just pass it along to the upper
 # layers, where it will be handled.
 raise
-except:
+except Exception:
 # Something went wrong while executing the user code.
 # Get the exc_info, and pack them into an exception that we can
 # throw up to the outer loop.  We peel one layer off the traceback
 # so that the coverage.py code doesn't appear in the final printed
 # traceback.
 # is non-None when the exception is reported at the upper layer,
 # and a nested exception is shown to the user.  This getattr fixes
 # it somehow? https://bitbucket.org/pypy/pypy/issue/1903
 getattr(err, '__context__', None)
-raise ExceptionDuringRun(typ, err, tb.tb_next)
+# Call the excepthook.
+try:
+if hasattr(err, "__traceback__"):
+err.__traceback__ = err.__traceback__.tb_next
+sys.excepthook(typ, err, tb.tb_next)
+except SystemExit:
+raise
+except Exception:
+# Getting the output right in the case of excepthook
+# shenanigans is kind of involved.
+sys.stderr.write("Error in sys.excepthook:\n")
+typ2, err2, tb2 = sys.exc_info()
+err2.__suppress_context__ = True
+if hasattr(err2, "__traceback__"):
+err2.__traceback__ = err2.__traceback__.tb_next
+sys.__excepthook__(typ2, err2, tb2.tb_next)
+sys.stderr.write("\nOriginal exception was:\n")
+raise ExceptionDuringRun(typ, err, tb.tb_next)
+else:
+sys.exit(1)
 finally:
 # Restore the old __main__, argv, and path.
 sys.modules['__main__'] = old_main_mod
 sys.argv = old_argv
 sys.path[0] = old_path0
 # match or we won't run the file.
 magic = fpyc.read(4)
 if magic != PYC_MAGIC_NUMBER:
 raise NoCode("Bad magic number in .pyc file")
-# Skip the junk in the header that we don't need.
+date_based = True
-fpyc.read(4)            # Skip the moddate.
+if sys.version_info >= (3, 7, 0, 'alpha', 4):
-if sys.version_info >= (3, 3):
+flags = struct.unpack('<L', fpyc.read(4))[0]
-# 3.3 added another long to the header (size), skip it.
+hash_based = flags & 0x01
-fpyc.read(4)
+if hash_based:
+fpyc.read(8)    # Skip the hash.
+date_based = False
+if date_based:
+# Skip the junk in the header that we don't need.
+fpyc.read(4)            # Skip the moddate.
+if sys.version_info >= (3, 3):
+# 3.3 added another long to the header (size), skip it.
+fpyc.read(4)
 # The rest of the file is the code object we want.
 code = marshal.load(fpyc)
 return code

Mercurial Repositories > eric / file comparison

comparison: DebugClients/Python/coverage/execfile.py

DebugClients/Python/coverage/execfile.py