[Checkins] SVN: zope.webdev/trunk/ Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302. Fix whitespace

Lorenzo Gil lgs at sicem.biz
Thu May 1 03:00:37 EDT 2008


Log message for revision 85955:
  Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302. Fix whitespace

Changed:
  U   zope.webdev/trunk/browser/base.py
  U   zope.webdev/trunk/browser/content.py
  U   zope.webdev/trunk/browser/package.py
  U   zope.webdev/trunk/browser/page.py
  U   zope.webdev/trunk/browser/rdb.py
  U   zope.webdev/trunk/browser/resourcecontainer.py
  U   zope.webdev/trunk/browser/schema.py
  U   zope.webdev/trunk/browser/skin.py
  U   zope.webdev/trunk/page.py
  U   zope.webdev/trunk/resourcecontainer.py
  U   zope.webdev/trunk/resourcecontainer.txt
  U   zope.webdev/trunk/vocabulary.py

-=-
Modified: zope.webdev/trunk/browser/base.py
===================================================================
--- zope.webdev/trunk/browser/base.py	2008-05-01 06:47:44 UTC (rev 85954)
+++ zope.webdev/trunk/browser/base.py	2008-05-01 07:00:36 UTC (rev 85955)
@@ -23,8 +23,9 @@
 from zope.formlib import form
 from zope.interface.common import idatetime
 from zope.app import component
-from zope.app import zapi
 from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.traversing.api import getName
+from zope.traversing.browser.absoluteurl import absoluteURL
 
 from zope.webdev.interfaces import _
 
@@ -40,7 +41,7 @@
         object = super(UtilityAddFormBase, self).add(object)
 
         # Add registration
-        name = zapi.getName(object)
+        name = getName(object)
         package = self.context.context
         registration = component.site.UtilityRegistration(
             name, self.interface, object)
@@ -50,7 +51,7 @@
         return object
 
     def nextURL(self):
-        return zapi.absoluteURL(self.context.context, self.request)
+        return absoluteURL(self.context.context, self.request)
 
 
 def haveEditFlag(form, action):

