[pypy-svn] jitviewer commit b47851b49b66: Finish static files dispatching correctly

[commits-noreply at bitbucket.org]

# HG changeset patch -- Bitbucket.org
# Project jitviewer
# URL http://bitbucket.org/pypy/jitviewer/overview
# User Maciej Fijalkowski <fijall at gmail.com>
# Date 1290360709 -7200
# Node ID b47851b49b6644d3f8345729ecc2ab957f28f13f
# Parent  c8c87cffc932b2e6a8a613e7c244363aefd3136f
Finish static files dispatching correctly

--- a/bin/jitviewer.py
+++ b/bin/jitviewer.py
@@ -23,6 +23,11 @@ from pygments import highlight
 from pygments.lexers import PythonLexer
 from pygments.formatters import HtmlFormatter
 
+from jinja2 import Environment, FileSystemLoader
+
+from werkzeug import Response
+from flask.helpers import send_from_directory
+
 CUTOFF = 30
 
 class Server(object):
@@ -49,7 +54,7 @@ class Server(object):
         if not all:
             loops = loops[:CUTOFF]
         return flask.render_template('index.html', loops=loops,
-                                     extra_data=extra_data)
+                                    extra_data=extra_data)
 
     def loop(self):
         no = int(flask.request.args.get('no', '0'))
@@ -100,8 +105,14 @@ def start_browser(url):
     th.start()
     return th
 
+class OverrideFlask(flask.Flask):
+    def __init__(self, *args, **kwargs):
+        self.root_path = kwargs.pop('root_path')
+        flask.Flask.__init__(self, *args, **kwargs)
+
 def main():
-
+    PATH = os.path.join(os.path.dirname(
+        os.path.dirname(__file__)))
     if not '__pypy__' in sys.builtin_module_names:
         print "Please run it using pypy-c"
         sys.exit(1)
@@ -114,7 +125,7 @@ def main():
     loops = [parse(l) for l in extract_category(log, "jit-log-opt-")]
     parse_log_counts(open(sys.argv[1] + '.count').readlines(), loops)
     storage.reconnect_loops(loops)
-    app = flask.Flask(__name__)
+    app = OverrideFlask('__name__', root_path=PATH)
     server = Server(storage)
     app.debug = True
     app.route('/')(server.index)

--- a/_jitviewer/source.py
+++ /dev/null
@@ -1,39 +0,0 @@
-
-import re
-
-def f():
-    i = 0
-    while i < 1003:
-        i += 1
-
-f()
-
-def inner(i):
-    return i + 1
-
-def inlined_call():
-    i = 0
-    while i < 1003:
-        i = inner(i)
-
-inlined_call()
-
-def bridge():
-    s = 0
-    i = 0
-    while i < 10000:
-        if i % 2:
-            s += 1
-        else:
-            s += 2
-        i += 1
-    return s
-
-bridge()
-
-def inlined_str_stuff():
-    s = [str(i) for i in range(3000)]
-    for elem in s:
-        re.search('3', elem)
-
-inlined_str_stuff()

--- /dev/null
+++ b/source.py
@@ -0,0 +1,39 @@
+
+import re
+
+def f():
+    i = 0
+    while i < 1003:
+        i += 1
+
+f()
+
+def inner(i):
+    return i + 1
+
+def inlined_call():
+    i = 0
+    while i < 1003:
+        i = inner(i)
+
+inlined_call()
+
+def bridge():
+    s = 0
+    i = 0
+    while i < 10000:
+        if i % 2:
+            s += 1
+        else:
+            s += 2
+        i += 1
+    return s
+
+bridge()
+
+def inlined_str_stuff():
+    s = [str(i) for i in range(3000)]
+    for elem in s:
+        re.search('3', elem)
+
+inlined_str_stuff()