[Checkins] SVN: zope.app.preference/trunk/ Use zope.container instead of zope.app.container.

[Sylvain Viollon]

Log message for revision 95496:
  Use zope.container instead of zope.app.container.
  
  

Changed:
  U   zope.app.preference/trunk/CHANGES.txt
  U   zope.app.preference/trunk/setup.py
  U   zope.app.preference/trunk/src/zope/app/preference/browser.py
  U   zope.app.preference/trunk/src/zope/app/preference/interfaces.py
  U   zope.app.preference/trunk/src/zope/app/preference/preference.py

-=-
Modified: zope.app.preference/trunk/CHANGES.txt
===================================================================
--- zope.app.preference/trunk/CHANGES.txt	2009-01-29 18:48:27 UTC (rev 95495)
+++ zope.app.preference/trunk/CHANGES.txt	2009-01-29 18:48:33 UTC (rev 95496)
@@ -2,19 +2,19 @@
 CHANGES
 =======
 
-3.5.1 (unreleased)
+3.6.0 (unreleased)
 ------------------
 
-- ...
+- Use ``zope.container`` instead of ``zope.app.container``.
 
 3.5.0 (2009-01-17)
 ------------------
 
-- Get rid of zope.app.zapi dependency, replacing its
-  uses with direct imports from original places.
+- Get rid of ``zope.app.zapi`` dependency, replacing its uses with direct
+  imports from original places.
 
-- Change mailing address from zope3-dev to zope-dev, as
-  the first one is retired now.
+- Change mailing address from zope3-dev to zope-dev, as the first one
+  is retired now.
 
 - Fix tests for python 2.6.
 

Modified: zope.app.preference/trunk/setup.py
===================================================================
--- zope.app.preference/trunk/setup.py	2009-01-29 18:48:27 UTC (rev 95495)
+++ zope.app.preference/trunk/setup.py	2009-01-29 18:48:33 UTC (rev 95496)
@@ -22,7 +22,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name = 'zope.app.preference',
-      version = '3.5.1dev',
+      version = '3.6.0dev',
       author='Zope Corporation and Contributors',
       author_email='zope-dev at zope.org',
       description='User Preferences Framework',
@@ -59,13 +59,13 @@
                           'zope.annotation',
                           'zope.app.basicskin',
                           'zope.app.component',
-                          'zope.app.container',
                           'zope.app.form',
                           'zope.app.pagetemplate',
                           'zope.app.renderer',
                           'zope.app.tree',
                           'zope.component',
                           'zope.configuration',
+                          'zope.container',
                           'zope.i18n',
                           'zope.i18nmessageid',
                           'zope.interface',

Modified: zope.app.preference/trunk/src/zope/app/preference/browser.py
===================================================================
--- zope.app.preference/trunk/src/zope/app/preference/browser.py	2009-01-29 18:48:27 UTC (rev 95495)
+++ zope.app.preference/trunk/src/zope/app/preference/browser.py	2009-01-29 18:48:33 UTC (rev 95496)
@@ -21,13 +21,13 @@
 import zope.component
 import zope.interface
 import zope.schema
-from zope.security.proxy import removeSecurityProxy
+from zope.container.interfaces import IObjectFindFilter
 from zope.i18n import translate
 from zope.i18nmessageid import Message
+from zope.security.proxy import removeSecurityProxy
 from zope.traversing.api import getParent, getRoot
 
 from zope.app.basicskin.standardmacros import StandardMacros
-from zope.app.container.interfaces import IObjectFindFilter
 from zope.app.form.browser.editview import EditView
 from zope.app.pagetemplate.simpleviewclass import simple
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile

Modified: zope.app.preference/trunk/src/zope/app/preference/interfaces.py
===================================================================
--- zope.app.preference/trunk/src/zope/app/preference/interfaces.py	2009-01-29 18:48:27 UTC (rev 95495)
+++ zope.app.preference/trunk/src/zope/app/preference/interfaces.py	2009-01-29 18:48:33 UTC (rev 95496)
@@ -22,8 +22,6 @@
 from zope.configuration.fields import MessageID
 from zope.location.interfaces import ILocation
 
-from zope.app.container.interfaces import IReadContainer
-
 class IPreferenceGroup(ILocation):
     """A group of preferences.
 

Modified: zope.app.preference/trunk/src/zope/app/preference/preference.py
===================================================================
--- zope.app.preference/trunk/src/zope/app/preference/preference.py	2009-01-29 18:48:27 UTC (rev 95495)
+++ zope.app.preference/trunk/src/zope/app/preference/preference.py	2009-01-29 18:48:33 UTC (rev 95496)
@@ -28,8 +28,8 @@
 from zope.annotation.interfaces import IAnnotations
 
 import zope.app.component.hooks
-from zope.app.container.contained import Contained
-from zope.app.container.interfaces import IReadContainer
+from zope.container.contained import Contained
+from zope.container.interfaces import IReadContainer
 
 from zope.app.preference.interfaces import IPreferenceGroup
 from zope.app.preference.interfaces import IPreferenceCategory
@@ -103,7 +103,7 @@
                    id[cutoff:].find('.') == -1]
 
     def __getitem__(self, key):
-        """See zope.app.container.interfaces.IReadContainer"""
+        """See zope.container.interfaces.IReadContainer"""
         default = object()
         obj = self.get(key, default)
         if obj is default:
@@ -111,23 +111,23 @@
         return obj
 
     def __contains__(self, key):
-        """See zope.app.container.interfaces.IReadContainer"""
+        """See zope.container.interfaces.IReadContainer"""
         return self.get(key) is not None
 
     def keys(self):
-        """See zope.app.container.interfaces.IReadContainer"""
+        """See zope.container.interfaces.IReadContainer"""
         return [id for id, group in self.items()]
 
     def __iter__(self):
-        """See zope.app.container.interfaces.IReadContainer"""
+        """See zope.container.interfaces.IReadContainer"""
         return self.values().__iter__()
-        
+
     def values(self):
-        """See zope.app.container.interfaces.IReadContainer"""
+        """See zope.container.interfaces.IReadContainer"""
         return [group for id, group in self.items()]
 
     def __len__(self):
-        """See zope.app.container.interfaces.IReadContainer"""
+        """See zope.container.interfaces.IReadContainer"""
         return len(self.items())
 
     def __getattr__(self, key):