Modified: zope.webdev/trunk/browser/content.py
===================================================================
--- zope.webdev/trunk/browser/content.py	2008-05-01 06:47:44 UTC (rev 85954)
+++ zope.webdev/trunk/browser/content.py	2008-05-01 07:00:36 UTC (rev 85955)
@@ -17,15 +17,16 @@
 """
 __docformat__ = "reStructuredText"
 
+import zope.component
 import zope.interface
 import zope.schema
 from zope.security import proxy, checker
 from zope.formlib import form
 from zope.app import apidoc
-from zope.app import zapi
 from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.app.form import utility
 from zope.app.form.interfaces import IInputWidget
+from zope.traversing.browser.absoluteurl import absoluteURL
 
 from zope.webdev import interfaces, content
 from zope.webdev.interfaces import _
@@ -131,8 +132,8 @@
             set_perm_id = setPermWidget.getInputValue()
 
             # get the right permission from the given id
-            get_perm = zapi.getUtility(IPermission, get_perm_id)
-            set_perm = zapi.getUtility(IPermission, set_perm_id)
+            get_perm = zope.component.getUtility(IPermission, get_perm_id)
+            set_perm = zope.component.getUtility(IPermission, set_perm_id)
 
             # set the permission back to the instance
             perms[name] = (get_perm, set_perm)
@@ -157,13 +158,13 @@
     title = _('Content Component Definitions')
 
     def icon(self):
-        return zapi.getAdapter(self.request, name='content.png')()
+        return zope.component.getAdapter(self.request, name='content.png')()
 
     def definitions(self):
         """Return PT-friendly info dictionaries for all definitions."""
         return [
             {'name': value.name,
              'schema': apidoc.utilities.getPythonPath(value.schema),
-             'url': zapi.absoluteURL(value, self.request)}
+             'url': absoluteURL(value, self.request)}
             for value in self.context.values()
             if interfaces.IContentComponentDefinition.providedBy(value)]

Modified: zope.webdev/trunk/browser/package.py
===================================================================
--- zope.webdev/trunk/browser/package.py	2008-05-01 06:47:44 UTC (rev 85954)
+++ zope.webdev/trunk/browser/package.py	2008-05-01 07:00:36 UTC (rev 85955)
@@ -21,7 +21,6 @@
 import zope.app.event.objectevent
 from zope import viewlet
 from zope.formlib import form
-from zope.app import zapi
 from zope.app.pagetemplate import ViewPageTemplateFile
 from zope.webdev import interfaces
 from zope.webdev.browser import pagelet, base

Modified: zope.webdev/trunk/browser/page.py
===================================================================
--- zope.webdev/trunk/browser/page.py	2008-05-01 06:47:44 UTC (rev 85954)
+++ zope.webdev/trunk/browser/page.py	2008-05-01 07:00:36 UTC (rev 85955)
@@ -19,10 +19,10 @@
 import datetime
 import pytz
 
+import zope.component
 import zope.interface
 import zope.app.component.interfaces.registration
 from zope.formlib import form
-from zope.app import zapi
 from zope.app import apidoc
 from zope.webdev import interfaces, page
 from zope.webdev.browser import base, package
@@ -60,7 +60,7 @@
     title = _("Pages")
 
     def icon(self):
-        return zapi.getAdapter(self.request, name='page.png')()
+        return zope.component.getAdapter(self.request, name='page.png')()
 
     def pages(self):
         """Return PT-friendly info dictionaries for all pages."""
@@ -70,7 +70,9 @@
                 pages.append({
                     'name': page.name,
                     'for':  apidoc.utilities.getPythonPath(page.for_),
-                    'absolute_url': zapi.getView(page, 'absolute_url', self.request)(),
+                    'absolute_url': zope.component.getView(page,
+                                                           'absolute_url',
+                                                           self.request)(),
                     })
 
         return pages

Modified: zope.webdev/trunk/browser/rdb.py
===================================================================
--- zope.webdev/trunk/browser/rdb.py	2008-05-01 06:47:44 UTC (rev 85954)
+++ zope.webdev/trunk/browser/rdb.py	2008-05-01 07:00:36 UTC (rev 85955)
@@ -17,12 +17,13 @@
 """
 __docformat__ = "reStructuredText"
 
+import zope.component
 import zope.interface
 from zope.formlib import form
 from zope.schema import Choice
 from zope.schema import TextLine
-from zope.app import zapi
 from zope.app.rdb.interfaces import IManageableZopeDatabaseAdapter
+from zope.traversing.api import getName
 
 from zope.webdev.interfaces import _
 from zope.webdev.browser import base, package
@@ -59,18 +60,18 @@
 
 
 class PackageOverview(object):
