Author: jmorliaguet
Date: Wed Apr 19 20:07:07 2006
New Revision: 2904

Modified:
   cpsskins/branches/paris-sprint-2006/browser/negotiation/README.txt
   cpsskins/branches/paris-sprint-2006/elements/display.py
   cpsskins/branches/paris-sprint-2006/elements/format.py
   cpsskins/branches/paris-sprint-2006/elements/presentation.py
   cpsskins/branches/paris-sprint-2006/standard/formats/layout.py
   cpsskins/branches/paris-sprint-2006/tests/setup.py
   cpsskins/branches/paris-sprint-2006/tests/test_relations.py
Log:

- removed deprecation warnings  + test fix



Modified: cpsskins/branches/paris-sprint-2006/browser/negotiation/README.txt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/negotiation/README.txt  
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/negotiation/README.txt  Wed Apr 
19 20:07:07 2006
@@ -85,7 +85,7 @@
 
     >>> theme = negotiation.getTheme()
     >>> theme.name
-    'Theme'
+    u'Theme'
 
     >>> manager.isDefault(theme)
     True

Modified: cpsskins/branches/paris-sprint-2006/elements/display.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/display.py     (original)
+++ cpsskins/branches/paris-sprint-2006/elements/display.py     Wed Apr 19 
20:07:07 2006
@@ -19,7 +19,7 @@
 
 from zope.app.interface import queryType
 from zope.location.pickling import locationCopy
-from zope.app.traversing.interfaces import IPathAdapter
+from zope.traversing.interfaces import IPathAdapter
 from zope.component import getUtility, queryUtility
 from zope.interface import implements
 from zope.security.proxy import removeSecurityProxy
@@ -53,7 +53,7 @@
     In page templates, the Displayable API can be accessed via the path 
adapter:
 
     >>> from zope.component import getAdapter
-    >>> from zope.app.traversing.interfaces import IPathAdapter
+    >>> from zope.traversing.interfaces import IPathAdapter
     >>> element = Element()
     >>> displayable = getAdapter(element, IPathAdapter, "displayable")
     >>> displayable is not None

Modified: cpsskins/branches/paris-sprint-2006/elements/format.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/format.py      (original)
+++ cpsskins/branches/paris-sprint-2006/elements/format.py      Wed Apr 19 
20:07:07 2006
@@ -61,7 +61,7 @@
 
     In the Formattable API can be accessed via the path adapter:
 
-    >>> from zope.app.traversing.interfaces import IPathAdapter
+    >>> from zope.traversing.interfaces import IPathAdapter
     >>> from zope.component import getAdapter
     >>> from cpsskins.elements.display import Display
     >>> display = Display()

Modified: cpsskins/branches/paris-sprint-2006/elements/presentation.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/presentation.py        
(original)
+++ cpsskins/branches/paris-sprint-2006/elements/presentation.py        Wed Apr 
19 20:07:07 2006
@@ -17,7 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.traversing.interfaces import IPathAdapter
+from zope.traversing.interfaces import IPathAdapter
 from zope.interface import implements
 from zope.component import getUtility, queryUtility
 

Modified: cpsskins/branches/paris-sprint-2006/standard/formats/layout.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/formats/layout.py      
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/formats/layout.py      Wed Apr 
19 20:07:07 2006
@@ -20,7 +20,7 @@
 from BTrees.OOBTree import OOBTree
 from persistent import Persistent
 
-from zope.app.traversing.interfaces import ITraversable
+from zope.traversing.interfaces import ITraversable
 from zope.component.factory import Factory
 from zope.interface import implements, implementedBy
 from zope.interface.common.mapping import IMapping

Modified: cpsskins/branches/paris-sprint-2006/tests/setup.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/tests/setup.py  (original)
+++ cpsskins/branches/paris-sprint-2006/tests/setup.py  Wed Apr 19 20:07:07 2006
@@ -18,8 +18,9 @@
 __docformat__ = "reStructuredText"
 
 from zope.app.testing import ztapi, setup
-from zope.app.traversing.interfaces import IPathAdapter
-from zope.app.event.interfaces import IObjectCreatedEvent, IObjectModifiedEvent
+from zope.traversing.interfaces import IPathAdapter
+from zope.lifecycleevent.interfaces import IObjectCreatedEvent
+from zope.lifecycleevent.interfaces import IObjectModifiedEvent
 from zope.app.container.interfaces import IObjectAddedEvent, 
IObjectRemovedEvent
 
 from cpsskins.thememanager import ThemeManagementFolder

Modified: cpsskins/branches/paris-sprint-2006/tests/test_relations.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/tests/test_relations.py (original)
+++ cpsskins/branches/paris-sprint-2006/tests/test_relations.py Wed Apr 19 
20:07:07 2006
@@ -20,7 +20,7 @@
 import unittest
 
 from zope.testing.doctestunit import DocTestSuite
-from zope.component.tests.placelesssetup import PlacelessSetup
+from zope.app.testing.placelesssetup import PlacelessSetup
 
 from cpsskins.relations import Predicate, TestRelate as Relate
 from cpsskins.relations import MonadicRelation as Monad
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to