[Checkins] SVN: z3c.menu.simple/trunk/ - Depend on `zope.browserpage` instead of `zope.app.pagetemplate` as

[Michael Howitz]

Log message for revision 114728:
  - Depend on `zope.browserpage` instead of `zope.app.pagetemplate` as
    needed code has been moved there.
  
  - No longer use deprecated `zope.testing.doc[unit]test`, use python's
    `doctest` instead.
  

Changed:
  U   z3c.menu.simple/trunk/CHANGES.txt
  U   z3c.menu.simple/trunk/setup.py
  U   z3c.menu.simple/trunk/src/z3c/menu/simple/README.txt
  U   z3c.menu.simple/trunk/src/z3c/menu/simple/menu.py
  U   z3c.menu.simple/trunk/src/z3c/menu/simple/tests.py

-=-
Modified: z3c.menu.simple/trunk/CHANGES.txt
===================================================================
--- z3c.menu.simple/trunk/CHANGES.txt	2010-07-14 06:24:48 UTC (rev 114727)
+++ z3c.menu.simple/trunk/CHANGES.txt	2010-07-14 06:53:53 UTC (rev 114728)
@@ -5,13 +5,17 @@
 0.5.3 (unreleased)
 ------------------
 
-- ...
+- Depend on `zope.browserpage` instead of `zope.app.pagetemplate` as
+  needed code has been moved there.
 
+- No longer use deprecated `zope.testing.doc[unit]test`, use python's
+  `doctest` instead.
 
+
 0.5.2 (2009-11-19)
 ------------------
 
-- Remove zope.app.zapi dependency
+- Removed zope.app.zapi dependency.
 
 
 0.5.1 (2008-01-25)
@@ -23,4 +27,4 @@
 0.5.0 (2008-01-21)
 ------------------
 
-- Initial Release
+- Initial Release.

Modified: z3c.menu.simple/trunk/setup.py
===================================================================
--- z3c.menu.simple/trunk/setup.py	2010-07-14 06:24:48 UTC (rev 114727)
+++ z3c.menu.simple/trunk/setup.py	2010-07-14 06:53:53 UTC (rev 114728)
@@ -66,7 +66,7 @@
         'setuptools',
         'z3c.i18n',
         'zope.app.component',
-        'zope.app.pagetemplate',
+        'zope.browserpage',
         'zope.schema',
         'zope.traversing',
         'zope.viewlet',

Modified: z3c.menu.simple/trunk/src/z3c/menu/simple/README.txt
===================================================================
--- z3c.menu.simple/trunk/src/z3c/menu/simple/README.txt	2010-07-14 06:24:48 UTC (rev 114727)
+++ z3c.menu.simple/trunk/src/z3c/menu/simple/README.txt	2010-07-14 06:53:53 UTC (rev 114728)
@@ -144,7 +144,7 @@
 
 Now we register a menu tab which is also a viewlet manager:
 
-  >>> from zope.app.pagetemplate import viewpagetemplatefile
+  >>> from zope.browserpage import viewpagetemplatefile
   >>> from z3c.menu.simple import ITab
   >>> from z3c.menu.simple.menu import Tab
   >>> class MyTabs(Tab):

Modified: z3c.menu.simple/trunk/src/z3c/menu/simple/menu.py
===================================================================
--- z3c.menu.simple/trunk/src/z3c/menu/simple/menu.py	2010-07-14 06:24:48 UTC (rev 114727)
+++ z3c.menu.simple/trunk/src/z3c/menu/simple/menu.py	2010-07-14 06:53:53 UTC (rev 114728)
@@ -24,7 +24,7 @@
 from zope.app.component import hooks
 from zope.app.publisher.browser import menu
 from zope.app.publisher.interfaces.browser import IBrowserMenu
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
 from zope.traversing.browser.absoluteurl import absoluteURL
 
 from z3c.i18n import MessageFactory as _
@@ -133,12 +133,12 @@
     def update(self):
         """See zope.contentprovider.interfaces.IContentProvider"""
         self.tabs = zope.component.queryMultiAdapter(
-            (self.context, self.request, self.__parent__), IContentProvider, 
+            (self.context, self.request, self.__parent__), IContentProvider,
             'ITab')
         if self.tabs is not None:
             self.tabs.update()
         self.actions = zope.component.queryMultiAdapter(
-            (self.context, self.request, self.__parent__), IContentProvider, 
+            (self.context, self.request, self.__parent__), IContentProvider,
             'IAction')
         if self.actions is not None:
             self.actions.update()

Modified: z3c.menu.simple/trunk/src/z3c/menu/simple/tests.py
===================================================================
--- z3c.menu.simple/trunk/src/z3c/menu/simple/tests.py	2010-07-14 06:24:48 UTC (rev 114727)
+++ z3c.menu.simple/trunk/src/z3c/menu/simple/tests.py	2010-07-14 06:53:53 UTC (rev 114728)
@@ -18,8 +18,7 @@
 
 import unittest
 import zope.security
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
+import doctest
 from zope.app.testing import setup, ztapi
 from zope.app.testing import functional
 
@@ -40,7 +39,7 @@
     ztapi.provideAdapter(None, ITraversable, resource, name="resource")
     ztapi.provideView(None, None, ITraversable, "resource", resource)
 
-    from zope.app.pagetemplate import metaconfigure
+    from zope.browserpage import metaconfigure
     from zope.contentprovider import tales
     metaconfigure.registerType('provider', tales.TALESProviderExpression)
 
@@ -53,12 +52,9 @@
 
 def test_suite():
     return unittest.TestSuite((
-        DocFileSuite('README.txt',
+        doctest.DocFileSuite(
+            'README.txt',
             setUp=setUp, tearDown=tearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
             ),
         ))
-
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')