[Checkins] SVN: zope.app.publisher/trunk/ Try to remove dependency on zope.app.component (still needed for

[Martijn Faassen]

Log message for revision 100152:
  Try to remove dependency on zope.app.component (still needed for
  IBasicViewInformation..), and depend on zope.browser for IAdding instead
  of zope.app.container.
  

Changed:
  U   zope.app.publisher/trunk/CHANGES.txt
  U   zope.app.publisher/trunk/setup.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/menumeta.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/vocabulary.py

-=-
Modified: zope.app.publisher/trunk/CHANGES.txt
===================================================================
--- zope.app.publisher/trunk/CHANGES.txt	2009-05-19 20:35:29 UTC (rev 100151)
+++ zope.app.publisher/trunk/CHANGES.txt	2009-05-19 20:47:49 UTC (rev 100152)
@@ -2,11 +2,14 @@
 Changes
 =======
 
-3.6.3 (unreleased)
+3.7 (unreleased)
 ==================
 
-- ...
+- Use zope.componentvocabulary instead of zope.app.component
+  (except for tests and IBasicViewInformation).
 
+- Use zope.browser for IAdding interface (instead of zope.app.container)
+
 3.6.2 (2009-03-18)
 ==================
 

Modified: zope.app.publisher/trunk/setup.py
===================================================================
--- zope.app.publisher/trunk/setup.py	2009-05-19 20:35:29 UTC (rev 100151)
+++ zope.app.publisher/trunk/setup.py	2009-05-19 20:47:49 UTC (rev 100152)
@@ -42,7 +42,6 @@
       include_package_data=True,
       install_requires=['setuptools',
                         'zope.app.component',
-                        'zope.app.container',
                         'zope.app.pagetemplate',
                         'zope.app.publication',
                         'zope.component',
@@ -59,13 +58,15 @@
                         'zope.site',
                         'zope.security',
                         'zope.traversing',
+                        'zope.componentvocabulary',
+                        'zope.browser',
                         ],
       extras_require={
           'test': ['zope.testing',
-                   'zope.app.testing',
-                   'zope.app.securitypolicy',
-                   'zope.app.zcmlfiles',
-                   'zope.site'],
+                  'zope.app.testing',
+                  'zope.app.securitypolicy',
+                  'zope.app.zcmlfiles',
+                  'zope.site'],
           },
 
       zip_safe = False,

Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/menumeta.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/menumeta.py	2009-05-19 20:35:29 UTC (rev 100151)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/menumeta.py	2009-05-19 20:47:49 UTC (rev 100152)
@@ -26,7 +26,7 @@
 from zope.component.zcml import adapter, proxify, utility
 
 from zope.app.pagetemplate.engine import Engine
-from zope.app.container.interfaces import IAdding
+from zope.browser.interfaces import IAdding
 from zope.app.publisher.browser.menu import BrowserMenu
 from zope.app.publisher.browser.menu import BrowserMenuItem, BrowserSubMenuItem
 from zope.app.publisher.interfaces.browser import IBrowserMenu

Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/vocabulary.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/vocabulary.py	2009-05-19 20:35:29 UTC (rev 100151)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/vocabulary.py	2009-05-19 20:47:49 UTC (rev 100152)
@@ -18,7 +18,7 @@
 from zope.interface import classProvides
 from zope.publisher.interfaces.browser import IBrowserSkinType
 from zope.schema.interfaces import IVocabularyFactory
-from zope.app.component.vocabulary import UtilityVocabulary
+from zope.componentvocabulary.vocabulary import UtilityVocabulary
 
 class BrowserSkinsVocabulary(UtilityVocabulary):
     classProvides(IVocabularyFactory)