[Checkins] SVN: z3c.layer.minimal/trunk/ - Fixed dependency warning about ISite.

Michael Howitz mh at gocept.com
Thu Feb 19 12:15:41 EST 2009


Log message for revision 96770:
  - Fixed dependency warning about ISite.
  
  - Fixed tests to work with newer zope.testbrowser.
  
  - Using ``zope.container`` instead of ``zope.app.container``.
  
  - Made sure long_description renders properly on pypi.
  
  

Changed:
  U   z3c.layer.minimal/trunk/CHANGES.txt
  U   z3c.layer.minimal/trunk/setup.py
  U   z3c.layer.minimal/trunk/src/z3c/layer/minimal/README.txt
  U   z3c.layer.minimal/trunk/src/z3c/layer/minimal/tests/ftesting.zcml
  U   z3c.layer.minimal/trunk/src/z3c/layer/minimal/zope.app.publisher.browser.zcml
  U   z3c.layer.minimal/trunk/src/z3c/layer/minimal/zope.traversing.browser.zcml

-=-
Modified: z3c.layer.minimal/trunk/CHANGES.txt
===================================================================
--- z3c.layer.minimal/trunk/CHANGES.txt	2009-02-19 16:58:26 UTC (rev 96769)
+++ z3c.layer.minimal/trunk/CHANGES.txt	2009-02-19 17:15:41 UTC (rev 96770)
@@ -2,6 +2,18 @@
 CHANGES
 =======
 
+1.1.0 (unreleased)
+------------------
+
+- Fixed dependency warning about ISite.
+
+- Fixed tests to work with newer zope.testbrowser.
+
+- Using ``zope.container`` instead of ``zope.app.container``.
+
+- Made sure long_description renders properly on pypi.
+
+
 1.0.1 (2008-01-24)
 ------------------
 
@@ -12,12 +24,9 @@
 ------------------
 
 - Restructure: Move ``z3c.layer.minimal`` package to it's own top level
-  package form ``zope.layer`` to ``z3c.layer.minimal``.
+  package from ``z3c.layer`` to ``z3c.layer.minimal``.
 
-- Restructure: Moved implementation from ``z3c.layer`` to
-  ``z3c.layer.minimal``
 
-
 0.2.3 (2007-11-07)
 ------------------
 

Modified: z3c.layer.minimal/trunk/setup.py
===================================================================
--- z3c.layer.minimal/trunk/setup.py	2009-02-19 16:58:26 UTC (rev 96769)
+++ z3c.layer.minimal/trunk/setup.py	2009-02-19 17:15:41 UTC (rev 96770)
@@ -1,7 +1,7 @@
 #!python
 ##############################################################################
 #
-# Copyright (c) 2007 Zope Foundation and Contributors.
+# Copyright (c) 2007-2009 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -21,20 +21,20 @@
 from setuptools import setup, find_packages
 
 def read(*rnames):
