[Zope3-checkins] CVS: Zope3/src/zope/app/services - adapter.py:1.15 auth.py:1.16 cache.py:1.10 configuration.py:1.27 connection.py:1.12 errorr.py:1.9 event.py:1.25 folder.py:1.7 hub.py:1.11 module.py:1.3 pagefolder.py:1.6 principalannotation.py:1.6 role.py:1.5 service.py:1.19 utility.py:1.7 view.py:1.19
Jim Fulton
jim@zope.com
Tue, 27 May 2003 10:18:55 -0400
Update of /cvs-repository/Zope3/src/zope/app/services
In directory cvs.zope.org:/tmp/cvs-serv19792/src/zope/app/services
Modified Files:
adapter.py auth.py cache.py configuration.py connection.py
errorr.py event.py folder.py hub.py module.py pagefolder.py
principalannotation.py role.py service.py utility.py view.py
Log Message:
moved zope.proxy.context to zope.context
=== Zope3/src/zope/app/services/adapter.py 1.14 => 1.15 ===
--- Zope3/src/zope/app/services/adapter.py:1.14 Wed May 21 16:30:04 2003
+++ Zope3/src/zope/app/services/adapter.py Tue May 27 10:18:24 2003
@@ -28,8 +28,8 @@
from zope.app.interfaces.services.configuration import IConfigurable
from zope.app.services.configuration import ConfigurationRegistry
from zope.app.services.configuration import SimpleConfiguration
-from zope.proxy.context import ContextWrapper
-from zope.proxy.context import ContextMethod
+from zope.context import ContextWrapper
+from zope.context import ContextMethod
from zope.app.services.configuration import ConfigurationStatusProperty
from zope.app.component.nextservice import getNextService
from zope.app.interfaces.services.service import ISimpleService
=== Zope3/src/zope/app/services/auth.py 1.15 => 1.16 ===
--- Zope3/src/zope/app/services/auth.py:1.15 Thu May 1 15:35:34 2003
+++ Zope3/src/zope/app/services/auth.py Tue May 27 10:18:24 2003
@@ -33,7 +33,7 @@
from zope.proxy.introspection import removeAllProxies
from zope.app.attributeannotations import AttributeAnnotations
from zope.app.component.nextservice import getNextService
-from zope.proxy.context import ContextMethod
+from zope.context import ContextMethod
from zope.app.interfaces.services.service import ISimpleService
=== Zope3/src/zope/app/services/cache.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/services/cache.py:1.9 Thu May 1 15:35:34 2003
+++ Zope3/src/zope/app/services/cache.py Tue May 27 10:18:24 2003
@@ -19,7 +19,7 @@
from persistence import Persistent
from zope.component import getService
-from zope.proxy.context import ContextMethod
+from zope.context import ContextMethod
from zope.app.component.nextservice import queryNextService
from zope.app.interfaces.cache.cache import ICache, ICachingService
=== Zope3/src/zope/app/services/configuration.py 1.26 => 1.27 ===
--- Zope3/src/zope/app/services/configuration.py:1.26 Thu May 1 15:35:34 2003
+++ Zope3/src/zope/app/services/configuration.py Tue May 27 10:18:24 2003
@@ -46,8 +46,8 @@
from zope.app.traversing import canonicalPath
from zope.component import getAdapter, queryAdapter
from zope.component import getServiceManager
-from zope.proxy.context import ContextMethod, ContextWrapper
-from zope.proxy.context import ContextDescriptor
+from zope.context import ContextMethod, ContextWrapper
+from zope.context import ContextDescriptor
from zope.proxy.introspection import removeAllProxies
from zope.security.checker import InterfaceChecker
from zope.security.proxy import Proxy, trustedRemoveSecurityProxy
=== Zope3/src/zope/app/services/connection.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/services/connection.py:1.11 Thu May 1 15:35:34 2003
+++ Zope3/src/zope/app/services/connection.py Tue May 27 10:18:24 2003
@@ -16,7 +16,7 @@
"""
from persistence import Persistent
-from zope.proxy.context import ContextMethod
+from zope.context import ContextMethod
from zope.app.interfaces.rdb import IZopeDatabaseAdapter
from zope.app.interfaces.services.connection import ILocalConnectionService
=== Zope3/src/zope/app/services/errorr.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/errorr.py:1.8 Tue Mar 11 11:11:22 2003
+++ Zope3/src/zope/app/services/errorr.py Tue May 27 10:18:24 2003
@@ -24,7 +24,7 @@
from types import StringTypes
import logging
from zope.exceptions.exceptionformatter import format_exception
-from zope.proxy.context import ContextMethod
+from zope.context import ContextMethod
from zope.app.interfaces.services.error import IErrorReportingService
from zope.app.interfaces.services.service import ISimpleService
=== Zope3/src/zope/app/services/event.py 1.24 => 1.25 ===
--- Zope3/src/zope/app/services/event.py:1.24 Mon May 12 12:31:50 2003
+++ Zope3/src/zope/app/services/event.py Tue May 27 10:18:24 2003
@@ -31,7 +31,7 @@
from zope.app.services.servicenames import EventSubscription
from zope.app.component.nextservice import getNextService, queryNextService
-from zope.proxy.context import ContextMethod, ContextSuper
+from zope.context import ContextMethod, ContextSuper
from zope.proxy.introspection import removeAllProxies
from zope.app.event.subs import Subscribable, SubscriptionTracker
=== Zope3/src/zope/app/services/folder.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/services/folder.py:1.6 Thu May 1 15:35:34 2003
+++ Zope3/src/zope/app/services/folder.py Tue May 27 10:18:24 2003
@@ -25,7 +25,7 @@
from zope.app.interfaces.services.service import IComponentManager
from zope.app.services.configuration import ConfigurationManagerContainer
from zope.app.traversing import getPath
-from zope.proxy.context import ContextMethod, ContextWrapper
+from zope.context import ContextMethod, ContextWrapper
class SiteManagementFolder(ConfigurationManagerContainer, BTreeContainer):
__implements__ = ISiteManagementFolder
=== Zope3/src/zope/app/services/hub.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/services/hub.py:1.10 Thu May 1 15:35:34 2003
+++ Zope3/src/zope/app/services/hub.py Tue May 27 10:18:24 2003
@@ -29,7 +29,7 @@
from zope.component import getAdapter
from zope.exceptions import NotFoundError
-from zope.proxy.context import ContextMethod
+from zope.context import ContextMethod
from zope.proxy.introspection import removeAllProxies
from zope.app.interfaces.traversing import ITraverser
=== Zope3/src/zope/app/services/module.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/module.py:1.2 Wed Dec 25 09:13:19 2002
+++ Zope3/src/zope/app/services/module.py Tue May 27 10:18:24 2003
@@ -21,7 +21,7 @@
from zodb.code.interfaces import IPersistentModuleManager
from zope.component import getServiceManager
-from zope.proxy.context import ContextMethod
+from zope.context import ContextMethod
class Registry:
=== Zope3/src/zope/app/services/pagefolder.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/pagefolder.py:1.5 Thu May 1 15:35:34 2003
+++ Zope3/src/zope/app/services/pagefolder.py Tue May 27 10:18:24 2003
@@ -24,7 +24,7 @@
from zope.app.interfaces.services.view import IZPTTemplate
from zope.publisher.interfaces.browser import IBrowserPresentation
from zope.app.traversing import getPath
-from zope.proxy.context import getItem, ContextMethod
+from zope.context import getItem, ContextMethod
from zope.app.interfaces.services.configuration import Active
from zope.app.services.configuration import ConfigurationManagerContainer
from zope.proxy.introspection import removeAllProxies
=== Zope3/src/zope/app/services/principalannotation.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/principalannotation.py:1.5 Tue Apr 8 13:43:43 2003
+++ Zope3/src/zope/app/services/principalannotation.py Tue May 27 10:18:24 2003
@@ -22,8 +22,8 @@
from persistence import Persistent
from zodb.btrees.OOBTree import OOBTree
from zope.app.component.nextservice import getNextService
-from zope.proxy.context import ContextMethod
-from zope.proxy.context import ContextWrapper
+from zope.context import ContextMethod
+from zope.context import ContextWrapper
from zope.app.interfaces.annotation import IAnnotations
# Sibling imports
=== Zope3/src/zope/app/services/role.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/services/role.py:1.4 Tue Mar 11 11:11:22 2003
+++ Zope3/src/zope/app/services/role.py Tue May 27 10:18:24 2003
@@ -22,7 +22,7 @@
from zope.app.container.btree import BTreeContainer
from zope.app.interfaces.security import IRoleService
from zope.app.interfaces.container import IContainer
-from zope.proxy.context import ContextMethod
+from zope.context import ContextMethod
from zope.app.component.nextservice import getNextService
from zope.app.interfaces.services.service import ISimpleService
=== Zope3/src/zope/app/services/service.py 1.18 => 1.19 ===
--- Zope3/src/zope/app/services/service.py:1.18 Thu May 1 15:35:34 2003
+++ Zope3/src/zope/app/services/service.py Tue May 27 10:18:24 2003
@@ -34,8 +34,8 @@
from zope.component import getServiceManager
from zope.component.exceptions import ComponentLookupError
-from zope.proxy.context import ContextMethod
-from zope.proxy.context import ContextWrapper
+from zope.context import ContextMethod
+from zope.context import ContextWrapper
from zope.proxy.introspection import removeAllProxies
from zope.app.component.nextservice import getNextService
=== Zope3/src/zope/app/services/utility.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/services/utility.py:1.6 Thu May 1 15:35:34 2003
+++ Zope3/src/zope/app/services/utility.py Tue May 27 10:18:24 2003
@@ -29,8 +29,8 @@
from zope.app.services.configuration import ComponentConfiguration
from zope.component.exceptions import ComponentLookupError
from zope.interface.implementor import ImplementorRegistry
-from zope.proxy.context import ContextAware
-from zope.proxy.context import ContextWrapper
+from zope.context import ContextAware
+from zope.context import ContextWrapper
class LocalUtilityService(Persistent, ContextAware):
=== Zope3/src/zope/app/services/view.py 1.18 => 1.19 ===
--- Zope3/src/zope/app/services/view.py:1.18 Tue May 6 07:18:54 2003
+++ Zope3/src/zope/app/services/view.py Tue May 27 10:18:24 2003
@@ -27,8 +27,8 @@
from zope.app.interfaces.services.configuration import IConfigurable
from zope.app.services.configuration import ConfigurationRegistry
from zope.app.services.configuration import SimpleConfiguration
-from zope.proxy.context import ContextWrapper
-from zope.proxy.context import ContextMethod
+from zope.context import ContextWrapper
+from zope.context import ContextMethod
from zope.app.services.configuration import ConfigurationStatusProperty
from zope.app.component.nextservice import getNextService
from zope.component import getSkin