[Zope3-checkins] CVS: Zope3/src/zope/app/services - adapter.py:1.24 auth.py:1.23 cache.py:1.20 error.py:1.4 hub.py:1.27 interface.py:1.19 menu.py:1.9 module.py:1.22 presentation.py:1.4 principalannotation.py:1.11 registration.py:1.21 surrogate.py:1.4 type.py:1.2 utility.py:1.19 view.py:1.37 zpt.py:1.19

Fred L. Drake, Jr. fred at zope.com
Fri Feb 20 11:58:07 EST 2004 

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

Modified Files:
	adapter.py auth.py cache.py error.py hub.py interface.py 
	menu.py module.py presentation.py principalannotation.py 
	registration.py surrogate.py type.py utility.py view.py zpt.py 
Log Message:


update to replace ZODB 4 with ZODB 3


=== Zope3/src/zope/app/services/adapter.py 1.23 => 1.24 ===
--- Zope3/src/zope/app/services/adapter.py:1.23	Fri Nov 21 12:10:07 2003
+++ Zope3/src/zope/app/services/adapter.py	Fri Feb 20 11:57:30 2004
@@ -118,7 +118,7 @@
 
 #BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 
-import persistence
+import persistent
 from zope.interface.surrogate import ReadProperty
 
 AdapterRegistration.required = ReadProperty(lambda self: self.forInterface)
@@ -126,5 +126,5 @@
     lambda self: self.providedInterface)
 AdapterRegistration.name     = ReadProperty(lambda self: self.adapterName)
 
-class AdapterService(persistence.Persistent):
+class AdapterService(persistent.Persistent):
     pass


=== Zope3/src/zope/app/services/auth.py 1.22 => 1.23 ===
--- Zope3/src/zope/app/services/auth.py:1.22	Wed Jan 14 17:55:28 2004
+++ Zope3/src/zope/app/services/auth.py	Fri Feb 20 11:57:30 2004
@@ -16,7 +16,7 @@
 $Id$
 """
 
-from persistence import Persistent
+from persistent import Persistent
 from zodb.btrees.OOBTree import OOBTree
 
 from zope.exceptions import NotFoundError


=== Zope3/src/zope/app/services/cache.py 1.19 => 1.20 ===
--- Zope3/src/zope/app/services/cache.py:1.19	Sun Sep 21 13:31:59 2003
+++ Zope3/src/zope/app/services/cache.py	Fri Feb 20 11:57:30 2004
@@ -15,7 +15,7 @@
 
 $Id$
 """
-from persistence import Persistent
+from persistent import Persistent
 from zope.app import zapi
 from zope.app.interfaces.cache import ICache
 from zope.app.interfaces.event import IObjectModifiedEvent


=== Zope3/src/zope/app/services/error.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/error.py:1.3	Sun Sep 21 13:32:49 2003
+++ Zope3/src/zope/app/services/error.py	Fri Feb 20 11:57:30 2004
@@ -18,7 +18,7 @@
 $Id$
 """
 
-from persistence import Persistent
+from persistent import Persistent
 from random import random
 from thread import allocate_lock
 from types import StringTypes


=== Zope3/src/zope/app/services/hub.py 1.26 => 1.27 ===
--- Zope3/src/zope/app/services/hub.py:1.26	Tue Dec 16 17:05:40 2003
+++ Zope3/src/zope/app/services/hub.py	Fri Feb 20 11:57:30 2004
@@ -52,7 +52,7 @@
 from zope.app.traversing \
      import getPath, canonicalPath, traverse, traverseName, getRoot
 from zope.app.interfaces.services.hub import ISubscriptionControl
-from persistence import Persistent
+from persistent import Persistent
 from zope.app.container.contained import Contained
 
 class HubEvent:


=== Zope3/src/zope/app/services/interface.py 1.18 => 1.19 ===
--- Zope3/src/zope/app/services/interface.py:1.18	Fri Nov 21 12:10:03 2003
+++ Zope3/src/zope/app/services/interface.py	Fri Feb 20 11:57:30 2004
@@ -19,8 +19,8 @@
 $Id$
 """
 
-from persistence import Persistent
-from persistence.dict import PersistentDict
+from persistent import Persistent
+from persistent.dict import PersistentDict
 from zodb.code.patch import registerWrapper, Wrapper
 from zope.interface.interface import InterfaceClass
 from zope.interface.interfaces import IInterface


=== Zope3/src/zope/app/services/menu.py 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/menu.py:1.8	Wed Dec  3 00:41:34 2003
+++ Zope3/src/zope/app/services/menu.py	Fri Feb 20 11:57:30 2004
@@ -17,7 +17,7 @@
 """
 __metaclass__ = type
 
-from persistence import Persistent
+from persistent import Persistent
 from zope.app import zapi
 from zope.app.component.nextservice import getNextService
 from zope.app.container.ordered import OrderedContainer


=== Zope3/src/zope/app/services/module.py 1.21 => 1.22 ===
--- Zope3/src/zope/app/services/module.py:1.21	Thu Jan 15 11:08:05 2004
+++ Zope3/src/zope/app/services/module.py	Fri Feb 20 11:57:30 2004
@@ -16,7 +16,7 @@
 $Id$
 """
 
-from persistence import Persistent
+from persistent import Persistent
 from zodb.code.module import PersistentModule, compileModule
 from zope.app.event import function
 from zope.app.interfaces.annotation import IAttributeAnnotatable


=== Zope3/src/zope/app/services/presentation.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/presentation.py:1.3	Thu Dec 18 01:09:44 2003
+++ Zope3/src/zope/app/services/presentation.py	Fri Feb 20 11:57:30 2004
@@ -20,7 +20,7 @@
 from zope.app.i18n import ZopeMessageIDFactory as _
 from zope.component.presentation import IDefaultViewName
 from zope.security.checker import NamesChecker, ProxyFactory
