Commits

Anonymous committed 088f9f4 Merge

merge trunk from 0.2 branch

  • Participants
  • Parent commits 4c676a4, 077e1e2

Comments (0)

Files changed (7)

 0000000000000000000000000000000000000000 v_0.0.6
 184cba097114145a71ed6998be2f627e6c139af9 v_0.1.0
 02c9e00db232560e82b08a61275e1543167bbe22 v_0.2.0
+c17200c92d76fb8bdbb53ba11a7dc2a12009718b v_0.2.1

pyramid_perfstat/perf_serializer.py

 from pyramid.interfaces import IRouteRequest
 from pyramid.interfaces import IRoutesMapper
 from pyramid.interfaces import IViewClassifier
+from pyramid.interfaces import IMultiView
 from pyramid.interfaces import IView
 
 from pyramid.threadlocal import get_current_request
                 view_callable = registry.adapters.lookup(
                     (IViewClassifier, request_iface, Interface),
                     IView, name='', default=None)
-                view_callable = ".".join((view_callable.__module__,view_callable.__name__))
+                if IMultiView.providedBy(view_callable):
+                    view_callable = view_callable.match(request.context, request)
 
-            self.view_name = view_callable
+            self.view_name = ".".join((view_callable.__module__,view_callable.__name__))
 
     def init_db(self, from_scratch=False):
         """

pyramid_perfstat/static/images/asc.gif

Removed
Old image

pyramid_perfstat/static/images/bg.gif

Removed
Old image

pyramid_perfstat/static/images/desc.gif

Removed
Old image

pyramid_perfstat/static/images/style.css

 	padding: 4px;
 }
 table.tablesorter thead tr .header {
-	background-image: url(bg.gif);
+	background-image: url(data:image/gif;base64,R0lGODlhFQAJAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAkAAAIXjI+AywnaYnhUMoqt3gZXPmVg94yJVQAAOw==);
 	background-repeat: no-repeat;
 	background-position: center right;
 	cursor: pointer;
 	background-color:#F0F0F6;
 }
 table.tablesorter thead tr .headerSortUp {
-	background-image: url(asc.gif);
+	background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjB+gC+jP2ptn0WskLQA7);
 }
 table.tablesorter thead tr .headerSortDown {
-	background-image: url(desc.gif);
+	background-image: url(data:image/gif;base64,R0lGODlhFQAEAIAAACMtMP///yH5BAEAAAEALAAAAAAVAAQAAAINjI8Bya2wnINUMopZAQA7);
 }
 table.tablesorter thead tr .headerSortDown, table.tablesorter thead tr .headerSortUp {
-background-color: #8dbdd8;
+   background-color: #8dbdd8;
 }
 
 setup(name='pyramid_perfstat',
       license='BSD License',
-      version='0.2.0',
+      version='0.2.1',
       description='Pyramid PerfStat logs and reports statistics about time usage of a pyramid webapp.',
       long_description=long_description,
       author='Bard Stéphane',