[Checkins] SVN: zope.contentprovider/trunk/ Instead of conditionally looking for zope.app.pagetemplate we can now

[Martijn Faassen]

Log message for revision 111491:
  Instead of conditionally looking for zope.app.pagetemplate we can now
  look for zope.browserpage, which defines this directive now.
  

Changed:
  U   zope.contentprovider/trunk/CHANGES.txt
  U   zope.contentprovider/trunk/setup.py
  U   zope.contentprovider/trunk/src/zope/contentprovider/configure.zcml

-=-
Modified: zope.contentprovider/trunk/CHANGES.txt
===================================================================
--- zope.contentprovider/trunk/CHANGES.txt	2010-04-27 16:30:57 UTC (rev 111490)
+++ zope.contentprovider/trunk/CHANGES.txt	2010-04-27 16:47:26 UTC (rev 111491)
@@ -5,6 +5,9 @@
 3.6.2 (unreleased)
 ------------------
 
+- Since tales:expressiontype is now in ``zope.browserpage``, update
+  conditional ZCML accordingly so it doesn't depend on the presence of
+  ``zope.app.pagetemplate`` anymore.
 
 3.6.1 (2009-12-23)
 ------------------

Modified: zope.contentprovider/trunk/setup.py
===================================================================
--- zope.contentprovider/trunk/setup.py	2010-04-27 16:30:57 UTC (rev 111490)
+++ zope.contentprovider/trunk/setup.py	2010-04-27 16:47:26 UTC (rev 111491)
@@ -53,7 +53,7 @@
       package_dir = {'': 'src'},
       namespace_packages=['zope'],
       extras_require = dict(
-          test=['zope.browserpage>=3.10.1',
+          test=['zope.browserpage>=3.12',
                 'zope.testing',
                 ]),
       install_requires=['setuptools',

Modified: zope.contentprovider/trunk/src/zope/contentprovider/configure.zcml
===================================================================
--- zope.contentprovider/trunk/src/zope/contentprovider/configure.zcml	2010-04-27 16:30:57 UTC (rev 111490)
+++ zope.contentprovider/trunk/src/zope/contentprovider/configure.zcml	2010-04-27 16:47:26 UTC (rev 111491)
@@ -7,7 +7,7 @@
 
   <interface interface=".interfaces.ITALESProviderExpression" />
 
-  <configure zcml:condition="installed zope.app.pagetemplate">
+  <configure zcml:condition="installed zope.browserpage">
 
     <tales:expressiontype
         name="provider"