[Checkins] SVN: zmi.core/trunk/src/zmi/core/component/ Backport original fix. Update import statement.

Yusei Tahara yusei at domen.cx
Sat Nov 21 01:46:29 EST 2009


Log message for revision 105931:
  Backport original fix. Update import statement.
  

Changed:
  U   zmi.core/trunk/src/zmi/core/component/__init__.py
  U   zmi.core/trunk/src/zmi/core/component/configure.zcml

-=-
Modified: zmi.core/trunk/src/zmi/core/component/__init__.py
===================================================================
--- zmi.core/trunk/src/zmi/core/component/__init__.py	2009-11-20 23:05:14 UTC (rev 105930)
+++ zmi.core/trunk/src/zmi/core/component/__init__.py	2009-11-21 06:46:28 UTC (rev 105931)
@@ -18,12 +18,12 @@
 __docformat__ = 'restructuredtext'
 
 import zope.component
+import zope.component.interfaces
 from zope.exceptions.interfaces import UserError
 from zope.security.proxy import removeSecurityProxy
 from zope.publisher.browser import BrowserView
 from zope.component.interfaces import IFactory
 from zope.component.interface import searchInterface
-from zope.location.interfaces import ISite
 
 from zope.app.component.i18n import ZopeMessageFactory as _
 from zope.app.component.site import LocalSiteManager
@@ -119,7 +119,7 @@
         ...     implements(IContainmentRoot)
         ...     def setSiteManager(self, sm):
         ...         from zope.interface import directlyProvides
-        ...         directlyProvides(self, ISite)
+        ...         directlyProvides(self, zope.component.interfaces.ISite)
 
 
         >>> folder = PossibleSite()
@@ -133,7 +133,7 @@
 
         Now verify that we have a site:
 
-        >>> ISite.providedBy(folder)
+        >>> zope.component.interfaces.ISite.providedBy(folder)
         1
 
         Note that we've also redirected the request:
@@ -152,7 +152,7 @@
         UserError: This is already a site
 
         """
-        if ISite.providedBy(self.context):
+        if zope.component.interfaces.ISite.providedBy(self.context):
             raise UserError(_(u'This is already a site'))
 
         # We don't want to store security proxies (we can't,

Modified: zmi.core/trunk/src/zmi/core/component/configure.zcml
===================================================================
--- zmi.core/trunk/src/zmi/core/component/configure.zcml	2009-11-20 23:05:14 UTC (rev 105930)
+++ zmi.core/trunk/src/zmi/core/component/configure.zcml	2009-11-21 06:46:28 UTC (rev 105931)
@@ -68,7 +68,7 @@
 <!-- Site Manager navigation action -->
 
   <browser:page
-      for="zope.location.interfaces.IPossibleSite"
+      for="zope.component.interfaces.IPossibleSite"
       name="addSiteManager.html"
       permission="zope.ManageSite"
       class=".MakeSite"
@@ -77,17 +77,17 @@
 
   <browser:menuItem
       menu="zmi_actions" title="Make a site"
-      for="zope.location.interfaces.IPossibleSite"
+      for="zope.component.interfaces.IPossibleSite"
       action="@@addSiteManager.html"
       filter="python:
-        not modules['zope.location.interfaces'].ISite.providedBy(context)"
+        not modules['zope.component.interfaces'].ISite.providedBy(context)"
       permission="zope.ManageSite"
       />
 
   <browser:menuItem
       menu="zmi_actions"
       title="Manage Site"
-      for="zope.location.interfaces.ISite"
+      for="zope.component.interfaces.ISite"
       action="++etc++site/@@SelectedManagementView.html"
       permission="zope.ManageSite"
       />



More information about the checkins mailing list