-import persistence.dict
+import persistent.dict
 import zope.app.component.interfacefield
 import zope.app.component.nextservice
 import zope.app.container.contained
@@ -59,7 +59,7 @@
     next = base = None
 
     def __init__(self):
-        self.layers = persistence.dict.PersistentDict()
+        self.layers = persistent.dict.PersistentDict()
         self.base = zapi.getService(None, zapi.servicenames.Presentation)
 
     def setNext(self, next, global_):
@@ -550,7 +550,7 @@
 #BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 
 from zope.app.event.function import Subscriber
-import persistence
+import persistent
 import sys
 from zope.interface.surrogate import ReadProperty
 
@@ -558,7 +558,7 @@
 ViewRegistration.factoryName = ReadProperty(lambda self: self.class_)
 ViewRegistration.name        = ReadProperty(lambda self: self.viewName)
 
-class ViewService(persistence.Persistent):
+class ViewService(persistent.Persistent):
     pass
 
 def fixup(event):


=== Zope3/src/zope/app/services/principalannotation.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/services/principalannotation.py:1.10	Sun Sep 21 13:31:59 2003
+++ Zope3/src/zope/app/services/principalannotation.py	Fri Feb 20 11:57:30 2004
@@ -19,8 +19,8 @@
 # implement this.
 
 # Zope3 imports
-from persistence import Persistent
-from persistence.dict import PersistentDict
+from persistent import Persistent
+from persistent.dict import PersistentDict
 from zodb.btrees.OOBTree import OOBTree
 from zope.app.component.nextservice import queryNextService
 from zope.app.interfaces.annotation import IAnnotations


=== Zope3/src/zope/app/services/registration.py 1.20 => 1.21 ===
--- Zope3/src/zope/app/services/registration.py:1.20	Tue Jan 13 14:32:23 2004
+++ Zope3/src/zope/app/services/registration.py	Fri Feb 20 11:57:30 2004
@@ -19,7 +19,7 @@
 
 from zope.app import zapi
 
-from persistence import Persistent
+from persistent import Persistent
 from zope.interface import implements
 from zope.fssync.server.interfaces import IObjectFile
 from zope.fssync.server.entryadapter import ObjectEntryAdapter


=== Zope3/src/zope/app/services/surrogate.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/surrogate.py:1.3	Mon Feb  9 02:41:20 2004
+++ Zope3/src/zope/app/services/surrogate.py	Fri Feb 20 11:57:30 2004
@@ -16,8 +16,8 @@
 $Id$
 """
 
-from persistence import Persistent
-from persistence.dict import PersistentDict
+from persistent import Persistent
+from persistent.dict import PersistentDict
 from zope.interface.surrogate import Surrogate, SurrogateRegistry
 from zope.interface.surrogate import adapterImplied, Default
 from zope.app.services.registration import NotifyingRegistrationStack


=== Zope3/src/zope/app/services/type.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/services/type.py:1.1	Wed Jan 29 13:49:45 2003
+++ Zope3/src/zope/app/services/type.py	Fri Feb 20 11:57:30 2004
@@ -15,8 +15,8 @@
 """
 __metaclass__ = type
 
-from persistence import Persistent
-from persistence.dict import PersistentDict
+from persistent import Persistent
+from persistent.dict import PersistentDict
 from zope.interface.type import TypeRegistry
 
 class PersistentTypeRegistry(Persistent, TypeRegistry):


=== Zope3/src/zope/app/services/utility.py 1.18 => 1.19 ===
--- Zope3/src/zope/app/services/utility.py:1.18	Sun Feb  8 20:10:16 2004
+++ Zope3/src/zope/app/services/utility.py	Fri Feb 20 11:57:30 2004
@@ -17,8 +17,8 @@
 $Id$
 """
 from zope.interface import implements
-from persistence.dict import PersistentDict
-from persistence import Persistent
+from persistent.dict import PersistentDict
+from persistent import Persistent
 from zope.app.component.nextservice import getNextService
 from zope.app.interfaces.services.registration import IRegistry
 from zope.app.interfaces.services.service import ISimpleService


=== Zope3/src/zope/app/services/view.py 1.36 => 1.37 ===
--- Zope3/src/zope/app/services/view.py:1.36	Mon Nov  3 23:04:25 2003
+++ Zope3/src/zope/app/services/view.py	Fri Feb 20 11:57:30 2004
@@ -16,8 +16,8 @@
 """
 __metaclass__ = type
 
-from persistence import Persistent
-from persistence.dict import PersistentDict
+from persistent import Persistent
+from persistent.dict import PersistentDict
 
 from zope.app.component.nextservice import getNextService
 from zope.app.container.contained import Contained


=== Zope3/src/zope/app/services/zpt.py 1.18 => 1.19 ===
--- Zope3/src/zope/app/services/zpt.py:1.18	Thu Feb  5 23:13:31 2004
+++ Zope3/src/zope/app/services/zpt.py	Fri Feb 20 11:57:30 2004
@@ -16,7 +16,7 @@
 """
 
 from zope.security.proxy import ProxyFactory
-import persistence
+import persistent
 import re
 import zope.app.container.contained
 import zope.fssync.server.entryadapter
@@ -68,7 +68,7 @@
 class ZPTTemplate(
     zope.app.pagetemplate.engine.AppPT,
     zope.pagetemplate.pagetemplate.PageTemplate,
-    persistence.Persistent,
+    persistent.Persistent,
     zope.app.container.contained.Contained,
     ):

More information about the Zope3-Checkins mailing list