Author: jmorliaguet
Date: Wed Apr 19 19:54:13 2006
New Revision: 2902

Modified:
   cpsskins/branches/paris-sprint-2006/browser/caching.py
   cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py
   cpsskins/branches/paris-sprint-2006/browser/rendering/renderer.py
   cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
   cpsskins/branches/paris-sprint-2006/browser/skin/__init__.py
   cpsskins/branches/paris-sprint-2006/browser/tree/slot.py
   cpsskins/branches/paris-sprint-2006/browser/tree/views.py
   cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py
   cpsskins/branches/paris-sprint-2006/configuration/engines/__init__.py
   cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py
   cpsskins/branches/paris-sprint-2006/controllers/controller.py
   cpsskins/branches/paris-sprint-2006/elements/format.py
   cpsskins/branches/paris-sprint-2006/elements/interfaces.py
   cpsskins/branches/paris-sprint-2006/elements/portlet.py
   
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/aggregator/browser.py
   
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/benchmarks/browser.py
   
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/chat/browser.py
   
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/forms/browser.py
   
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/latency/browser.py
   
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/panels/views.py
   
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/quiz/browser.py
   
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/treeview/browser.py
   cpsskins/branches/paris-sprint-2006/perspectives/perspective.py
   cpsskins/branches/paris-sprint-2006/relations/storage.py
   cpsskins/branches/paris-sprint-2006/standard/filters/style/css.py
   cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py
   cpsskins/branches/paris-sprint-2006/standard/filters/widget/__init__.py
   cpsskins/branches/paris-sprint-2006/standard/portlets/actions/portlet.py
   cpsskins/branches/paris-sprint-2006/standard/portlets/breadcrumbs/portlet.py
   cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/portlet.py
   cpsskins/branches/paris-sprint-2006/storage/storage.py
   cpsskins/branches/paris-sprint-2006/ui/authoring/views.py
   cpsskins/branches/paris-sprint-2006/ui/editing/views.py
   cpsskins/branches/paris-sprint-2006/ui/manager/views.py
   cpsskins/branches/paris-sprint-2006/ui/panels/views.py
   cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
Log:

- removed more deprecation warnings



Modified: cpsskins/branches/paris-sprint-2006/browser/caching.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/caching.py      (original)
+++ cpsskins/branches/paris-sprint-2006/browser/caching.py      Wed Apr 19 
19:54:13 2006
@@ -18,7 +18,7 @@
 __docformat__ = "reStructuredText"
 
 from zope.app.file.browser.image import ImageData
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 
 from cpsskins.utils import getThemeManager
 

Modified: cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py    
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/negotiation/views.py    Wed Apr 
19 19:54:13 2006
@@ -18,7 +18,7 @@
 __docformat__ = "reStructuredText"
 
 from zope.app import zapi
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.component import getMultiAdapter
 from zope.interface import implements
 

Modified: cpsskins/branches/paris-sprint-2006/browser/rendering/renderer.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/rendering/renderer.py   
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/rendering/renderer.py   Wed Apr 
19 19:54:13 2006
@@ -19,7 +19,7 @@
 
 import logging
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.app.zapi import getMultiAdapter, queryMultiAdapter
 from zope.component import adapts, queryUtility
 from zope.interface import implements

Modified: cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py     
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/rendering/viewer.py     Wed Apr 
19 19:54:13 2006
@@ -20,7 +20,7 @@
 import logging
 
 from zope.app import zapi
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.app.traversing.api import getParent
 from zope.app.zapi import getMultiAdapter
 from zope.component import adapts, getUtility

Modified: cpsskins/branches/paris-sprint-2006/browser/skin/__init__.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/skin/__init__.py        
(original)
+++ cpsskins/branches/paris-sprint-2006/browser/skin/__init__.py        Wed Apr 
19 19:54:13 2006
@@ -17,7 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.publisher.browser import applySkin
+from zope.publisher.browser import applySkin
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 from zope.publisher.interfaces.browser import IBrowserRequest
 

Modified: cpsskins/branches/paris-sprint-2006/browser/tree/slot.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/tree/slot.py    (original)
+++ cpsskins/branches/paris-sprint-2006/browser/tree/slot.py    Wed Apr 19 
19:54:13 2006
@@ -20,7 +20,7 @@
 from zope.app import zapi
 from zope.component import getMultiAdapter, getUtility
 from zope.app.container.browser.adding import Adding
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.app.traversing.api import getParent
 from zope.interface import implements
 

