Alex Gaynor committed aa03192 Merge

merged upstream.

Comments (0)

Files changed (1)

 except ImportError:
     sys.path.insert(0, os.path.abspath(os.path.join(__file__, '..', '..')))
+    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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.