Move implementation of 'opyc dis' to compiler2/

oilshell · Mar 18, 2018 · 74a7f76ac9d5005405ead10de35ae0c0bd5ff339 · 74a7f76
1 parent efe4efb
commit 74a7f76ac9d5005405ead10de35ae0c0bd5ff339
Unified Split

Showing with 2 additions and 4 deletions.

0 opy/{misc/inspect_pyc.py → compiler2/dis_tool.py}

+2 −4 opy/opy_main.py
diff --git a/opy/misc/inspect_pyc.py → opy/compiler2/dis_tool.py b/opy/misc/inspect_pyc.py → opy/compiler2/dis_tool.py
diff --git a/opy/opy_main.py b/opy/opy_main.py
@@ -22,11 +22,9 @@
 from .pgen2 import tokenize
 from . import pytree

+from .compiler2 import dis_tool
 from .compiler2 import transformer
 from .compiler2 import pycodegen
-#from .compiler2 import opcode
-
-from .misc import inspect_pyc

 # Disabled for now because byterun imports 'six', and that breaks the build.
 #from .byterun import execfile
@@ -274,7 +272,7 @@ def py2st(gr, raw_node):
    with open(pyc_path, 'rb') as f:
      # TODO: Make this a flag.
      #v = inspect_pyc.Visitor(dis_bytecode=False)
-      v = inspect_pyc.Visitor()
+      v = dis_tool.Visitor()
      v.Visit(f)

    v.Report(report_f)