-    """A pagelet that serves as the overview of the database adapters in the 
+    """A pagelet that serves as the overview of the database adapters in the
     package overview."""
     zope.interface.implements(package.IPackageOverviewPagelet)
 
     title = _('Database adapters')
 
     def icon(self):
-        return zapi.getAdapter(self.request, name='rdb.png')()
+        return zope.component.getAdapter(self.request, name='rdb.png')()
 
     def definitions(self):
         """Return PT-friendly info dictionaries for all database adapters."""
         return [
-            {'name': zapi.getName(value), 'dsn': value.dsn}
+            {'name': getName(value), 'dsn': value.dsn}
             for value in self.context.values()
             if IManageableZopeDatabaseAdapter.providedBy(value)]

Modified: zope.webdev/trunk/browser/resourcecontainer.py
===================================================================
--- zope.webdev/trunk/browser/resourcecontainer.py	2008-05-01 06:47:44 UTC (rev 85954)
+++ zope.webdev/trunk/browser/resourcecontainer.py	2008-05-01 07:00:36 UTC (rev 85955)
@@ -19,10 +19,10 @@
 import datetime
 import pytz
 
+import zope.component
 import zope.interface
 import zope.app.component.interfaces.registration
 from zope.formlib import form
-from zope.app import zapi
 from zope.app import apidoc
 from zope.webdev import interfaces, resourcecontainer
 from zope.webdev.browser import base, package
@@ -60,7 +60,8 @@
     title = _("ResourceContainers")
 
     def icon(self):
-        return zapi.getAdapter(self.request, name='resourcecontainer.png')()
+        return zope.component.getAdapter(self.request,
+                                         name='resourcecontainer.png')()
 
     def containers(self):
         """Return PT-friendly info dictionaries for all containers."""
@@ -69,7 +70,9 @@
             if interfaces.IResourceContainer.providedBy(container):
                 containers.append({
                     'name': container.name,
-                    'absolute_url': zapi.getView(container, 'absolute_url', self.request)(),
+                    'absolute_url': zope.component.getView(container,
+                                                           'absolute_url',
+                                                           self.request)(),
                     })
 
         return containers

Modified: zope.webdev/trunk/browser/schema.py
===================================================================
--- zope.webdev/trunk/browser/schema.py	2008-05-01 06:47:44 UTC (rev 85954)
+++ zope.webdev/trunk/browser/schema.py	2008-05-01 07:00:36 UTC (rev 85955)
@@ -18,8 +18,8 @@
 __docformat__ = "reStructuredText"
 
 import zope.interface
+import zope.component
 from zope.formlib import form
-from zope.app import zapi
 
 from zope.webdev import interfaces, schema
 from zope.webdev.browser import base, package
@@ -46,7 +46,7 @@
     title = _('Schemas')
 
     def icon(self):
-        return zapi.getAdapter(self.request, name='schema.png')()
+        return zope.component.getAdapter(self.request, name='schema.png')()
 
     def schemas(self):
         """Return PT-friendly info dictionaries for all schemas."""

Modified: zope.webdev/trunk/browser/skin.py
===================================================================
--- zope.webdev/trunk/browser/skin.py	2008-05-01 06:47:44 UTC (rev 85954)
+++ zope.webdev/trunk/browser/skin.py	2008-05-01 07:00:36 UTC (rev 85955)
@@ -17,13 +17,15 @@
 """
 __docformat__ = "reStructuredText"
 
+import zope.component
 import zope.interface
 import zope.security.proxy
 from zope import viewlet
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from zope.traversing.api import getName, getParent
+from zope.traversing.browser.absoluteurl import absoluteURL
 
-from zope.app import zapi
 from zope.app.basicskin.standardmacros import StandardMacros as BaseMacros
 from zope.app.component import hooks
 from zope.app.publisher.browser import BrowserView
@@ -68,7 +70,7 @@
 
     def __init__(self, *args, **kwargs):
         super(MenuDropDown, self).__init__(*args, **kwargs)
-        self.menu = zapi.getUtility(IBrowserMenu, name=self.menu_id)
+        self.menu = zope.component.getUtility(IBrowserMenu, name=self.menu_id)
 
     @property
     def state(self):
@@ -115,7 +117,7 @@
     title = u'Help'
 
     def icon_url(self):
-        return zapi.getAdapter(self.request, name='help.png')()
+        return zope.component.getAdapter(self.request, name='help.png')()
 
     def url(self):
         return '++help++'
@@ -127,11 +129,11 @@
     title = u'Exit'
 
     def icon_url(self):
-        return zapi.getAdapter(self.request, name='exit.png')()
+        return zope.component.getAdapter(self.request, name='exit.png')()
 
     def url(self):
         site = hooks.getSite()
-        url = zapi.absoluteURL(site, self.request)
+        url = absoluteURL(site, self.request)
         # Remove the WebDev skin, since it does not work for all of Zope 3
         url = url.replace('/++skin++WebDev', '')
         return url + '/@@SelectedManagementView.html'
