[Zope3-checkins] CVS: Zope3/src/zodb/storage - bdbfull.py:1.25 bdbminimal.py:1.19 demo.py:1.11 mapping.py:1.10

[Steve Alexander]

Update of /cvs-repository/Zope3/src/zodb/storage
In directory cvs.zope.org:/tmp/cvs-serv25930/src/zodb/storage

Modified Files:
	bdbfull.py bdbminimal.py demo.py mapping.py 
Log Message:
Changed old style __implements__ declarations to new-style implements()
ones.


=== Zope3/src/zodb/storage/bdbfull.py 1.24 => 1.25 ===
--- Zope3/src/zodb/storage/bdbfull.py:1.24	Tue Apr 22 11:23:13 2003
+++ Zope3/src/zodb/storage/bdbfull.py	Fri Jun  6 11:24:20 2003
@@ -20,6 +20,7 @@
 import time
 import cPickle as pickle
 from struct import pack, unpack
+from zope.interface import implements
 
 from zodb.interfaces import *
 from zodb.storage.interfaces import *
@@ -49,9 +50,9 @@
 
 
 class BDBFullStorage(BerkeleyBase):
-    
-    __implements__ = IStorage, IUndoStorage, IVersionStorage
-    
+
+    implements(IStorage, IUndoStorage, IVersionStorage)
+
     def _init(self):
         # Data Type Assumptions:
         #
@@ -1754,7 +1755,7 @@
     Transactions *must* be accessed sequentially (e.g. with a for loop).
     """
 
-    __implements__ = IStorageIterator
+    implements(IStorageIterator)
 
     def __init__(self, storage, start, stop):
         self._storage = storage
@@ -1799,7 +1800,7 @@
     Items *must* be accessed sequentially (e.g. with a for loop).
     """
 
-    __implements__ = ITransactionAttrs, ITransactionRecordIterator
+    implements(ITransactionAttrs, ITransactionRecordIterator)
 
     # Transaction id as an 8-byte timestamp string
     tid = None
@@ -1877,7 +1878,7 @@
 
 class _Record:
 
-    __implements__ = IDataRecord
+    implements(IDataRecord)
 
     # Object Id
     oid = None


=== Zope3/src/zodb/storage/bdbminimal.py 1.18 => 1.19 ===
--- Zope3/src/zodb/storage/bdbminimal.py:1.18	Tue Apr 22 11:23:13 2003
+++ Zope3/src/zodb/storage/bdbminimal.py	Fri Jun  6 11:24:20 2003
@@ -17,6 +17,8 @@
 $Id$
 """
 
+from zope.interface import implements
+
 from zodb.interfaces import ZERO
 from zodb.storage.interfaces import *
 from zodb.utils import p64, u64
@@ -37,8 +39,8 @@
 
 class BDBMinimalStorage(BerkeleyBase):
 
-    __implements__ = IStorage
-    
+    implements(IStorage)
+
     def _init(self):
         # Data Type Assumptions:
         #


=== Zope3/src/zodb/storage/demo.py 1.10 => 1.11 ===
--- Zope3/src/zodb/storage/demo.py:1.10	Thu May  1 15:35:00 2003
+++ Zope3/src/zodb/storage/demo.py	Fri Jun  6 11:24:20 2003
@@ -27,6 +27,8 @@
 $Id$
 """
 
+from zope.interface import implements
+
 from zodb.interfaces import VersionLockError
 from zodb.storage.memory import MemoryFullStorage
 from zodb.storage.interfaces import *
@@ -41,7 +43,7 @@
     when the DemoStorage object is closed.
     """
 
-    __implements__ = IStorage, IUndoStorage, IVersionStorage
+    implements(IStorage, IUndoStorage, IVersionStorage)
 
     def __init__(self, name, backstorage, config=None):
         self._back = backstorage


=== Zope3/src/zodb/storage/mapping.py 1.9 => 1.10 ===
--- Zope3/src/zodb/storage/mapping.py:1.9	Thu May  1 15:35:00 2003
+++ Zope3/src/zodb/storage/mapping.py	Fri Jun  6 11:24:20 2003
@@ -28,10 +28,11 @@
 from zodb.storage.base import BaseStorage
 from zodb.storage.interfaces import *
 from zodb.timestamp import TimeStamp
+from zope.interface import implements
 
 class MappingStorage(BaseStorage):
 
-    __implements__ = IStorage
+    implements(IStorage)
 
     def __init__(self, name="Mapping Storage"):
         BaseStorage.__init__(self, name)