[pypy-commit] jitviewer default: Import everything needed from 'rpython', not from 'pypy'.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r255:41c224f97da8
Date: 2014-02-25 12:19 +0100
http://bitbucket.org/pypy/jitviewer/changeset/41c224f97da8/

Log:	Import everything needed from 'rpython', not from 'pypy'.

diff --git a/_jitviewer/app.py b/_jitviewer/app.py
--- a/_jitviewer/app.py
+++ b/_jitviewer/app.py
@@ -29,12 +29,12 @@
 import argparse
 
 try:
-    import pypy
+    import rpython
 except ImportError:
     import __pypy__
     sys.path.append(os.path.join(__pypy__.__file__, '..', '..', '..'))
     try:
-        import pypy
+        import rpython
     except ImportError:
         failout('Could not import pypy module, make sure to '
             'add the pypy module to PYTHONPATH')
@@ -47,13 +47,21 @@
 import inspect
 import threading
 import time
+
 try:
     from rpython.tool.logparser import extract_category
 except ImportError:
     from pypy.tool.logparser import extract_category
-from pypy.tool.jitlogparser.storage import LoopStorage
-from pypy.tool.jitlogparser.parser import adjust_bridges, import_log,\
-     parse_log_counts
+try:
+    from rpython.tool.jitlogparser.storage import LoopStorage
+except ImportError:
+    from pypy.tool.jitlogparser.storage import LoopStorage
+try:
+    from rpython.tool.jitlogparser.parser import adjust_bridges, import_log,\
+         parse_log_counts
+except ImportError:
+    from pypy.tool.jitlogparser.parser import adjust_bridges, import_log,\
+         parse_log_counts
 #
 from _jitviewer.parser import ParserWithHtmlRepr, FunctionHtml
 from _jitviewer.display import CodeRepr, CodeReprNoFile
diff --git a/_jitviewer/parser.py b/_jitviewer/parser.py
--- a/_jitviewer/parser.py
+++ b/_jitviewer/parser.py
@@ -1,6 +1,9 @@
 import re
 import cgi
-from pypy.tool.jitlogparser import parser
+try:
+    from rpython.tool.jitlogparser import parser
+except ImportError:
+    from pypy.tool.jitlogparser import parser
 
 def cssclass(cls, s, **kwds):
     cls = re.sub("[^\w]", "_", cls)