-    text = open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-    return xml.sax.saxutils.escape(text)
+    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
+version = '1.0.2dev'
+
 setup(
     name = 'z3c.layer.minimal',
-    version = '1.0.2dev',
+    version = version,
     author='Zope Foundation and Contributors',
     author_email = "zope-dev at zope.org",
     description = "Minimal layer setup for Zope3",
     long_description=(
         read('README.txt')
         + '\n\n' +
-        'Detailed Documentation\n'
-        '**********************'
+        '.. contents::\n'
         + '\n\n' +
         read('src', 'z3c', 'layer', 'minimal', 'README.txt')
         + '\n\n' +
@@ -59,7 +59,6 @@
     namespace_packages = ['z3c', 'z3c.layer'],
     extras_require = dict(
         test = [
-            'zope.app.securitypolicy',
             'zope.app.testing',
             'zope.app.zcmlfiles',
             'zope.securitypolicy',

Modified: z3c.layer.minimal/trunk/src/z3c/layer/minimal/README.txt
===================================================================
--- z3c.layer.minimal/trunk/src/z3c/layer/minimal/README.txt	2009-02-19 16:58:26 UTC (rev 96769)
+++ z3c.layer.minimal/trunk/src/z3c/layer/minimal/README.txt	2009-02-19 17:15:41 UTC (rev 96770)
@@ -72,7 +72,7 @@
   >>> manager.open(skinURL + '/foobar.html')
   Traceback (most recent call last):
   ...
-  httperror_seek_wrapper: HTTP Error 404: Not Found
+  HTTPError: HTTP Error 404: Not Found
 
   >>> print manager.contents
   <BLANKLINE>
@@ -160,7 +160,7 @@
   >>> unauthorized.open(skinURL + '/@@forbidden.html')
   Traceback (most recent call last):
   ...
-  httperror_seek_wrapper: HTTP Error 401: Unauthorized
+  HTTPError: HTTP Error 401: Unauthorized
 
   >>> print unauthorized.contents
   <BLANKLINE>

Modified: z3c.layer.minimal/trunk/src/z3c/layer/minimal/tests/ftesting.zcml
===================================================================
--- z3c.layer.minimal/trunk/src/z3c/layer/minimal/tests/ftesting.zcml	2009-02-19 16:58:26 UTC (rev 96769)
+++ z3c.layer.minimal/trunk/src/z3c/layer/minimal/tests/ftesting.zcml	2009-02-19 17:15:41 UTC (rev 96770)
@@ -6,7 +6,7 @@
 
   <include package="zope.app.zcmlfiles" />
 
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
+  <include package="zope.securitypolicy" file="meta.zcml" />
   <include package="zope.app.authentication" />
   <securityPolicy
     component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />

Modified: z3c.layer.minimal/trunk/src/z3c/layer/minimal/zope.app.publisher.browser.zcml
===================================================================
--- z3c.layer.minimal/trunk/src/z3c/layer/minimal/zope.app.publisher.browser.zcml	2009-02-19 16:58:26 UTC (rev 96769)
+++ z3c.layer.minimal/trunk/src/z3c/layer/minimal/zope.app.publisher.browser.zcml	2009-02-19 17:15:41 UTC (rev 96770)
@@ -3,9 +3,9 @@
     xmlns:browser="http://namespaces.zope.org/browser"
     i18n_domain="z3c">
 
-  <browser:page 
+  <browser:page
       name=""
-      for="zope.app.component.interfaces.ISite"
+      for="zope.location.interfaces.ISite"
       class="zope.app.publisher.browser.resources.Resources"
       permission="zope.Public"
       allowed_interface="zope.publisher.interfaces.browser.IBrowserPublisher"

Modified: z3c.layer.minimal/trunk/src/z3c/layer/minimal/zope.traversing.browser.zcml
===================================================================
--- z3c.layer.minimal/trunk/src/z3c/layer/minimal/zope.traversing.browser.zcml	2009-02-19 16:58:26 UTC (rev 96769)
+++ z3c.layer.minimal/trunk/src/z3c/layer/minimal/zope.traversing.browser.zcml	2009-02-19 17:15:41 UTC (rev 96770)
@@ -13,19 +13,19 @@
       />
 
   <adapter
-      for="zope.app.container.interfaces.IItemContainer
+      for="zope.container.interfaces.IItemContainer
            z3c.layer.minimal.IMinimalBrowserLayer"
       provides="zope.publisher.interfaces.browser.IBrowserPublisher"
-      factory="zope.app.container.traversal.ItemTraverser"
+      factory="zope.container.traversal.ItemTraverser"
       permission="zope.Public"
       trusted="True"
       />
 
   <adapter
-      for="zope.app.container.interfaces.ISimpleReadContainer
+      for="zope.container.interfaces.ISimpleReadContainer
            z3c.layer.minimal.IMinimalBrowserLayer"
       provides="zope.publisher.interfaces.browser.IBrowserPublisher"
-      factory="zope.app.container.traversal.ItemTraverser"
+      factory="zope.container.traversal.ItemTraverser"
       permission="zope.Public"
       trusted="True"
       />
@@ -55,7 +55,7 @@
       allowed_interface="zope.traversing.browser.interfaces.IAbsoluteURL"
       type="z3c.layer.minimal.IMinimalBrowserLayer"
       />
-      
+
   <view
       for="zope.traversing.interfaces.IContainmentRoot"
       factory="zope.traversing.browser.SiteAbsoluteURL"



More information about the Checkins mailing list