Log message for revision 71833: ignore '*' as encoding Changed: U Zope/trunk/lib/python/Products/PageTemplates/unicodeconflictresolver.py
-=- Modified: Zope/trunk/lib/python/Products/PageTemplates/unicodeconflictresolver.py =================================================================== --- Zope/trunk/lib/python/Products/PageTemplates/unicodeconflictresolver.py 2007-01-08 21:16:10 UTC (rev 71832) +++ Zope/trunk/lib/python/Products/PageTemplates/unicodeconflictresolver.py 2007-01-08 21:43:51 UTC (rev 71833) @@ -80,6 +80,8 @@ request.__zpt_available_charsets = charsets for enc in charsets: + if enc == '*': continue + try: return unicode(text, enc) except UnicodeDecodeError: _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins