[Checkins] SVN: zope.viewlet/trunk/ Depend on zope.browserpage in favor of zope.app.pagetemplate.

[Hanno Schlichting]

Log message for revision 106905:
  Depend on zope.browserpage in favor of zope.app.pagetemplate.
  

Changed:
  U   zope.viewlet/trunk/CHANGES.txt
  U   zope.viewlet/trunk/setup.py
  U   zope.viewlet/trunk/src/zope/viewlet/README.txt
  U   zope.viewlet/trunk/src/zope/viewlet/manager.py
  U   zope.viewlet/trunk/src/zope/viewlet/tests.py
  U   zope.viewlet/trunk/src/zope/viewlet/viewlet.py

-=-
Modified: zope.viewlet/trunk/CHANGES.txt
===================================================================
--- zope.viewlet/trunk/CHANGES.txt	2009-12-22 18:57:11 UTC (rev 106904)
+++ zope.viewlet/trunk/CHANGES.txt	2009-12-22 18:59:52 UTC (rev 106905)
@@ -2,9 +2,10 @@
 CHANGES
 =======
 
-3.6.2 (unreleased)
+3.7.0 (unreleased)
 ------------------
 
+- Depend on zope.browserpage in favor of zope.app.pagetemplate.
 
 3.6.1 (2009-08-29)
 ------------------

Modified: zope.viewlet/trunk/setup.py
===================================================================
--- zope.viewlet/trunk/setup.py	2009-12-22 18:57:11 UTC (rev 106904)
+++ zope.viewlet/trunk/setup.py	2009-12-22 18:59:52 UTC (rev 106905)
@@ -27,7 +27,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.viewlet',
-      version = '3.6.2dev',
+      version = '3.7.0dev',
       author='Zope Corporation and Contributors',
       author_email='zope-dev at zope.org',
       description='Zope Viewlets',
@@ -43,7 +43,7 @@
           + '\n\n' +
           read('CHANGES.txt')
           ),
-      keywords = "zope3 web html ui viewlet pattern",
+      keywords = "zope web html ui viewlet pattern",
       classifiers = [
           'Development Status :: 5 - Production/Stable',
           'Environment :: Web Environment',
@@ -60,10 +60,13 @@
       package_dir = {'': 'src'},
       namespace_packages=['zope'],
       extras_require = dict(
-          test=['zope.testing',]),
+          test=[
+            'zope.testing',
+            'zope.size',
+            ]),
       install_requires=[
           'setuptools',
-          'zope.app.pagetemplate',
+          'zope.browserpage>=3.10.1',
           'zope.component',
           'zope.configuration',
           'zope.contentprovider',

Modified: zope.viewlet/trunk/src/zope/viewlet/README.txt
===================================================================
--- zope.viewlet/trunk/src/zope/viewlet/README.txt	2009-12-22 18:57:11 UTC (rev 106904)
+++ zope.viewlet/trunk/src/zope/viewlet/README.txt	2009-12-22 18:59:52 UTC (rev 106905)
@@ -751,7 +751,7 @@
   ... </html>
   ... ''')
 
-  >>> from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
+  >>> from zope.browserpage.simpleviewclass import SimpleViewClass
   >>> Contents = SimpleViewClass(contentsTemplate, name='contents.html')
 
 
@@ -803,8 +803,7 @@
 From the two pieces above, we can generate the final viewlet manager class and
 register it (it's a bit tedious, I know):
 
-  >>> from zope.app.pagetemplate.viewpagetemplatefile import \
-  ...     ViewPageTemplateFile
+  >>> from zope.browserpage import ViewPageTemplateFile
   >>> ContentsViewletManager = type(
   ...     'ContentsViewletManager', (ContentsViewletManager,),
   ...     {'index': ViewPageTemplateFile(tableTemplate)})

Modified: zope.viewlet/trunk/src/zope/viewlet/manager.py
===================================================================
--- zope.viewlet/trunk/src/zope/viewlet/manager.py	2009-12-22 18:57:11 UTC (rev 106904)
+++ zope.viewlet/trunk/src/zope/viewlet/manager.py	2009-12-22 18:59:52 UTC (rev 106905)
@@ -21,7 +21,7 @@
 import zope.interface
 import zope.security
 import zope.event
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from zope.browserpage import ViewPageTemplateFile
 
 from zope.viewlet import interfaces
 from zope.location.interfaces import ILocation

Modified: zope.viewlet/trunk/src/zope/viewlet/tests.py
===================================================================
--- zope.viewlet/trunk/src/zope/viewlet/tests.py	2009-12-22 18:57:11 UTC (rev 106904)
+++ zope.viewlet/trunk/src/zope/viewlet/tests.py	2009-12-22 18:59:52 UTC (rev 106905)
@@ -37,7 +37,7 @@
     zope.component.provideAdapter(
         resource, (None, None), ITraversable, name = "resource")
 
-    from zope.app.pagetemplate import metaconfigure
+    from zope.browserpage import metaconfigure
     from zope.contentprovider import tales
     metaconfigure.registerType('provider', tales.TALESProviderExpression)
 

Modified: zope.viewlet/trunk/src/zope/viewlet/viewlet.py
===================================================================
--- zope.viewlet/trunk/src/zope/viewlet/viewlet.py	2009-12-22 18:57:11 UTC (rev 106904)
+++ zope.viewlet/trunk/src/zope/viewlet/viewlet.py	2009-12-22 18:59:52 UTC (rev 106905)
@@ -24,8 +24,8 @@
 from zope.publisher.browser import BrowserView
 from zope.viewlet import interfaces
 
-from zope.app.pagetemplate import simpleviewclass
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from zope.browserpage import simpleviewclass
+from zope.browserpage import ViewPageTemplateFile
 
 class ViewletBase(BrowserView):
     """Viewlet adapter class used in meta directive as a mixin class."""