[pypy-svn] jitviewer default: merged upstream.

alex_gaynor commits-noreply at bitbucket.org
Mon Mar 14 03:38:16 CET 2011


Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: 
Changeset: r107:aa0319272065
Date: 2011-03-13 22:38 -0400
http://bitbucket.org/pypy/jitviewer/changeset/aa0319272065/

Log:	merged upstream.

diff --git a/bin/jitviewer.py b/bin/jitviewer.py
--- a/bin/jitviewer.py
+++ b/bin/jitviewer.py
@@ -19,6 +19,17 @@
 except ImportError:
     sys.path.insert(0, os.path.abspath(os.path.join(__file__, '..', '..')))
 
+try:
+    import pypy
+except ImportError:
+    import __pypy__
+    sys.path.append(os.path.join(__pypy__.__file__, '..', '..', '..'))
+    try:
+        import pypy
+    except ImportError:
+        raise ImportError('Could not import pypy module, make sure to '
+            'add the pypy module to PYTHONPATH')
+
 import cgi
 import flask
 import inspect


More information about the Pypy-commit mailing list