Log message for revision 71763: fix for tests Changed: U Zope/trunk/lib/python/Products/PageTemplates/Expressions.py
-=- Modified: Zope/trunk/lib/python/Products/PageTemplates/Expressions.py =================================================================== --- Zope/trunk/lib/python/Products/PageTemplates/Expressions.py 2007-01-07 12:14:31 UTC (rev 71762) +++ Zope/trunk/lib/python/Products/PageTemplates/Expressions.py 2007-01-07 12:29:16 UTC (rev 71763) @@ -21,6 +21,7 @@ import logging from zope.component import getUtility +from zope.component.interfaces import ComponentLookupError from zope.interface import implements from zope.tales.tales import Context, Iterator from zope.tales.expressions import PathExpr, StringExpr, NotExpr @@ -199,9 +200,17 @@ elif isinstance(text, str): # bahh...non-unicode string..we need to convert it to unicode - resolver = getUtility(IUnicodeEncodingConflictResolver) + # catch ComponentLookupError in order to make tests shut-up. + # This should not be a problem since it won't change the old + # default behavior + try: + resolver = getUtility(IUnicodeEncodingConflictResolver) + except ComponentLookupError: + return unicode(text) + + try: return resolver.resolve(self.contexts['context'], text, expr) except UnicodeDecodeError,e: LOG.error("""UnicodeDecodeError detected for expression "%s"\n""" _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins