[Zope3-checkins] CVS: Zope3/src/zope/app/pagetemplate - engine.py:1.20

Sidnei da Silva sidnei at x3ng.com.br
Wed Jan 14 08:40:49 EST 2004


Update of /cvs-repository/Zope3/src/zope/app/pagetemplate
In directory cvs.zope.org:/tmp/cvs-serv7325/zope/app/pagetemplate

Modified Files:
	engine.py 
Log Message:
Remove proxy_compatible_isinstance, which according to the docstring (and to Jim) should not be needed anymore. Also, only pagetemplate.engine was using it.


=== Zope3/src/zope/app/pagetemplate/engine.py 1.19 => 1.20 ===
--- Zope3/src/zope/app/pagetemplate/engine.py:1.19	Thu Aug 21 10:19:26 2003
+++ Zope3/src/zope/app/pagetemplate/engine.py	Wed Jan 14 08:40:18 2004
@@ -31,7 +31,6 @@
 from zope.tales.tales import Context
 
 from zope.context.wrapper import getbaseobject
-from zope.proxy import proxy_compatible_isinstance as isinstance_ex
 from zope.proxy import removeAllProxies
 from zope.security.proxy import ProxyFactory
 from zope.security.builtins import RestrictedBuiltins
@@ -75,7 +74,7 @@
         text = self.evaluate(expr)
         if text is self.getDefault() or text is None:
             return text
-        if isinstance_ex(text, StringTypes):
+        if isinstance(text, StringTypes):
             # text could be a proxied/wrapped object
             return getbaseobject(text)
         return unicode(text)




More information about the Zope3-Checkins mailing list