[Erp5-report] r43957 arnaud.fontaine - /erp5/trunk/products/ERP5Type/Utils.py

[nobody at svn.erp5.org]

Author: arnaud.fontaine
Date: Fri Mar  4 03:59:11 2011
New Revision: 43957

URL: http://svn.erp5.org?rev=43957&view=rev
Log:
CompilerError used to be defined in Products.PageTemplates.TALES in
Zope 2.8, so try to import it first and fallback on zope.tales.tales
for Zope 2.12.

This fixes failures of testDynamicClassGeneration on Zope 2.8.

Modified:
    erp5/trunk/products/ERP5Type/Utils.py

Modified: erp5/trunk/products/ERP5Type/Utils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Utils.py?rev=43957&r1=43956&r2=43957&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Utils.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Utils.py [utf8] Fri Mar  4 03:59:11 2011
@@ -1280,7 +1280,12 @@ def createExpressionContext(object, port
   tv[cache_key] = ec
   return ec
 
-from zope.tales.tales import CompilerError
+# CompilerError used to be defined in Products.PageTemplates.TALES in
+# Zope 2.8
+try:
+  from Products.PageTemplates.TALES import CompilerError
+except ImportError:
+  from zope.tales.tales import CompilerError
 
 def evaluateExpressionFromString(expression_context, expression_string):
   """