Modified: cpsskins/branches/paris-sprint-2006/browser/tree/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/browser/tree/views.py   (original)
+++ cpsskins/branches/paris-sprint-2006/browser/tree/views.py   Wed Apr 19 
19:54:13 2006
@@ -18,7 +18,7 @@
 __docformat__ = "reStructuredText"
 
 from zope.app import zapi
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.app.container.browser.adding import Adding
 from zope.app.copypastemove.interfaces import IObjectCopier, IObjectMover
 from zope.app.traversing.api import getParent

Modified: 
cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py 
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/displays/metaconfigure.py 
Wed Apr 19 19:54:13 2006
@@ -17,7 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.app.component.contentdirective import ClassDirective
 from zope.component.zcml import adapter
 from zope.app.content.interfaces import IContentType

Modified: cpsskins/branches/paris-sprint-2006/configuration/engines/__init__.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/engines/__init__.py       
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/engines/__init__.py       
Wed Apr 19 19:54:13 2006
@@ -18,7 +18,7 @@
 
 __docformat__ = "reStructuredText"
 
-from zope.app.traversing.namespace import view
+from zope.traversing.namespace import view
 
 # ++engine++ traverser
 class engine(view):

Modified: 
cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py 
(original)
+++ cpsskins/branches/paris-sprint-2006/configuration/portlets/metaconfigure.py 
Wed Apr 19 19:54:13 2006
@@ -19,7 +19,7 @@
 
 import os
 
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.app.form.browser.metaconfigure import EditFormDirective
 from zope.app.component.contentdirective import ClassDirective
 from zope.app.publisher.browser.icon import IconDirective

Modified: cpsskins/branches/paris-sprint-2006/controllers/controller.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/controllers/controller.py       
(original)
+++ cpsskins/branches/paris-sprint-2006/controllers/controller.py       Wed Apr 
19 19:54:13 2006
@@ -17,7 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.copypastemove import dispatchToSublocations
+from zope.copypastemove import dispatchToSublocations
 from zope.interface import implements
 
 from cpsskins.controllers.interfaces import IController

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 
19:54:13 2006
@@ -17,8 +17,8 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.location.pickling import locationCopy
-from zope.app.traversing.interfaces import IPathAdapter, ITraversable
+from zope.location.pickling import locationCopy
+from zope.traversing.interfaces import IPathAdapter, ITraversable
 from zope.component import getUtility, queryUtility, createObject
 from zope.interface import implements
 from zope.security.proxy import removeSecurityProxy

Modified: cpsskins/branches/paris-sprint-2006/elements/interfaces.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/interfaces.py  (original)
+++ cpsskins/branches/paris-sprint-2006/elements/interfaces.py  Wed Apr 19 
19:54:13 2006
@@ -17,7 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.annotation.interfaces import IAttributeAnnotatable
+from zope.annotation.interfaces import IAttributeAnnotatable
 from zope.app.container.constraints import contains, containers
 from zope.app.container.interfaces import IContained
 from zope.app.container.interfaces import IOrderedContainer, IItemContainer

Modified: cpsskins/branches/paris-sprint-2006/elements/portlet.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/elements/portlet.py     (original)
+++ cpsskins/branches/paris-sprint-2006/elements/portlet.py     Wed Apr 19 
19:54:13 2006
@@ -20,9 +20,9 @@
 from persistent import Persistent
 from zope.app import zapi
 from zope.app.container.contained import Contained
-from zope.app.copypastemove import ObjectMover
-from zope.app.copypastemove.interfaces import IObjectMover
-from zope.app.traversing.api import getParent
+from zope.copypastemove import ObjectMover
+from zope.copypastemove.interfaces import IObjectMover
+from zope.traversing.api import getParent
 from zope.interface import implements
 
 from cpsskins.elements.interfaces import IPortlet, ISlot, IDisplayable

Modified: 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/aggregator/browser.py
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/aggregator/browser.py
     (original)
+++ 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/aggregator/browser.py
     Wed Apr 19 19:54:13 2006
@@ -1,7 +1,7 @@
 
 import time
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 
 from cpsskins import minjson as json
 

Modified: 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/benchmarks/browser.py
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/benchmarks/browser.py
     (original)
+++ 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/benchmarks/browser.py
     Wed Apr 19 19:54:13 2006
@@ -1,7 +1,7 @@
 
 import time
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 
 from cpsskins import minjson as json
 

