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

[Lorenzo Gil]

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

Changed:
  U   zope.app.schemacontent/trunk/src/zope/app/schemacontent/browser/__init__.py
  U   zope.app.schemacontent/trunk/src/zope/app/schemacontent/tests/test_content.py

-=-
Modified: zope.app.schemacontent/trunk/src/zope/app/schemacontent/browser/__init__.py
===================================================================
--- zope.app.schemacontent/trunk/src/zope/app/schemacontent/browser/__init__.py	2008-04-26 06:34:00 UTC (rev 85737)
+++ zope.app.schemacontent/trunk/src/zope/app/schemacontent/browser/__init__.py	2008-04-26 06:34:50 UTC (rev 85738)
@@ -17,7 +17,6 @@
 """
 import copy
 from zope.app.i18n import ZopeMessageFactory as _
-from zope.app import zapi
 from zope.app.form.browser.add import AddView
 from zope.app.form.browser.editview import EditView
 from zope.app.form.browser.submit import Update
@@ -26,6 +25,7 @@
 from zope.app.schemacontent.interfaces import IContentComponentDefinition
 from zope.app.schemacontent.content import ContentComponentInstance
 from zope.component.interfaces import ComponentLookupError
+from zope.component import getUtility, getUtilitiesFor
 from zope.interface import implements
 from zope.publisher.interfaces import IPublishTraverse
 from zope.schema import getFieldsInOrder, Choice
@@ -101,8 +101,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 = getUtility(IPermission, get_perm_id)
+                set_perm = getUtility(IPermission, set_perm_id)
 
                 # set the permission back to the instance
                 perms[name] = (get_perm, set_perm)
@@ -143,7 +143,7 @@
             self.context.contentName = content_name
 
         matching = [util
-                    for name, util in zapi.getUtilitiesFor(
+                    for name, util in getUtilitiesFor(
                                                   IContentComponentDefinition)
                     if name == type_name]
 

Modified: zope.app.schemacontent/trunk/src/zope/app/schemacontent/tests/test_content.py
===================================================================
--- zope.app.schemacontent/trunk/src/zope/app/schemacontent/tests/test_content.py	2008-04-26 06:34:00 UTC (rev 85737)
+++ zope.app.schemacontent/trunk/src/zope/app/schemacontent/tests/test_content.py	2008-04-26 06:34:50 UTC (rev 85738)
@@ -24,7 +24,6 @@
 from zope.schema import Int, TextLine, Text
 from zope.annotation.interfaces import IAttributeAnnotatable
 
-from zope.app import zapi
 from zope.app.container.interfaces import IAdding
 from zope.app.schemacontent.content import ContentComponentDefinition
 from zope.app.schemacontent.content import ContentComponentInstance