[Checkins] SVN: zope.app.container/trunk/ Replaced the use of zope.app.pagetemplate and deprecated

[Gediminas Paulauskas]

Log message for revision 124138:
  Replaced the use of zope.app.pagetemplate and deprecated
  zope.app.publisher with zope.browserpage and zope.browsermenu.
  
  

Changed:
  U   zope.app.container/trunk/CHANGES.txt
  U   zope.app.container/trunk/setup.py
  U   zope.app.container/trunk/src/zope/app/container/browser/adding.py
  U   zope.app.container/trunk/src/zope/app/container/browser/contents.py
  U   zope.app.container/trunk/src/zope/app/container/browser/metaconfigure.py
  U   zope.app.container/trunk/src/zope/app/container/browser/tests/test_adding.py

-=-
Modified: zope.app.container/trunk/CHANGES.txt
===================================================================
--- zope.app.container/trunk/CHANGES.txt	2012-01-23 16:15:54 UTC (rev 124137)
+++ zope.app.container/trunk/CHANGES.txt	2012-01-23 16:24:50 UTC (rev 124138)
@@ -10,7 +10,10 @@
 
 - Removed undeclared test dependency on zope.app.folder.
 
+- Replaced the use of ``zope.app.pagetemplate`` and deprecated
+  ``zope.app.publisher`` with ``zope.browserpage`` and ``zope.browsermenu``.
 
+
 3.9.1 (2010-09-14)
 ------------------
 

Modified: zope.app.container/trunk/setup.py
===================================================================
--- zope.app.container/trunk/setup.py	2012-01-23 16:15:54 UTC (rev 124137)
+++ zope.app.container/trunk/setup.py	2012-01-23 16:24:50 UTC (rev 124138)
@@ -53,9 +53,13 @@
                                 'zope.login',
                                 'zope.password',
                                 'zope.securitypolicy',
+                                'zope.schema',
+                                'zope.site',
                                 ]),
       install_requires=['setuptools',
                         'zope.browser',
+                        'zope.browsermenu',
+                        'zope.browserpage',
                         'zope.component',
                         'zope.container',
                         'zope.copypastemove',
@@ -68,11 +72,9 @@
                         'zope.lifecycleevent',
                         'zope.location',
                         'zope.publisher >= 3.12',
-                        'zope.schema',
                         'zope.security',
                         'zope.size',
                         'zope.traversing',
-                        'zope.app.publisher',
                         ],
       include_package_data = True,
       zip_safe = False,

Modified: zope.app.container/trunk/src/zope/app/container/browser/adding.py
===================================================================
--- zope.app.container/trunk/src/zope/app/container/browser/adding.py	2012-01-23 16:15:54 UTC (rev 124137)
+++ zope.app.container/trunk/src/zope/app/container/browser/adding.py	2012-01-23 16:24:50 UTC (rev 124138)
@@ -26,8 +26,8 @@
 from zope.app.container.interfaces import IAdding
 from zope.app.container.interfaces import IContainerNamesContainer
 from zope.app.container.interfaces import INameChooser
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-from zope.app.publisher.browser.menu import getMenu
+from zope.browsermenu.menu import getMenu
+from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
 from zope.component import getMultiAdapter
 from zope.component import getUtility
 from zope.component import queryAdapter

Modified: zope.app.container/trunk/src/zope/app/container/browser/contents.py
===================================================================
--- zope.app.container/trunk/src/zope/app/container/browser/contents.py	2012-01-23 16:15:54 UTC (rev 124137)
+++ zope.app.container/trunk/src/zope/app/container/browser/contents.py	2012-01-23 16:24:50 UTC (rev 124138)
@@ -25,6 +25,7 @@
 from zope.size.interfaces import ISized
 from zope.traversing.interfaces import TraversalError
 from zope.publisher.browser import BrowserView
+from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
 from zope.dublincore.interfaces import IZopeDublinCore
 from zope.dublincore.interfaces import IDCDescriptiveProperties
 from zope.copypastemove.interfaces import IPrincipalClipboard
@@ -34,9 +35,7 @@
 from zope.lifecycleevent import ObjectModifiedEvent, Attributes
 from zope.traversing.api import getName, getPath, joinPath, traverse
 
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.app.container.i18n import ZopeMessageFactory as _
-
 from zope.app.container.browser.adding import Adding
 from zope.app.container.interfaces import IContainer, DuplicateIDError
 from zope.app.container.interfaces import IContainerNamesContainer

Modified: zope.app.container/trunk/src/zope/app/container/browser/metaconfigure.py
===================================================================
--- zope.app.container/trunk/src/zope/app/container/browser/metaconfigure.py	2012-01-23 16:15:54 UTC (rev 124137)
+++ zope.app.container/trunk/src/zope/app/container/browser/metaconfigure.py	2012-01-23 16:24:50 UTC (rev 124138)
@@ -21,8 +21,8 @@
 from zope.configuration.fields import GlobalObject, GlobalInterface
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 from zope.security.zcml import Permission
-from zope.app.publisher.browser.viewmeta import page, view
-from zope.app.publisher.browser.menumeta import menuItemDirective
+from zope.browserpage.metaconfigure import page, view
+from zope.browsermenu.metaconfigure import menuItemDirective
 from zope.app.container.browser.contents import Contents
 from zope.app.container.browser.adding import Adding
 from zope.app.container.i18n import ZopeMessageFactory as _

Modified: zope.app.container/trunk/src/zope/app/container/browser/tests/test_adding.py
===================================================================
--- zope.app.container/trunk/src/zope/app/container/browser/tests/test_adding.py	2012-01-23 16:15:54 UTC (rev 124137)
+++ zope.app.container/trunk/src/zope/app/container/browser/tests/test_adding.py	2012-01-23 16:24:50 UTC (rev 124138)
@@ -24,6 +24,9 @@
 from zope.publisher.browser import TestRequest
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.publisher.browser import BrowserView
+from zope.browsermenu.interfaces import AddMenu
+from zope.browsermenu.interfaces import IMenuItemType, IBrowserMenu
+from zope.browsermenu.menu import BrowserMenuItem, BrowserMenu
 from zope.security.interfaces import ForbiddenAttribute
 from zope.exceptions.interfaces import UserError
 from zope.traversing.api import getParent
@@ -34,9 +37,6 @@
 
 from zope.app.testing import ztapi
 from zope.app.testing.placelesssetup import PlacelessSetup, setUp, tearDown
-from zope.app.publisher.interfaces.browser import AddMenu
-from zope.app.publisher.interfaces.browser import IMenuItemType, IBrowserMenu
-from zope.app.publisher.browser.menu import BrowserMenuItem, BrowserMenu
 from zope.app.container.interfaces import IAdding
 from zope.app.container.interfaces import IObjectAddedEvent
 from zope.app.container.interfaces import IContainerNamesContainer