[Checkins] SVN: z3c.jbot/trunk/ Fixed aq_wrap-issue.

Malthe Borch mborch at gmail.com
Mon Oct 19 10:52:10 EDT 2009


Log message for revision 105145:
  Fixed aq_wrap-issue.

Changed:
  U   z3c.jbot/trunk/CHANGES.txt
  U   z3c.jbot/trunk/z3c/jbot/__init__.py

-=-
Modified: z3c.jbot/trunk/CHANGES.txt
===================================================================
--- z3c.jbot/trunk/CHANGES.txt	2009-10-19 14:32:44 UTC (rev 105144)
+++ z3c.jbot/trunk/CHANGES.txt	2009-10-19 14:52:10 UTC (rev 105145)
@@ -1,6 +1,11 @@
 Changes
 =======
 
+In next release...
+
+- Acquisition-wrap template instance, if applicable. This fixes an
+  issue on Zope 2.10 where legacy code would break.
+
 0.5 (2009-10-16)
 ----------------
 

Modified: z3c.jbot/trunk/z3c/jbot/__init__.py
===================================================================
--- z3c.jbot/trunk/z3c/jbot/__init__.py	2009-10-19 14:32:44 UTC (rev 105144)
+++ z3c.jbot/trunk/z3c/jbot/__init__.py	2009-10-19 14:52:10 UTC (rev 105145)
@@ -1,5 +1,10 @@
 from zope.pagetemplate.pagetemplatefile import PageTemplateFile
 
+try:
+    from Acquisition.interfaces import IAcquirer
+except ImportError:
+    IAcquirer = None
+
 import utility
 import logging
 
@@ -31,6 +36,10 @@
             inst._v_last_read = False
             break
 
+    if view is not None:
+        if IAcquirer.providedBy(inst):
+            return inst.__of__(view)
+
     return inst
 
 try:



More information about the checkins mailing list