Modified: 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/chat/browser.py
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/chat/browser.py
   (original)
+++ 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/chat/browser.py
   Wed Apr 19 19:54:13 2006
@@ -1,7 +1,7 @@
 
 import time
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.app.cache.ram import RAMCache
 
 from cpsskins import minjson as json

Modified: 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/forms/browser.py
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/forms/browser.py
  (original)
+++ 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/forms/browser.py
  Wed Apr 19 19:54:13 2006
@@ -2,7 +2,7 @@
 import re
 import time
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.app.cache.ram import RAMCache
 
 from zope.interface import Interface, implements

Modified: 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/latency/browser.py
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/latency/browser.py
        (original)
+++ 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/latency/browser.py
        Wed Apr 19 19:54:13 2006
@@ -2,7 +2,7 @@
 import random
 import time
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.app.cache.ram import RAMCache
 
 from cpsskins import minjson as json

Modified: 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/panels/views.py
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/panels/views.py
   (original)
+++ 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/panels/views.py
   Wed Apr 19 19:54:13 2006
@@ -1,5 +1,5 @@
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 
 from cpsskins import minjson as json
 

Modified: 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/quiz/browser.py
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/quiz/browser.py
   (original)
+++ 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/quiz/browser.py
   Wed Apr 19 19:54:13 2006
@@ -1,7 +1,7 @@
 
 import time
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.app.session.interfaces import ISession
 
 from cpsskins import minjson as json

Modified: 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/treeview/browser.py
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/treeview/browser.py
       (original)
+++ 
cpsskins/branches/paris-sprint-2006/lib/cpsskins/tests/functional/treeview/browser.py
       Wed Apr 19 19:54:13 2006
@@ -1,7 +1,7 @@
 
 from urllib import unquote
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 
 from cpsskins import minjson as json
 

Modified: cpsskins/branches/paris-sprint-2006/perspectives/perspective.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/perspectives/perspective.py     
(original)
+++ cpsskins/branches/paris-sprint-2006/perspectives/perspective.py     Wed Apr 
19 19:54:13 2006
@@ -19,7 +19,7 @@
 
 from xml.dom.minidom import parseString
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.component import adapts
 from zope.component.factory import Factory
 from zope.interface import implements, implementedBy

Modified: cpsskins/branches/paris-sprint-2006/relations/storage.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/relations/storage.py    (original)
+++ cpsskins/branches/paris-sprint-2006/relations/storage.py    Wed Apr 19 
19:54:13 2006
@@ -25,7 +25,7 @@
 from zope.app import zapi
 from zope.app.container.btree import BTreeContainer
 from zope.app.container.interfaces import INameChooser
-from zope.app.location.traversing import LocationPhysicallyLocatable
+from zope.location.traversing import LocationPhysicallyLocatable
 from zope.interface import implements
 from zope.proxy import isProxy
 from zope.security.proxy import removeSecurityProxy

Modified: cpsskins/branches/paris-sprint-2006/standard/filters/style/css.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/style/css.py   
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/style/css.py   Wed Apr 
19 19:54:13 2006
@@ -17,7 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.interface import implements, Interface
 from zope.component import getUtility, getUtilitiesFor
 

Modified: cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py 
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/style/views.py Wed Apr 
19 19:54:13 2006
@@ -19,7 +19,7 @@
 
 from zope.component import getUtility
 from zope.app import zapi
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 
 from cpsskins import configuration
 from cpsskins import minjson as json

Modified: 
cpsskins/branches/paris-sprint-2006/standard/filters/widget/__init__.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/filters/widget/__init__.py     
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/filters/widget/__init__.py     
Wed Apr 19 19:54:13 2006
@@ -19,7 +19,7 @@
 
 import logging
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.component import adapts
 from zope.component import queryMultiAdapter
 from zope.interface import implements

Modified: 
cpsskins/branches/paris-sprint-2006/standard/portlets/actions/portlet.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/portlets/actions/portlet.py    
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/portlets/actions/portlet.py    
Wed Apr 19 19:54:13 2006
@@ -18,7 +18,7 @@
 __docformat__ = "reStructuredText"
 
 from zope.app.publisher.browser.menu import getMenu
-from zope.component.exceptions import ComponentLookupError
+from zope.component.interfaces import ComponentLookupError
 from zope.interface import implements
 from zope.schema import TextLine
 from zope.i18nmessageid import MessageFactory

