[Zope3-checkins] CVS: Zope3/src/zope/app/services - adapter.py:1.16 configuration.py:1.29 folder.py:1.9 module.py:1.8 pagefolder.py:1.9 principalannotation.py:1.8 service.py:1.21 utility.py:1.8 view.py:1.21

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/services
In directory cvs.zope.org:/tmp/cvs-serv25908/src/zope/app/services

Modified Files:
	adapter.py configuration.py folder.py module.py pagefolder.py 
	principalannotation.py service.py utility.py view.py 
Log Message:
Moved ContextWrapper, getItem, getAttr, queryItem, and queryAttr
from zope.context to zope.app.context.


=== Zope3/src/zope/app/services/adapter.py 1.15 => 1.16 ===
--- Zope3/src/zope/app/services/adapter.py:1.15	Tue May 27 10:18:24 2003
+++ Zope3/src/zope/app/services/adapter.py	Sun Jun  1 11:59:36 2003
@@ -28,7 +28,7 @@
 from zope.app.interfaces.services.configuration import IConfigurable
 from zope.app.services.configuration import ConfigurationRegistry
 from zope.app.services.configuration import SimpleConfiguration
-from zope.context import ContextWrapper
+from zope.app.context import ContextWrapper
 from zope.context import ContextMethod
 from zope.app.services.configuration import ConfigurationStatusProperty
 from zope.app.component.nextservice import getNextService


=== Zope3/src/zope/app/services/configuration.py 1.28 => 1.29 ===
--- Zope3/src/zope/app/services/configuration.py:1.28	Wed May 28 11:46:11 2003
+++ Zope3/src/zope/app/services/configuration.py	Sun Jun  1 11:59:36 2003
@@ -46,8 +46,8 @@
 from zope.app.traversing import canonicalPath
 from zope.component import getAdapter, queryAdapter
 from zope.component import getServiceManager
-from zope.context import ContextMethod, ContextWrapper
-from zope.context import ContextDescriptor
+from zope.app.context import ContextWrapper
+from zope.context import ContextMethod, ContextDescriptor
 from zope.proxy import removeAllProxies
 from zope.security.checker import InterfaceChecker
 from zope.security.proxy import Proxy, trustedRemoveSecurityProxy


=== Zope3/src/zope/app/services/folder.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/folder.py:1.8	Thu May 29 15:55:42 2003
+++ Zope3/src/zope/app/services/folder.py	Sun Jun  1 11:59:36 2003
@@ -26,7 +26,8 @@
 from zope.app.interfaces.file import IDirectoryFactory
 from zope.app.services.configuration import ConfigurationManagerContainer
 from zope.app.traversing import getPath
-from zope.context import ContextMethod, ContextWrapper
+from zope.app.context import ContextWrapper
+from zope.context import ContextMethod
 
 class SiteManagementFolder(ConfigurationManagerContainer, BTreeContainer):
     __implements__ = ISiteManagementFolder


=== Zope3/src/zope/app/services/module.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/services/module.py:1.7	Thu May 29 17:53:31 2003
+++ Zope3/src/zope/app/services/module.py	Sun Jun  1 11:59:36 2003
@@ -30,7 +30,7 @@
 from zope.app.fssync.classes import ObjectEntryAdapter, AttrMapping
 from zope.app.interfaces.fssync import IObjectFile
 from zope.app.interfaces.file import IFileFactory
-from zope.context import ContextWrapper
+from zope.app.context import ContextWrapper
 
 
 class Registry:


=== Zope3/src/zope/app/services/pagefolder.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/pagefolder.py:1.8	Thu May 29 15:55:42 2003
+++ Zope3/src/zope/app/services/pagefolder.py	Sun Jun  1 11:59:36 2003
@@ -24,7 +24,8 @@
 from zope.app.interfaces.services.view import IZPTTemplate
 from zope.publisher.interfaces.browser import IBrowserPresentation
 from zope.app.traversing import getPath
-from zope.context import getItem, ContextMethod
+from zope.app.context import getItem
+from zope.context import ContextMethod
 from zope.app.interfaces.services.configuration import Active
 from zope.app.services.configuration import ConfigurationManagerContainer
 from zope.proxy import removeAllProxies


=== Zope3/src/zope/app/services/principalannotation.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/services/principalannotation.py:1.7	Thu May 29 14:16:55 2003
+++ Zope3/src/zope/app/services/principalannotation.py	Sun Jun  1 11:59:36 2003
@@ -24,7 +24,7 @@
 from zodb.btrees.OOBTree import OOBTree
 from zope.app.component.nextservice import queryNextService
 from zope.context import ContextMethod
-from zope.context import ContextWrapper
+from zope.app.context import ContextWrapper
 from zope.app.interfaces.annotation import IAnnotations
 
 # Sibling imports


=== Zope3/src/zope/app/services/service.py 1.20 => 1.21 ===
--- Zope3/src/zope/app/services/service.py:1.20	Wed May 28 11:46:11 2003
+++ Zope3/src/zope/app/services/service.py	Sun Jun  1 11:59:36 2003
@@ -35,7 +35,7 @@
 from zope.component.exceptions import ComponentLookupError
 
 from zope.context import ContextMethod
-from zope.context import ContextWrapper
+from zope.app.context import ContextWrapper
 from zope.proxy import removeAllProxies
 
 from zope.app.component.nextservice import getNextService


=== Zope3/src/zope/app/services/utility.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/services/utility.py:1.7	Tue May 27 10:18:24 2003
+++ Zope3/src/zope/app/services/utility.py	Sun Jun  1 11:59:36 2003
@@ -30,7 +30,7 @@
 from zope.component.exceptions import ComponentLookupError
 from zope.interface.implementor import ImplementorRegistry
 from zope.context import ContextAware
-from zope.context import ContextWrapper
+from zope.app.context import ContextWrapper
 
 class LocalUtilityService(Persistent, ContextAware):
 


=== Zope3/src/zope/app/services/view.py 1.20 => 1.21 ===
--- Zope3/src/zope/app/services/view.py:1.20	Wed May 28 11:46:11 2003
+++ Zope3/src/zope/app/services/view.py	Sun Jun  1 11:59:36 2003
@@ -27,7 +27,7 @@
 from zope.app.interfaces.services.configuration import IConfigurable
 from zope.app.services.configuration import ConfigurationRegistry
 from zope.app.services.configuration import SimpleConfiguration
-from zope.context import ContextWrapper
+from zope.app.context import ContextWrapper
 from zope.context import ContextMethod
 from zope.app.services.configuration import ConfigurationStatusProperty
 from zope.app.component.nextservice import getNextService