@@ -148,21 +150,21 @@
             if interfaces.IPackage.providedBy(obj):
                 passedPackage = True
 
-            name = zapi.name(obj)
+            name = getName(obj)
             # Special case for adding view
             if name == '+':
                 name = _('Add')
 
             # Get the info for the current object
             info = {'name': name,
-                    'url': zapi.absoluteURL(obj, self.request),
+                    'url': absoluteURL(obj, self.request),
                     'icon': None}
-            zmi_icon = zapi.queryMultiAdapter(
+            zmi_icon = zope.component.queryMultiAdapter(
                 (obj, self.request), name='zmi_icon')
             if zmi_icon:
                 info['icon'] = zmi_icon()
             result.append(info)
-            obj = zapi.getParent(obj)
+            obj = getParent(obj)
 
         result.reverse()
         return result

Modified: zope.webdev/trunk/page.py
===================================================================
--- zope.webdev/trunk/page.py	2008-05-01 06:47:44 UTC (rev 85954)
+++ zope.webdev/trunk/page.py	2008-05-01 07:00:36 UTC (rev 85955)
@@ -25,8 +25,8 @@
 import zope.app.container.contained
 import zope.app.module.manager
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from zope.traversing.api import getName, getParent
 from zope.app.publisher.interfaces.browser import IBrowserView
-from zope.app import zapi
 from zope.app import publisher
 from zope.app.presentation import zpt, registration
 from zope.webdev import interfaces
@@ -100,7 +100,7 @@
 
     @property
     def name(self):
-        return zapi.name(self.page)
+        return getName(self.page)
 
     @property
     def with(self):
@@ -136,7 +136,7 @@
         return class_(context, request)
 
 def registerPage(page):
-    package = zapi.getParent(page)
+    package = getParent(page)
     reg = PageRegistration(page)
     package.registrationManager.addRegistration(reg)
     reg.status = zope.app.component.interfaces.registration.ActiveStatus
@@ -146,8 +146,8 @@
     for reg in registered.registrations():
         reg.status = zope.app.component.interfaces.registration.InactiveStatus
         reg.status = zope.app.component.interfaces.registration.ActiveStatus
-        
 
+
 def handlePageModification(event, page):
     reregisterPage(page)
 
@@ -158,10 +158,10 @@
     Because we do magic to return the TemplateviewFactory dynamically because
     of TTW code, we have changed to comparison in the adapter by overriding.
     """
-    
+
     def registrations(self):
-        rm = zapi.getParent(self.registerable).registrationManager
+        rm = getParent(self.registerable).registrationManager
         return [reg for reg in rm.values()
                 if (IComponentRegistration.providedBy(reg) and
-                    reg.component.cls.page is self.registerable)]    
-                    
+                    reg.component.cls.page is self.registerable)]
+

Modified: zope.webdev/trunk/resourcecontainer.py
===================================================================
--- zope.webdev/trunk/resourcecontainer.py	2008-05-01 06:47:44 UTC (rev 85954)
+++ zope.webdev/trunk/resourcecontainer.py	2008-05-01 07:00:36 UTC (rev 85955)
@@ -37,7 +37,7 @@
 from zope.security.checker import NamesChecker
 from zope.interface import Interface
 import zope.app.component.interfaces.registration
-from zope.app import zapi
+from zope.traversing.api import getParent
 
 _marker = object()
 
@@ -68,13 +68,13 @@
 def registerResourceDirectory(container):
     factory = DirectoryResourceFactory(container)
     provideAdapter(factory,self.layers,Interface,name=self.name)
-    
+
 class ResourceDirectoryRegistration(
     zope.app.component.site.AdapterRegistration):
 
     provided = zope.interface.Interface
     with=()
-    
+
     def __init__(self, container):
         self.container = container
 
@@ -85,20 +85,20 @@
     @property
     def required(self):
         return self.container.layers[0]
-    
+
     @property
     def component(self):
         factory =  DirectoryResourceFactory(self.container)
         return factory
-    
 
 
+
 class DirectoryResource(Resource):
 
     implements(IBrowserPublisher)
 
     def __init__(self, container, request):
-        
+
         self.__container = container
         self.request = request
         self.__name__ = self.__container.__name__
@@ -163,7 +163,7 @@
         lmh = rfc1123_date(dt2ts(lastModified))
         response.setHeader('Content-Type', self.context.contentType)
         response.setHeader('Last-Modified', lmh)
-        
+
     def HEAD(self):
         self._setHeaders()
         return ''
@@ -172,8 +172,8 @@
         """Default document"""
         self._setHeaders()
         return self.context.data
-    
 
+
 class ResourceFactory(object):
 
     def __init__(self, name, container, path):
@@ -192,7 +192,7 @@
 
 
 def registerResourceDirectory(container):
-    package = zapi.getParent(container)
+    package = getParent(container)
     reg = ResourceDirectoryRegistration(container)
     package.registrationManager.addRegistration(reg)
     reg.status = zope.app.component.interfaces.registration.ActiveStatus
@@ -202,7 +202,7 @@
     for reg in registered.registrations():
         reg.status = zope.app.component.interfaces.registration.InactiveStatus
         reg.status = zope.app.component.interfaces.registration.ActiveStatus
-        
 
+
 def handleResourceDirectoryModification(event, container):
     reregisterResourceDirectory(container)

Modified: zope.webdev/trunk/resourcecontainer.txt
===================================================================
--- zope.webdev/trunk/resourcecontainer.txt	2008-05-01 06:47:44 UTC (rev 85954)
+++ zope.webdev/trunk/resourcecontainer.txt	2008-05-01 07:00:36 UTC (rev 85955)
@@ -8,7 +8,6 @@
   >>> from zope.webdev.resourcecontainer import ResourceContainer
   >>> from zope.webdev.interfaces import IResourceContainer
   >>> from zope.interface.verify import verifyObject
-  >>> from zope.app import zapi
   >>> rc = ResourceContainer(u'resources')
   >>> verifyObject(IResourceContainer, rc)
   True

Modified: zope.webdev/trunk/vocabulary.py
===================================================================
--- zope.webdev/trunk/vocabulary.py	2008-05-01 06:47:44 UTC (rev 85954)
+++ zope.webdev/trunk/vocabulary.py	2008-05-01 07:00:36 UTC (rev 85955)
@@ -19,20 +19,19 @@
 """
 __docformat__ = "reStructuredText"
 
+import zope.component
 
 from zope.interface import implements
 from zope.interface.interfaces import IInterface
 from zope.schema.interfaces import ITokenizedTerm
 from zope.component.interfaces import IFactory
 
-from zope.app import zapi
 from zope.app.component.vocabulary import UtilityVocabulary
 from zope.security.management import getInteraction
-from zope.app import zapi
-from zope.app.schema.vocabulary import IVocabularyFactory 
+from zope.app.schema.vocabulary import IVocabularyFactory
 from zope.schema.vocabulary import SimpleVocabulary,SimpleTerm
 
-# TODO: this vocabulary should go to zope.app.component where the IFactory 
+# TODO: this vocabulary should go to zope.app.component where the IFactory
 # is located.
 class FactoryTerm(object):
     """A term representing a factory.
@@ -172,9 +171,9 @@
         if nameOnly is not False:
             nameOnly = True
         if isinstance(interface, (str, unicode)):
-            interface = zapi.getUtility(IInterface, interface)
+            interface = zope.component.getUtility(IInterface, interface)
         self.interface = interface
-        utils = zapi.getUtilitiesFor(IFactory)
+        utils = zope.component.getUtilitiesFor(IFactory)
         factories = []
         for name, factory in utils:
             if interface in factory.getInterfaces():



More information about the Checkins mailing list