Changeset 1249

Timestamp:

09/24/07 07:45:42 (14 months ago)

Author:

JensDiemer

Message:

-a human time in pagestats
-change version string to v0.8.0RC1

Location:

trunk/pylucid/PyLucid

Files:

• middlewares/pagestats.py (modified) (2 diffs)
• __init__.py (modified) (1 diff)

trunk/pylucid/PyLucid/middlewares/pagestats.py

@@ -31 +31 @@
 
 FMT = (
-    'render time: %(total_time).3f -'
-    ' overall: %(overall_time).1f -'
+    'render time: %(total_time)s -'
+    ' overall: %(overall_time)s -'
     ' Queries: %(queries)d'
 )
+
+
+def human_time(t):
+    if t<1:
+        return "%.1f ms" % (t * 100)
+    elif t>60:
+        return "%.1f min" % (t/60.0)
+    else:
+        return "%.1f sec" % t
+
 
 class PageStatsMiddleware(object):
@@ -70 +80 @@
         queries = len(connection.queries) - old_queries
 
+        total_time = human_time(time() - start_time)
+        overall_time = human_time(time() - start_overall)
+
         # replace the comment if found
         stat_info = FMT % {
-            'total_time' : time() - start_time,
-            'overall_time' : time() - start_overall,
+            'total_time' : total_time,
+            'overall_time' : overall_time,
             'queries' : queries,
         }

trunk/pylucid/PyLucid/__init__.py

@@ -26 +26 @@
 
 # PyLucid Version String
-PYLUCID_VERSION = (0, 8, 0, "beta2 " + svn_revision)
-PYLUCID_VERSION_STRING = "0.8.0 beta2 " + svn_revision
+PYLUCID_VERSION = (0, 8, 0, "RC1 " + svn_revision)
+PYLUCID_VERSION_STRING = "0.8.0 RC1 " + svn_revision