[Checkins] SVN: zope.app.tree/trunk/ Converted to use zope.container.

Martijn Faassen faassen at infrae.com
Thu Jan 29 13:01:14 EST 2009


Log message for revision 95459:
  Converted to use zope.container.
  

Changed:
  U   zope.app.tree/trunk/CHANGES.txt
  U   zope.app.tree/trunk/buildout.cfg
  U   zope.app.tree/trunk/setup.py
  U   zope.app.tree/trunk/src/zope/app/tree/adapters.py
  U   zope.app.tree/trunk/src/zope/app/tree/browser/cookie.py
  U   zope.app.tree/trunk/src/zope/app/tree/configure.zcml
  U   zope.app.tree/trunk/src/zope/app/tree/filters.py
  U   zope.app.tree/trunk/src/zope/app/tree/tests/test_adapters.py
  U   zope.app.tree/trunk/src/zope/app/tree/tests/test_node.py

-=-
Modified: zope.app.tree/trunk/CHANGES.txt
===================================================================
--- zope.app.tree/trunk/CHANGES.txt	2009-01-29 18:00:17 UTC (rev 95458)
+++ zope.app.tree/trunk/CHANGES.txt	2009-01-29 18:01:14 UTC (rev 95459)
@@ -5,7 +5,7 @@
 3.5.2 (unreleased)
 ------------------
 
-- ...
+- Converted from using zope.app.container to zope.container.
 
 3.5.1 (2009-01-29)
 ------------------

Modified: zope.app.tree/trunk/buildout.cfg
===================================================================
--- zope.app.tree/trunk/buildout.cfg	2009-01-29 18:00:17 UTC (rev 95458)
+++ zope.app.tree/trunk/buildout.cfg	2009-01-29 18:01:14 UTC (rev 95459)
@@ -1,5 +1,5 @@
 [buildout]
-develop = .
+develop = . ../zope.container ../zope.app.container
 parts = test
 
 [test]

Modified: zope.app.tree/trunk/setup.py
===================================================================
--- zope.app.tree/trunk/setup.py	2009-01-29 18:00:17 UTC (rev 95458)
+++ zope.app.tree/trunk/setup.py	2009-01-29 18:01:14 UTC (rev 95459)
@@ -56,7 +56,7 @@
                       'skin': ['zope.app.rotterdam']
                       },
       install_requires = ['setuptools',
-                          'zope.app.container',
+                          'zope.container',
                           'zope.component',
                           'zope.interface',
                           'zope.location',

Modified: zope.app.tree/trunk/src/zope/app/tree/adapters.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/adapters.py	2009-01-29 18:00:17 UTC (rev 95458)
+++ zope.app.tree/trunk/src/zope/app/tree/adapters.py	2009-01-29 18:01:14 UTC (rev 95459)
@@ -28,7 +28,7 @@
 from zope.location.interfaces import ILocation, ISite
 from zope.traversing.api import getParents
 
-from zope.app.container.interfaces import IReadContainer
+from zope.container.interfaces import IReadContainer
 
 from zope.app.tree.interfaces import IUniqueId, IChildObjects
 

Modified: zope.app.tree/trunk/src/zope/app/tree/browser/cookie.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/browser/cookie.py	2009-01-29 18:00:17 UTC (rev 95458)
+++ zope.app.tree/trunk/src/zope/app/tree/browser/cookie.py	2009-01-29 18:01:14 UTC (rev 95459)
@@ -20,7 +20,7 @@
 from zope.component.interfaces import IComponentLookup
 from zope.location.interfaces import ISite
 
-from zope.app.container.interfaces import IContainer
+from zope.container.interfaces import IContainer
 
 from zope.app.tree.filters import OnlyInterfacesFilter
 from zope.app.tree.browser import StatefulTreeView

Modified: zope.app.tree/trunk/src/zope/app/tree/configure.zcml
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/configure.zcml	2009-01-29 18:00:17 UTC (rev 95458)
+++ zope.app.tree/trunk/src/zope/app/tree/configure.zcml	2009-01-29 18:01:14 UTC (rev 95459)
@@ -26,7 +26,7 @@
       factory=".adapters.StubChildObjects"
       />
 
-  <!-- adapters for zope.app.container machinery -->
+  <!-- adapters for zope.container machinery -->
 
   <adapter
       provides=".interfaces.IUniqueId"

Modified: zope.app.tree/trunk/src/zope/app/tree/filters.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/filters.py	2009-01-29 18:00:17 UTC (rev 95458)
+++ zope.app.tree/trunk/src/zope/app/tree/filters.py	2009-01-29 18:01:14 UTC (rev 95459)
@@ -25,7 +25,7 @@
 $Id$
 """
 from zope.interface import implements
-from zope.app.container.interfaces import IObjectFindFilter
+from zope.container.interfaces import IObjectFindFilter
 
 class OnlyInterfacesFilter(object):
     """Only match objects that implement one of the given interfaces.

Modified: zope.app.tree/trunk/src/zope/app/tree/tests/test_adapters.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/tests/test_adapters.py	2009-01-29 18:00:17 UTC (rev 95458)
+++ zope.app.tree/trunk/src/zope/app/tree/tests/test_adapters.py	2009-01-29 18:01:14 UTC (rev 95459)
@@ -25,9 +25,9 @@
 from zope.location.interfaces import ILocation, ISite
 import zope.traversing.testing
 
-from zope.app.container.interfaces import IReadContainer
-from zope.app.container.sample import SampleContainer
-from zope.app.container.contained import setitem
+from zope.container.interfaces import IReadContainer
+from zope.container.sample import SampleContainer
+from zope.container.contained import setitem
 from zope.app.testing.placelesssetup import PlacelessSetup
 from zope.app.testing import ztapi
 

Modified: zope.app.tree/trunk/src/zope/app/tree/tests/test_node.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/tests/test_node.py	2009-01-29 18:00:17 UTC (rev 95458)
+++ zope.app.tree/trunk/src/zope/app/tree/tests/test_node.py	2009-01-29 18:01:14 UTC (rev 95459)
@@ -18,7 +18,7 @@
 import unittest
 from basetest import BaseTestCase
 from zope.interface import implements
-from zope.app.container.interfaces import IObjectFindFilter
+from zope.container.interfaces import IObjectFindFilter
 from zope.app.tree.node import Node
 
 class FilterByObject(object):



More information about the Checkins mailing list