[Checkins] SVN: grok/branches/sylvain-testlayers/s zope.app.publisher is now gone as a dependency.

[Martijn Faassen]

Log message for revision 111488:
  zope.app.publisher is now gone as a dependency.
  

Changed:
  U   grok/branches/sylvain-testlayers/setup.py
  U   grok/branches/sylvain-testlayers/src/grok/meta.py

-=-
Modified: grok/branches/sylvain-testlayers/setup.py
===================================================================
--- grok/branches/sylvain-testlayers/setup.py	2010-04-27 15:25:26 UTC (rev 111487)
+++ grok/branches/sylvain-testlayers/setup.py	2010-04-27 16:16:25 UTC (rev 111488)
@@ -63,10 +63,10 @@
         'zope.app.http',
         'zope.app.pagetemplate',
         'zope.app.publication',
-        'zope.app.publisher',
         'zope.browserpage',
         'zope.catalog',
         'zope.component',
+        'zope.componentvocabulary',
         'zope.container',
         'zope.contentprovider',
         'zope.copypastemove',

Modified: grok/branches/sylvain-testlayers/src/grok/meta.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/meta.py	2010-04-27 15:25:26 UTC (rev 111487)
+++ grok/branches/sylvain-testlayers/src/grok/meta.py	2010-04-27 16:16:25 UTC (rev 111488)
@@ -32,14 +32,13 @@
 from zope.securitypolicy.interfaces import IRole
 from zope.securitypolicy.rolepermission import rolePermissionManager
 
-from zope.app.publisher.xmlrpc import MethodPublisher
-
 from zope.intid import IntIds
 from zope.intid.interfaces import IIntIds
 from zope.catalog.catalog import Catalog
 from zope.catalog.interfaces import ICatalog
-
+from zope.location import Location
 from zope.exceptions.interfaces import DuplicationError
+from zope.publisher.xmlrpc import XMLRPCView
 
 import martian
 from martian.error import GrokError
@@ -54,7 +53,17 @@
 
 from grokcore.view.meta.views import default_fallback_to_name
 
+class MethodPublisher(XMLRPCView, Location):
+    """Copied from zope.app.publisher.xmlrpc to get rid of that dependency.
+    """
+    def __getParent(self):
+        return hasattr(self, '_parent') and self._parent or self.context
 
+    def __setParent(self, parent):
+        self._parent = parent
+
+    __parent__ = property(__getParent, __setParent)
+
 class XMLRPCGrokker(martian.MethodGrokker):
     """Grokker for methods of a `grok.XMLRPC` subclass.