[pypy-commit] pypy default: Move the partial lib_pypy/disassembler.py to rpython/tool/.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r69414:6749a8734e6c
Date: 2014-02-25 12:17 +0100
http://bitbucket.org/pypy/pypy/changeset/6749a8734e6c/

Log:	Move the partial lib_pypy/disassembler.py to rpython/tool/.

	Move pypy/tool/jitlogparser to rpython/root/.

diff --git a/pypy/module/pypyjit/test_pypy_c/model.py b/pypy/module/pypyjit/test_pypy_c/model.py
--- a/pypy/module/pypyjit/test_pypy_c/model.py
+++ b/pypy/module/pypyjit/test_pypy_c/model.py
@@ -6,8 +6,9 @@
     from _pytest.assertion import newinterpret
 except ImportError:   # e.g. Python 2.5
     newinterpret = None
-from pypy.tool.jitlogparser.parser import SimpleParser, Function, TraceForOpcode
-from pypy.tool.jitlogparser.storage import LoopStorage
+from rpython.tool.jitlogparser.parser import (SimpleParser, Function,
+                                              TraceForOpcode)
+from rpython.tool.jitlogparser.storage import LoopStorage
 
 
 def find_ids_range(code):
diff --git a/pypy/module/pypyjit/test_pypy_c/test_00_model.py b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
--- a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
@@ -3,7 +3,7 @@
 import types
 import subprocess
 import py
-from lib_pypy import disassembler
+from rpython.tool import disassembler
 from rpython.tool.udir import udir
 from rpython.tool import logparser
 from rpython.jit.tool.jitoutput import parse_prof
@@ -129,7 +129,7 @@
 class TestOpMatcher_(object):
 
     def match(self, src1, src2, **kwds):
-        from pypy.tool.jitlogparser.parser import SimpleParser
+        from rpython.tool.jitlogparser.parser import SimpleParser
         loop = SimpleParser.parse_from_input(src1)
         matcher = OpMatcher(loop.operations)
         try:
diff --git a/pypy/module/pypyjit/test_pypy_c/test_jitlogparser.py b/pypy/module/pypyjit/test_pypy_c/test_jitlogparser.py
--- a/pypy/module/pypyjit/test_pypy_c/test_jitlogparser.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_jitlogparser.py
@@ -4,7 +4,7 @@
 from rpython.tool.logparser import extract_category
 from rpython.jit.backend.tool.viewcode import ObjdumpNotFound
 
-from pypy.tool.jitlogparser.parser import (import_log, parse_log_counts,
+from rpython.tool.jitlogparser.parser import (import_log, parse_log_counts,
         mangle_descr)
 from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
 
diff --git a/lib_pypy/disassembler.py b/rpython/tool/disassembler.py
rename from lib_pypy/disassembler.py
rename to rpython/tool/disassembler.py
diff --git a/pypy/tool/jitlogparser/__init__.py b/rpython/tool/jitlogparser/__init__.py
rename from pypy/tool/jitlogparser/__init__.py
rename to rpython/tool/jitlogparser/__init__.py
diff --git a/pypy/tool/jitlogparser/module_finder.py b/rpython/tool/jitlogparser/module_finder.py
rename from pypy/tool/jitlogparser/module_finder.py
rename to rpython/tool/jitlogparser/module_finder.py
diff --git a/pypy/tool/jitlogparser/parser.py b/rpython/tool/jitlogparser/parser.py
rename from pypy/tool/jitlogparser/parser.py
rename to rpython/tool/jitlogparser/parser.py
diff --git a/pypy/tool/jitlogparser/storage.py b/rpython/tool/jitlogparser/storage.py
rename from pypy/tool/jitlogparser/storage.py
rename to rpython/tool/jitlogparser/storage.py
--- a/pypy/tool/jitlogparser/storage.py
+++ b/rpython/tool/jitlogparser/storage.py
@@ -5,8 +5,8 @@
 
 import py
 import os
-from lib_pypy.disassembler import dis
-from pypy.tool.jitlogparser.module_finder import gather_all_code_objs
+from rpython.tool.disassembler import dis
+from rpython.tool.jitlogparser.module_finder import gather_all_code_objs
 
 class LoopStorage(object):
     def __init__(self, extrapath=None):
diff --git a/pypy/tool/jitlogparser/test/__init__.py b/rpython/tool/jitlogparser/test/__init__.py
rename from pypy/tool/jitlogparser/test/__init__.py
rename to rpython/tool/jitlogparser/test/__init__.py
diff --git a/pypy/tool/jitlogparser/test/logtest.log b/rpython/tool/jitlogparser/test/logtest.log
rename from pypy/tool/jitlogparser/test/logtest.log
rename to rpython/tool/jitlogparser/test/logtest.log
diff --git a/pypy/tool/jitlogparser/test/logtest2.log b/rpython/tool/jitlogparser/test/logtest2.log
rename from pypy/tool/jitlogparser/test/logtest2.log
rename to rpython/tool/jitlogparser/test/logtest2.log
diff --git a/pypy/tool/jitlogparser/test/test_modulefinder.py b/rpython/tool/jitlogparser/test/test_modulefinder.py
rename from pypy/tool/jitlogparser/test/test_modulefinder.py
rename to rpython/tool/jitlogparser/test/test_modulefinder.py
--- a/pypy/tool/jitlogparser/test/test_modulefinder.py
+++ b/rpython/tool/jitlogparser/test/test_modulefinder.py
@@ -1,5 +1,5 @@
 import py
-from pypy.tool.jitlogparser.module_finder import gather_all_code_objs
+from rpython.tool.jitlogparser.module_finder import gather_all_code_objs
 import re, sys
 
 def setup_module(mod):
diff --git a/pypy/tool/jitlogparser/test/test_parser.py b/rpython/tool/jitlogparser/test/test_parser.py
rename from pypy/tool/jitlogparser/test/test_parser.py
rename to rpython/tool/jitlogparser/test/test_parser.py
--- a/pypy/tool/jitlogparser/test/test_parser.py
+++ b/rpython/tool/jitlogparser/test/test_parser.py
@@ -1,8 +1,8 @@
-from pypy.tool.jitlogparser.parser import (SimpleParser, TraceForOpcode,
-                                           Function, adjust_bridges,
-                                           import_log, split_trace, Op,
-                                           parse_log_counts)
-from pypy.tool.jitlogparser.storage import LoopStorage
+from rpython.tool.jitlogparser.parser import (SimpleParser, TraceForOpcode,
+                                              Function, adjust_bridges,
+                                              import_log, split_trace, Op,
+                                              parse_log_counts)
+from rpython.tool.jitlogparser.storage import LoopStorage
 import py, sys
 from rpython.jit.backend.detect_cpu import autodetect
 
diff --git a/pypy/tool/jitlogparser/test/test_storage.py b/rpython/tool/jitlogparser/test/test_storage.py
rename from pypy/tool/jitlogparser/test/test_storage.py
rename to rpython/tool/jitlogparser/test/test_storage.py
--- a/pypy/tool/jitlogparser/test/test_storage.py
+++ b/rpython/tool/jitlogparser/test/test_storage.py
@@ -1,5 +1,5 @@
 import py
-from pypy.tool.jitlogparser.storage import LoopStorage
+from rpython.tool.jitlogparser.storage import LoopStorage
 
 def test_load_codes():
     tmppath = py.test.ensuretemp('load_codes')
diff --git a/pypy/tool/jitlogparser/test/x.py b/rpython/tool/jitlogparser/test/x.py
rename from pypy/tool/jitlogparser/test/x.py
rename to rpython/tool/jitlogparser/test/x.py