zope.fixers for interface implementation.

relstorage/adapters/connmanager.py

@@ -16,15 +16,15 @@
 from relstorage.adapters.interfaces import IConnectionManager
 from relstorage.adapters.interfaces import ReplicaClosedException
 from relstorage.adapters.replica import ReplicaSelector
-from zope.interface import implements
+from zope.interface import implementer
 
 
+@implementer(IConnectionManager)
 class AbstractConnectionManager(object):
     """Abstract base class for connection management.
 
     Responsible for opening and closing database connections.
     """
-    implements(IConnectionManager)
 
     # disconnected_exceptions contains the exception types that might be
     # raised when the connection to the database has been broken.

relstorage/adapters/dbiter.py

@@ -14,7 +14,7 @@
 
 from base64 import decodestring
 from relstorage.adapters.interfaces import IDatabaseIterator
-from zope.interface import implements
+from zope.interface import implementer
 
 
 class DatabaseIterator(object):
@@ -54,8 +54,8 @@ def iter_objects(self, cursor, tid):
             yield oid, state
 
 
+@implementer(IDatabaseIterator)
 class HistoryPreservingDatabaseIterator(DatabaseIterator):
-    implements(IDatabaseIterator)
 
     def _transaction_iterator(self, cursor):
         """Iterate over a list of transactions returned from the database.
@@ -181,8 +181,8 @@ def iter_object_history(self, cursor, oid):
         return self._transaction_iterator(cursor)
 
 
+@implementer(IDatabaseIterator)
 class HistoryFreeDatabaseIterator(DatabaseIterator):
-    implements(IDatabaseIterator)
 
     def iter_transactions(self, cursor):
         """Iterate over the transaction log, newest first.

relstorage/adapters/locker.py

@@ -18,7 +18,7 @@
 from relstorage.adapters.interfaces import ILocker
 from .interfaces import UnableToAcquireCommitLockError
 from .interfaces import UnableToAcquirePackUndoLockError
-from zope.interface import implements
+from zope.interface import implementer
 
 
 class Locker(object):
@@ -30,8 +30,8 @@ def __init__(self, options, lock_exceptions):
         self.lock_exceptions = lock_exceptions
 
 
+@implementer(ILocker)
 class PostgreSQLLocker(Locker):
