[Checkins] SVN: zc.resourcelibrary/trunk/ remove dependency on zope.app.pagetemplate

Brian Sutherland jinty at web.de
Thu Jan 5 14:09:31 UTC 2012


Log message for revision 123954:
  remove dependency on zope.app.pagetemplate
  
  It's contents was mostly moved to zope.browserpage. However, keep a conditional
  include so we can still work with older versions.
  

Changed:
  U   zc.resourcelibrary/trunk/CHANGES.txt
  U   zc.resourcelibrary/trunk/setup.py
  U   zc.resourcelibrary/trunk/src/zc/resourcelibrary/configure.zcml

-=-
Modified: zc.resourcelibrary/trunk/CHANGES.txt
===================================================================
--- zc.resourcelibrary/trunk/CHANGES.txt	2012-01-05 13:07:48 UTC (rev 123953)
+++ zc.resourcelibrary/trunk/CHANGES.txt	2012-01-05 14:09:30 UTC (rev 123954)
@@ -18,6 +18,8 @@
 - Remove unneeded test dependencies on ``zope.app.authentication`` and
   ``zope.app.securitypolicy``.
 
+- Remove dependency on ``zope.app.pagetemplate``.
+
 1.3.2 (2010-08-16)
 ------------------
 

Modified: zc.resourcelibrary/trunk/setup.py
===================================================================
--- zc.resourcelibrary/trunk/setup.py	2012-01-05 13:07:48 UTC (rev 123953)
+++ zc.resourcelibrary/trunk/setup.py	2012-01-05 14:09:30 UTC (rev 123954)
@@ -58,8 +58,8 @@
                 'zope.testing',
                 ]),
       install_requires=['setuptools',
-                        'zope.app.pagetemplate',
                         'zope.app.publication',
+                        'zope.browserpage',
                         'zope.browserresource',
                         'zope.component',
                         'zope.configuration',

Modified: zc.resourcelibrary/trunk/src/zc/resourcelibrary/configure.zcml
===================================================================
--- zc.resourcelibrary/trunk/src/zc/resourcelibrary/configure.zcml	2012-01-05 13:07:48 UTC (rev 123953)
+++ zc.resourcelibrary/trunk/src/zc/resourcelibrary/configure.zcml	2012-01-05 14:09:30 UTC (rev 123954)
@@ -1,12 +1,17 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:tales="http://namespaces.zope.org/tales"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="zc.resourcelibrary"
     >
 
   <include package="zope.component" file="meta.zcml"/>
   <include package="zope.security" file="meta.zcml"/>
-  <include package="zope.app.pagetemplate" file="meta.zcml"/>
+  <include 
+      zcml:condition="installed zope.site"
+      package="zope.app.pagetemplate"
+      file="meta.zcml"/>
+  <include package="zope.browserpage" file="meta.zcml"/>
 
   <tales:expressiontype
       name="resource_library"



More information about the checkins mailing list