[Checkins] SVN: z3ext.layout/trunk/ remove debugging code
Nikolay Kim
fafhrd91 at gmail.com
Tue Jul 14 06:06:06 EDT 2009
Log message for revision 101886:
remove debugging code
Changed:
U z3ext.layout/trunk/CHANGES.txt
U z3ext.layout/trunk/src/z3ext/layout/pagelet.py
U z3ext.layout/trunk/src/z3ext/layout/tales.py
-=-
Modified: z3ext.layout/trunk/CHANGES.txt
===================================================================
--- z3ext.layout/trunk/CHANGES.txt 2009-07-14 09:01:19 UTC (rev 101885)
+++ z3ext.layout/trunk/CHANGES.txt 2009-07-14 10:06:05 UTC (rev 101886)
@@ -2,11 +2,15 @@
CHANGES
=======
-2.2.0 (Unrelased)
+2.2.0 (2009-07-14)
-----------------
-- Use chameleon for zpt
+- Use chameleon for pagelets and layouts
+- Added 'pagelet' chameleon expression
+
+- Added 'queryPagelet' helper function
+
- Do not use metal in default layouts
- Use '+' for named pagelet instead of ';'
Modified: z3ext.layout/trunk/src/z3ext/layout/pagelet.py
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/pagelet.py 2009-07-14 09:01:19 UTC (rev 101885)
+++ z3ext.layout/trunk/src/z3ext/layout/pagelet.py 2009-07-14 10:06:05 UTC (rev 101886)
@@ -15,8 +15,6 @@
$Id$
"""
-from datetime import datetime
-
import logging, sys
from zope import interface, component
from zope.component import queryUtility, queryAdapter, queryMultiAdapter
@@ -184,16 +182,7 @@
if view is not None:
try:
- if __debug__:
- dt = datetime.now()
- rendered = view.updateAndRender()
-
- td = datetime.now() - dt
- secs = (td.days*86400+td.seconds)+(0.000001*td.microseconds)
- print >>sys.stderr, 'pagelet: ', secs, name
- return rendered
- else:
- return view.updateAndRender()
+ return view.updateAndRender()
except Exception, err:
log = logging.getLogger('z3ext.layout')
log.exception(err)
Modified: z3ext.layout/trunk/src/z3ext/layout/tales.py
===================================================================
--- z3ext.layout/trunk/src/z3ext/layout/tales.py 2009-07-14 09:01:19 UTC (rev 101885)
+++ z3ext.layout/trunk/src/z3ext/layout/tales.py 2009-07-14 10:06:05 UTC (rev 101886)
@@ -15,7 +15,6 @@
$Id: tales.py 2720 2008-08-25 11:15:10Z fafhrd91 $
"""
-from datetime import datetime
import logging, sys
from zope.tales.expressions import StringExpr, SimpleModuleImporter
from zope.component import queryUtility, queryAdapter, queryMultiAdapter
@@ -30,17 +29,7 @@
try:
pagelet = queryPagelet(context, request, name)
if pagelet is not None:
- if __debug__:
- dt = datetime.now()
- rendered = pagelet.updateAndRender()
-
- td = datetime.now() - dt
- secs = (td.days*86400+td.seconds)+(0.000001*td.microseconds)
- print >>sys.stderr, 'pagelet: ', secs, name
-
- return rendered
- else:
- return pagelet.updateAndRender()
+ return pagelet.updateAndRender()
except Exception, err:
log = logging.getLogger('z3ext.layout')
log.exception(err)
More information about the Checkins
mailing list