-    implements(ILocker)
 
     def __init__(self, options, lock_exceptions, version_detector):
         super(PostgreSQLLocker, self).__init__(
@@ -114,8 +114,8 @@ def release_pack_lock(self, cursor):
         # else no action needed since the lock will be released at txn commit
 
 
+@implementer(ILocker)
 class MySQLLocker(Locker):
-    implements(ILocker)
 
     @metricmethod
     def hold_commit_lock(self, cursor, ensure_current=False, nowait=False):
@@ -149,8 +149,8 @@ def release_pack_lock(self, cursor):
         cursor.execute(stmt)
 
 
+@implementer(ILocker)
 class OracleLocker(Locker):
-    implements(ILocker)
 
     def __init__(self, options, lock_exceptions, inputsize_NUMBER):
         super(OracleLocker, self).__init__(

relstorage/adapters/mover.py

@@ -22,7 +22,7 @@
 from relstorage.adapters.batch import PostgreSQLRowBatcher
 from relstorage.adapters.interfaces import IObjectMover
 from relstorage.iter import fetchmany
-from zope.interface import implements
+from zope.interface import implementer
 import os
 import sys
 
@@ -43,8 +43,8 @@ def compute_md5sum(data):
 metricmethod_sampled = Metric(method=True, rate=0.1)
 
 
+@implementer(IObjectMover)
 class ObjectMover(object):
-    implements(IObjectMover)
 
     _method_names = (
         'load_current',

relstorage/adapters/mysql.py

@@ -62,7 +62,7 @@
         raise t, v, tb
     else:
         del t, v, b
-from zope.interface import implements
+from zope.interface import implementer
 
 from relstorage.adapters.connmanager import AbstractConnectionManager
 from relstorage.adapters.dbiter import HistoryFreeDatabaseIterator
@@ -132,9 +132,9 @@ def escape_string(value, mapping=None):
 except ImportError:
 	pass
 
+@implementer(IRelStorageAdapter)
 class MySQLAdapter(object):
     """MySQL adapter for RelStorage."""
-    implements(IRelStorageAdapter)
 
     def __init__(self, options=None, **params):
         if options is None:

relstorage/adapters/oidallocator.py

@@ -21,10 +21,10 @@
 
 from perfmetrics import metricmethod
 from relstorage.adapters.interfaces import IOIDAllocator
-from zope.interface import implements
+from zope.interface import implementer
 
+@implementer(IOIDAllocator)
 class PostgreSQLOIDAllocator(object):
-    implements(IOIDAllocator)
 
     def set_min_oid(self, cursor, oid):
         """Ensure the next OID is at least the given OID."""
@@ -45,8 +45,8 @@ def new_oids(self, cursor):
         return range(n * 16 - 15, n * 16 + 1)
 
 
+@implementer(IOIDAllocator)
 class MySQLOIDAllocator(object):
-    implements(IOIDAllocator)
 
     def set_min_oid(self, cursor, oid):
         """Ensure the next OID is at least the given OID."""
@@ -66,8 +66,8 @@ def new_oids(self, cursor):
         return range(n * 16 - 15, n * 16 + 1)
 
 
+@implementer(IOIDAllocator)
 class OracleOIDAllocator(object):
-    implements(IOIDAllocator)
 
     def __init__(self, connmanager):
         self.connmanager = connmanager

relstorage/adapters/oracle.py

@@ -30,7 +30,7 @@
 from relstorage.adapters.stats import OracleStats
 from relstorage.adapters.txncontrol import OracleTransactionControl
 from relstorage.options import Options
-from zope.interface import implements
+from zope.interface import implementer
 import cx_Oracle
 import logging
 
@@ -49,9 +49,9 @@
 # when the adapter attempts to close a database connection.
 close_exceptions = disconnected_exceptions
 
+@implementer(IRelStorageAdapter)
 class OracleAdapter(object):
     """Oracle adapter for RelStorage."""
-    implements(IRelStorageAdapter)
 
     def __init__(self, user, password, dsn, commit_lock_id=0,
             twophase=False, options=None):

relstorage/adapters/packundo.py

@@ -20,7 +20,7 @@
 from relstorage.adapters.interfaces import IPackUndo
 from relstorage.iter import fetchmany
 from relstorage.treemark import TreeMarker
-from zope.interface import implements
+from zope.interface import implementer
 import logging
 import time
 
@@ -143,8 +143,8 @@ def _pause_pack_until_lock(self, cursor, sleep):
             sleep(delay)
 
 
+@implementer(IPackUndo)
 class HistoryPreservingPackUndo(PackUndo):
-    implements(IPackUndo)
 
     keep_history = True
 
@@ -909,8 +909,8 @@ class OracleHistoryPreservingPackUndo(HistoryPreservingPackUndo):
         """
 
 
+@implementer(IPackUndo)
 class HistoryFreePackUndo(PackUndo):
-    implements(IPackUndo)
 
     keep_history = False
 

relstorage/adapters/poller.py

@@ -14,16 +14,16 @@
 
 from ZODB.POSException import ReadConflictError
 from relstorage.adapters.interfaces import IPoller
-from zope.interface import implements
+from zope.interface import implementer
 import logging
 import sys
 
 log = logging.getLogger(__name__)
 
 
+@implementer(IPoller)
 class Poller:
     """Database change notification poller"""
-    implements(IPoller)
 
     def __init__(self, poll_query, keep_history, runner, revert_when_stale):
         self.poll_query = poll_query

relstorage/adapters/postgresql.py

@@ -28,7 +28,7 @@
 from relstorage.adapters.stats import PostgreSQLStats
 from relstorage.adapters.txncontrol import PostgreSQLTransactionControl
 from relstorage.options import Options
-from zope.interface import implements
+from zope.interface import implementer
 import logging
 try:
     import psycopg2
@@ -63,9 +63,9 @@
 # when the adapter attempts to close a database connection.
 close_exceptions = disconnected_exceptions
 
+@implementer(IRelStorageAdapter)
 class PostgreSQLAdapter(object):
     """PostgreSQL adapter for RelStorage."""
-    implements(IRelStorageAdapter)
 
     def __init__(self, dsn='', options=None):
         # options is a relstorage.options.Options or None

relstorage/adapters/replica.py

@@ -14,13 +14,13 @@
 
 from perfmetrics import metricmethod
 from relstorage.adapters.interfaces import IReplicaSelector
-from zope.interface import implements
+from zope.interface import implementer
 import os
 import time
 
 
+@implementer(IReplicaSelector)
 class ReplicaSelector(object):
-    implements(IReplicaSelector)
 
     def __init__(self, fn, replica_timeout):
         self.replica_conf = fn

relstorage/adapters/schema.py

@@ -16,7 +16,7 @@
 import logging
 from relstorage.adapters.interfaces import ISchemaInstaller
 from ZODB.POSException import StorageError
-from zope.interface import implements
+from zope.interface import implementer
 import re
 
 # Versions of the installed stored procedures. Change these when
@@ -930,8 +930,8 @@ def callback(conn, cursor):
         self.connmanager.open_and_call(callback)
 
 
+@implementer(ISchemaInstaller)
 class PostgreSQLSchemaInstaller(AbstractSchemaInstaller):
-    implements(ISchemaInstaller)
 
     database_type = 'postgresql'
 
@@ -1052,8 +1052,8 @@ def callback(conn, cursor):
         super(PostgreSQLSchemaInstaller, self).drop_all()
 
 
+@implementer(ISchemaInstaller)
 class MySQLSchemaInstaller(AbstractSchemaInstaller):
-    implements(ISchemaInstaller)
 
     database_type = 'mysql'
 
@@ -1083,8 +1083,8 @@ def check_compatibility(self, cursor, tables):
                             "engine, but it is using the %s engine." % engine)
 
 
+@implementer(ISchemaInstaller)
 class OracleSchemaInstaller(AbstractSchemaInstaller):
-    implements(ISchemaInstaller)
 
     database_type = 'oracle'
 

relstorage/adapters/scriptrunner.py

@@ -13,16 +13,16 @@
 ##############################################################################
 
 from relstorage.adapters.interfaces import IScriptRunner
-from zope.interface import implements
+from zope.interface import implementer
 import logging
 import re
 import sys
 
 log = logging.getLogger(__name__)
 
 
+@implementer(IScriptRunner)
 class ScriptRunner(object):
-    implements(IScriptRunner)
 
     # script_vars contains replacements for parts of scripts.
     # These are correct for PostgreSQL and MySQL but not for Oracle.

relstorage/adapters/txncontrol.py

@@ -15,7 +15,7 @@
 
 from base64 import encodestring
 from relstorage.adapters.interfaces import ITransactionControl
-from zope.interface import implements
+from zope.interface import implementer
 import logging
 
 log = logging.getLogger(__name__)
@@ -47,8 +47,8 @@ def abort(self, conn, cursor, txn=None):
         conn.rollback()
 
 
+@implementer(ITransactionControl)
 class PostgreSQLTransactionControl(TransactionControl):
-    implements(ITransactionControl)
 
     def __init__(self, keep_history):
         self.keep_history = keep_history
@@ -94,8 +94,8 @@ def add_transaction(self, cursor, tid, username, description, extension,
                 encodestring(extension)))
 
 
+@implementer(ITransactionControl)
 class MySQLTransactionControl(TransactionControl):
-    implements(ITransactionControl)
 
     def __init__(self, keep_history, Binary):
         self.keep_history = keep_history
@@ -140,8 +140,8 @@ def add_transaction(self, cursor, tid, username, description, extension,
                 self.Binary(description), self.Binary(extension)))
 
 
+@implementer(ITransactionControl)
 class OracleTransactionControl(TransactionControl):
-    implements(ITransactionControl)
 
     def __init__(self, keep_history, Binary, twophase):
         self.keep_history = keep_history

relstorage/storage.py

@@ -31,7 +31,7 @@
 from relstorage.blobhelper import is_blob_record
 from relstorage.cache import StorageCache
 from relstorage.options import Options
-from zope.interface import implements
+from zope.interface import implementer
 import ZODB.interfaces
 import base64
 import cPickle
@@ -75,12 +75,12 @@ class StorageStopIteration(IndexError, StopIteration):
 z64 = '\0' * 8
 
 
+@implementer(*_relstorage_interfaces)
 class RelStorage(
         UndoLogCompatible,
         ConflictResolution.ConflictResolvingStorage
         ):
     """Storage to a relational database, based on invalidation polling"""
-    implements(*_relstorage_interfaces)
 
     _transaction = None  # Transaction that is being committed
     _tstatus = ' '  # Transaction status, used for copying data