[silva.fanstatic][Emiliano D'Alterio] Reverted to more safe use ...

[email protected] Tue, 22 Oct 2013 17:37:27 +0200
Newsgroups gmane.comp.web.zope.silva.cvs
Message-ID <[email protected]>
author:    Emiliano D'Alterio
date:      Tue Oct 22 17:37:19 2013 +0200
revision:  40:ab84a5500374 in silva.fanstatic
branch:    
details:   https://hg.infrae.com/silva.fanstatic?cmd=changeset;node=ab84a5500374
modified:  src/silva/fanstatic/support.py
added:     
removed:   
log:       Reverted to more safe use of content provider "Resources" instead of
	using event.


diffstat:

 src/silva/fanstatic/support.py |  12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diffs (38 lines):

diff -r 142dcd1dbd79 -r ab84a5500374 src/silva/fanstatic/support.py
--- a/src/silva/fanstatic/support.py	Tue Oct 22 15:23:32 2013 +0200
+++ b/src/silva/fanstatic/support.py	Tue Oct 22 17:37:19 2013 +0200
@@ -8,15 +8,12 @@
 from zope.interface import Interface, implements
 from zope.traversing.browser.interfaces import IAbsoluteURL
 from zope.traversing.interfaces import ITraversable
-from zope.publisher.interfaces.browser import IBrowserView
 import fanstatic
 
 from silva.fanstatic.interfaces import ISubscribedResource
 from silva.fanstatic.interfaces import IZopeResource
 from silva.core.views.interfaces import IVirtualSite
 
-from infrae.wsgi.interfaces import IPublicationAfterRender
-
 from ZPublisher.interfaces import IPubFailure, IPubSuccess
 
 _marker = object()
@@ -70,16 +67,11 @@
         pass
 
     def render(self):
+        grok.queryMultiSubscriptions(
+            (self.request, self.context), ISubscribedResource)
         return u''
 
 
[email protected](IPublicationAfterRender)
-def inject_resources(event):
-    if IBrowserView.providedBy(event.content):
-        grok.queryMultiSubscriptions(
-            (event.request, event.content), ISubscribedResource)
-
-
 @grok.subscribe(IPubSuccess)
 @grok.subscribe(IPubFailure)
 def set_base_url(event):