Modified: 
cpsskins/branches/paris-sprint-2006/standard/portlets/breadcrumbs/portlet.py
==============================================================================
--- 
cpsskins/branches/paris-sprint-2006/standard/portlets/breadcrumbs/portlet.py    
    (original)
+++ 
cpsskins/branches/paris-sprint-2006/standard/portlets/breadcrumbs/portlet.py    
    Wed Apr 19 19:54:13 2006
@@ -17,7 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.traversing.browser.interfaces import IAbsoluteURL
+from zope.traversing.browser.interfaces import IAbsoluteURL
 from zope.component import getMultiAdapter
 from zope.interface import implements
 from zope.i18nmessageid import MessageFactory

Modified: 
cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/portlet.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/portlet.py  
(original)
+++ cpsskins/branches/paris-sprint-2006/standard/portlets/macroslot/portlet.py  
Wed Apr 19 19:54:13 2006
@@ -18,7 +18,7 @@
 __docformat__ = "reStructuredText"
 
 from zope.app import zapi
-from zope.app.publisher.browser import applySkin
+from zope.publisher.browser import applySkin
 from zope.interface import implements
 from zope.i18nmessageid import MessageFactory
 

Modified: cpsskins/branches/paris-sprint-2006/storage/storage.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/storage/storage.py      (original)
+++ cpsskins/branches/paris-sprint-2006/storage/storage.py      Wed Apr 19 
19:54:13 2006
@@ -22,8 +22,8 @@
 from zope.app.container.contained import Contained
 from zope.app.container.contained import ObjectAddedEvent
 from zope.app.container.interfaces import INameChooser
-from zope.app.event.objectevent import ObjectCopiedEvent
-from zope.app.location.pickling import locationCopy
+from zope.lifecycleevent import ObjectCopiedEvent
+from zope.location.pickling import locationCopy
 from zope.event import notify
 from zope.interface import implements
 

Modified: cpsskins/branches/paris-sprint-2006/ui/authoring/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/authoring/views.py   (original)
+++ cpsskins/branches/paris-sprint-2006/ui/authoring/views.py   Wed Apr 19 
19:54:13 2006
@@ -17,8 +17,8 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.event.objectevent import ObjectCreatedEvent
-from zope.app.publisher.browser import BrowserView
+from zope.lifecycleevent import ObjectCreatedEvent
+from zope.publisher.browser import BrowserView
 from zope.app.session.interfaces import ISession
 from zope.app.zapi import getParent, getMultiAdapter
 from zope.component import adapts, getUtility, createObject

Modified: cpsskins/branches/paris-sprint-2006/ui/editing/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/editing/views.py     (original)
+++ cpsskins/branches/paris-sprint-2006/ui/editing/views.py     Wed Apr 19 
19:54:13 2006
@@ -17,9 +17,9 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.location.traversing import LocationPhysicallyLocatable
-from zope.app.location.pickling import locationCopy
-from zope.app.publisher.browser import BrowserView
+from zope.location.traversing import LocationPhysicallyLocatable
+from zope.location.pickling import locationCopy
+from zope.publisher.browser import BrowserView
 from zope.app.zapi import queryMultiAdapter, getMultiAdapter, getParent
 from zope.component import queryUtility, getUtility
 from zope.interface import implements, Interface

Modified: cpsskins/branches/paris-sprint-2006/ui/manager/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/manager/views.py     (original)
+++ cpsskins/branches/paris-sprint-2006/ui/manager/views.py     Wed Apr 19 
19:54:13 2006
@@ -20,7 +20,7 @@
 import urllib
 
 from zope.app import zapi
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.interface import implements, Interface
 
 from cpsskins.browser.negotiation.interfaces import INegotiation

Modified: cpsskins/branches/paris-sprint-2006/ui/panels/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/panels/views.py      (original)
+++ cpsskins/branches/paris-sprint-2006/ui/panels/views.py      Wed Apr 19 
19:54:13 2006
@@ -17,7 +17,7 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.app.zapi import getMultiAdapter
 from zope.interface import implements, Interface
 

Modified: cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py 
(original)
+++ cpsskins/branches/paris-sprint-2006/ui/screens/sitemanager/views.py Wed Apr 
19 19:54:13 2006
@@ -21,7 +21,7 @@
 
 from zope.app.interface import queryType
 from zope.app.file import File
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 from zope.component import getUtilitiesFor, getUtility, getMultiAdapter
 from zope.component import queryUtility, getAllUtilitiesRegisteredFor
 
-- 
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins

Reply via email to