[Checkins] SVN: zc.form/trunk/ Got rid of dependencies on zope.app.zcmlfiles and zope.app.basicskin

Michael Howitz mh at gocept.com
Fri Sep 23 02:48:22 EST 2011


Log message for revision 122899:
  Got rid of dependencies on zope.app.zcmlfiles and zope.app.basicskin

Changed:
  U   zc.form/trunk/CHANGES.txt
  U   zc.form/trunk/setup.py
  A   zc.form/trunk/src/zc/form/browser/dummy_macros.pt
  U   zc.form/trunk/src/zc/form/browser/ftesting.zcml
  A   zc.form/trunk/src/zc/form/browser/testing.py

-=-
Modified: zc.form/trunk/CHANGES.txt
===================================================================
--- zc.form/trunk/CHANGES.txt	2011-09-22 19:07:39 UTC (rev 122898)
+++ zc.form/trunk/CHANGES.txt	2011-09-23 07:48:21 UTC (rev 122899)
@@ -5,13 +5,14 @@
 0.2 (unreleased)
 ----------------
 
-- Got rid of ``zope.app.zapi`` dependency.
-
 - Got rid of ``zope.app.form`` dependency by requiring at least
   ``zope.formlib`` 4.0.
 
 - Depending on ``zope.catalog`` instead of ``zope.app.catalog``.
 
+- Got rid of ``zope.app.zapi``, ``zope.app.basicskin``,
+  ``zope.app.zcmlfiles`` dependencies
+
 - Fixed tests to run with ``zope.schema`` >= 3.6.
 
 - Using Python's ``doctest`` module instead of depreacted

Modified: zc.form/trunk/setup.py
===================================================================
--- zc.form/trunk/setup.py	2011-09-22 19:07:39 UTC (rev 122898)
+++ zc.form/trunk/setup.py	2011-09-23 07:48:21 UTC (rev 122899)
@@ -51,7 +51,6 @@
         'zope.testing',
         'zope.traversing',
         'zope.app.component',
-        'zope.app.zcmlfiles', # sigh
         ],
     zip_safe=False
     )

Added: zc.form/trunk/src/zc/form/browser/dummy_macros.pt
===================================================================
--- zc.form/trunk/src/zc/form/browser/dummy_macros.pt	                        (rev 0)
+++ zc.form/trunk/src/zc/form/browser/dummy_macros.pt	2011-09-23 07:48:21 UTC (rev 122899)
@@ -0,0 +1,3 @@
+<html metal:define-macro="page">
+  <div metal:define-slot="body" />
+</html>


Property changes on: zc.form/trunk/src/zc/form/browser/dummy_macros.pt
___________________________________________________________________
Added: svn:keywords
   + Id Rev Date
Added: svn:eol-style
   + native

Modified: zc.form/trunk/src/zc/form/browser/ftesting.zcml
===================================================================
--- zc.form/trunk/src/zc/form/browser/ftesting.zcml	2011-09-22 19:07:39 UTC (rev 122898)
+++ zc.form/trunk/src/zc/form/browser/ftesting.zcml	2011-09-23 07:48:21 UTC (rev 122899)
@@ -24,12 +24,17 @@
   <include package="zope.app.appsetup" />
   <include package="zope.formlib" />
   <include package="zope.traversing" />
-  <include package="zope.app.basicskin" />
-  <include package="zope.app.zcmlfiles" file="menus.zcml" />
   <include package="zc.resourcelibrary" />
   <include package="zope.annotation" />
   <include package="zope.app.principalannotation" />
   <include package="zc.form" />
   <includeOverrides package="zc.form.browser" file="overrides.zcml" />
 
+  <browser:page
+      name="standard_macros"
+      for="*"
+      class="zc.form.browser.testing.DummyMacros"
+      allowed_interface="zope.interface.common.mapping.IItemMapping"
+      permission="zope.Public" />
+
 </configure>

Added: zc.form/trunk/src/zc/form/browser/testing.py
===================================================================
--- zc.form/trunk/src/zc/form/browser/testing.py	                        (rev 0)
+++ zc.form/trunk/src/zc/form/browser/testing.py	2011-09-23 07:48:21 UTC (rev 122899)
@@ -0,0 +1,22 @@
+##############################################################################
+#
+# Copyright (c) 2011 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+import zope.pagetemplate.pagetemplatefile
+
+
+class DummyMacros(object):
+    """Dummy standard macros to make zope.formlib pagetemplates happy."""
+
+    def __getitem__(self, key):
+        return zope.pagetemplate.pagetemplatefile.PageTemplateFile(
+            'dummy_macros.pt').macros['page']


Property changes on: zc.form/trunk/src/zc/form/browser/testing.py
___________________________________________________________________
Added: svn:keywords
   + Id Rev Date
Added: svn:eol-style
   + native



More information about the checkins mailing list