[Checkins] SVN: hurry.zoperesource/branches/janjaapdriessen-wsgi/s Drop the grokcore.component requirement by doing the one remaining registration by hand.

[Jan-Jaap Driessen]

Log message for revision 118415:
  Drop the grokcore.component requirement by doing the one remaining registration by hand.

Changed:
  U   hurry.zoperesource/branches/janjaapdriessen-wsgi/setup.py
  U   hurry.zoperesource/branches/janjaapdriessen-wsgi/src/hurry/zoperesource/configure.zcml
  U   hurry.zoperesource/branches/janjaapdriessen-wsgi/src/hurry/zoperesource/zopesupport.py

-=-
Modified: hurry.zoperesource/branches/janjaapdriessen-wsgi/setup.py
===================================================================
--- hurry.zoperesource/branches/janjaapdriessen-wsgi/setup.py	2010-11-15 16:46:23 UTC (rev 118414)
+++ hurry.zoperesource/branches/janjaapdriessen-wsgi/setup.py	2010-11-15 17:01:00 UTC (rev 118415)
@@ -31,7 +31,6 @@
     zip_safe=False,
     install_requires=[
         'setuptools',
-        'grokcore.component',
         'hurry.resource[wsgi] >= 0.10',
         'z3c.autoinclude',
         'zope.browserresource',

Modified: hurry.zoperesource/branches/janjaapdriessen-wsgi/src/hurry/zoperesource/configure.zcml
===================================================================
--- hurry.zoperesource/branches/janjaapdriessen-wsgi/src/hurry/zoperesource/configure.zcml	2010-11-15 16:46:23 UTC (rev 118414)
+++ hurry.zoperesource/branches/janjaapdriessen-wsgi/src/hurry/zoperesource/configure.zcml	2010-11-15 17:01:00 UTC (rev 118415)
@@ -11,7 +11,7 @@
 
   <hzr:setupHurryZopeResource />
 
-  <grok:grok package="."/>
+  <subscriber handler=".zopesupport.set_base_url_on_needed_inclusions" />
 
   <adapter factory=".zopesupport.AbsoluteURL" />
 

Modified: hurry.zoperesource/branches/janjaapdriessen-wsgi/src/hurry/zoperesource/zopesupport.py
===================================================================
--- hurry.zoperesource/branches/janjaapdriessen-wsgi/src/hurry/zoperesource/zopesupport.py	2010-11-15 16:46:23 UTC (rev 118414)
+++ hurry.zoperesource/branches/janjaapdriessen-wsgi/src/hurry/zoperesource/zopesupport.py	2010-11-15 17:01:00 UTC (rev 118415)
@@ -1,8 +1,7 @@
 # zope integration for hurry.resource
 from zope.interface import alsoProvides
-from zope.component import adapts
+from zope.component import adapts, adapter
 import zope.security.management
-from grokcore.component import subscribe
 
 from zope.publisher.interfaces import IEndRequestEvent, IRequest
 from zope.publisher.interfaces.browser import IBrowserRequest
@@ -49,7 +48,7 @@
         # so we have to use request._orig_env.
         return request._orig_env.setdefault(NEEDED, NeededInclusions())
 
- at subscribe(IEndRequestEvent)
+ at adapter(IEndRequestEvent)
 def set_base_url_on_needed_inclusions(event):
     request = event.request
     # Unfortunately we don't have easy access to the WSGI environment,