[Checkins] SVN: z3c.jbot/trunk/ Condition on whether view is an acquirer, too. Gerhard Weis provided this patch.

[Malthe Borch]

Log message for revision 105229:
  Condition on whether view is an acquirer, too. Gerhard Weis provided this patch.

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-22 21:48:28 UTC (rev 105228)
+++ z3c.jbot/trunk/CHANGES.txt	2009-10-23 08:10:47 UTC (rev 105229)
@@ -1,6 +1,11 @@
 Changes
 =======
 
+In next release...
+
+- Fixed issue where an exception would be raised if a view was not an
+  acquirer, while the context was. [gweis]
+
 0.5.1 (2009-10-19)
 ------------------
 

Modified: z3c.jbot/trunk/z3c/jbot/__init__.py
===================================================================
--- z3c.jbot/trunk/z3c/jbot/__init__.py	2009-10-22 21:48:28 UTC (rev 105228)
+++ z3c.jbot/trunk/z3c/jbot/__init__.py	2009-10-23 08:10:47 UTC (rev 105229)
@@ -37,7 +37,7 @@
             break
 
     if view is not None and IAcquirer is not None:
-        if IAcquirer.providedBy(inst):
+        if IAcquirer.providedBy(inst) and IAcquirer.providedBy(view):
             return inst.__of__(view)
 
     return inst