[Zope3-checkins] CVS: Zope3/src/zope/tales - tales.py:1.11

[Barry Warsaw]

Update of /cvs-repository/Zope3/src/zope/tales
In directory cvs.zope.org:/tmp/cvs-serv15986

Modified Files:
	tales.py 
Log Message:
Remove dependencies on the zope.proxy and zope.context packages.  This
was originally added for Context.evaluateText() so that it knew how to
unwrap proxied text objects, such as MessageIDs.  But that
functionality really ought to go in zope.app.pagetemplate.engine which
has its own derived Context object.


=== Zope3/src/zope/tales/tales.py 1.10 => 1.11 ===
--- Zope3/src/zope/tales/tales.py:1.10	Wed Jun 11 05:12:39 2003
+++ Zope3/src/zope/tales/tales.py	Mon Jun 30 18:46:23 2003
@@ -22,8 +22,6 @@
 import re
 from types import StringTypes
 
-from zope.proxy import proxy_compatible_isinstance as isinstance_ex
-from zope.context.wrapper import getbaseobject
 from zope.tales.interfaces import ITALESIterator
 from zope.interface import implements
 
@@ -667,9 +665,6 @@
         text = self.evaluate(expr)
         if text is _default or text is None:
             return text
-        if isinstance_ex(text, StringTypes):
-            # text could be a proxied/wrapped object
-            return getbaseobject(text)
         return unicode(text)
 
     def evaluateStructure(self, expr):