From b38cfd02353f6ccbb3d8df20e926876f449dec8f Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 4 Apr 2012 11:13:59 -0700 Subject: [PATCH] move IServer from storage_client.py to interfaces.py --- src/allmydata/interfaces.py | 9 +++++++++ src/allmydata/storage_client.py | 13 ++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/allmydata/interfaces.py b/src/allmydata/interfaces.py index db1c6b52..a73ce860 100644 --- a/src/allmydata/interfaces.py +++ b/src/allmydata/interfaces.py @@ -420,6 +420,15 @@ class IStorageBroker(Interface): repeatable way, to distribute load over many peers. """ +class IServer(Interface): + """I live in the client, and represent a single server.""" + def start_connecting(tub, trigger_cb): + pass + def get_nickname(): + pass + def get_rref(): + pass + class IMutableSlotWriter(Interface): """ diff --git a/src/allmydata/storage_client.py b/src/allmydata/storage_client.py index 72e6319a..763c2a06 100644 --- a/src/allmydata/storage_client.py +++ b/src/allmydata/storage_client.py @@ -30,9 +30,9 @@ the foolscap-based server implemented in src/allmydata/storage/*.py . import re, time -from zope.interface import implements, Interface +from zope.interface import implements from foolscap.api import eventually -from allmydata.interfaces import IStorageBroker +from allmydata.interfaces import IStorageBroker, IServer from allmydata.util import log, base32 from allmydata.util.assertutil import precondition from allmydata.util.rrefutil import add_version_to_remote_reference @@ -139,15 +139,6 @@ class StorageFarmBroker: return self.servers[serverid].get_nickname() return None -class IServer(Interface): - """I live in the client, and represent a single server.""" - def start_connecting(tub, trigger_cb): - pass - def get_nickname(): - pass - def get_rref(): - pass - class NativeStorageServer: """I hold information about a storage server that we want to connect to. If we are connected, I hold the RemoteReference, their host address, and -- 2.45.2