[Checkins] SVN: zc.resourcelibrary/trunk/ Get rid of zope.app.zapi

[Dan Korostelev]

Log message for revision 95099:
  Get rid of zope.app.zapi

Changed:
  U   zc.resourcelibrary/trunk/CHANGES.txt
  U   zc.resourcelibrary/trunk/setup.py
  U   zc.resourcelibrary/trunk/src/zc/resourcelibrary/zcml.py

-=-
Modified: zc.resourcelibrary/trunk/CHANGES.txt
===================================================================
--- zc.resourcelibrary/trunk/CHANGES.txt	2009-01-27 09:51:22 UTC (rev 95098)
+++ zc.resourcelibrary/trunk/CHANGES.txt	2009-01-27 09:55:20 UTC (rev 95099)
@@ -5,6 +5,9 @@
 1.0.2 (unreleased)
 ------------------
 
+- Remove zope.app.zapi from dependencies, substituting
+  its uses with direct imports.
+
 - Use zope-dev at zope.org mailing list address instead of
   zope3-dev at zope.org as the latter one is retired.
 

Modified: zc.resourcelibrary/trunk/setup.py
===================================================================
--- zc.resourcelibrary/trunk/setup.py	2009-01-27 09:51:22 UTC (rev 95098)
+++ zc.resourcelibrary/trunk/setup.py	2009-01-27 09:55:20 UTC (rev 95099)
@@ -66,7 +66,6 @@
                         'zope.app.component',
                         'zope.app.publication',
                         'zope.app.publisher',
-                        'zope.app.zapi',
                         'zope.component',
                         'zope.configuration',
                         'zope.interface',

Modified: zc.resourcelibrary/trunk/src/zc/resourcelibrary/zcml.py
===================================================================
--- zc.resourcelibrary/trunk/src/zc/resourcelibrary/zcml.py	2009-01-27 09:51:22 UTC (rev 95098)
+++ zc.resourcelibrary/trunk/src/zc/resourcelibrary/zcml.py	2009-01-27 09:55:20 UTC (rev 95099)
@@ -12,11 +12,11 @@
 #
 ##############################################################################
 from zc.resourcelibrary.resourcelibrary import LibraryInfo, library_info
-from zope.app import zapi
 from zope.app.publisher.browser import directoryresource
 from zope.app.publisher.browser.metadirectives import IBasicResourceInformation
 from zope.app.publisher.browser.resourcemeta import allowed_names
 from zope.configuration.exceptions import ConfigurationError
+from zope.component import getGlobalSiteManager
 from zope.interface import Interface
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
@@ -77,7 +77,7 @@
                 raise ConfigurationError(
                     'Resource library "%s" has unsatisfied dependency on "%s".'
                     % (name, dep))
-    zapi.getGlobalSiteManager().registerAdapter(
+    getGlobalSiteManager().registerAdapter(
         factory, required, provided, adapter_name, info)