From 652e8a735f718fc8983084844cd53164cac21dfb Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Fri, 13 Apr 2007 19:04:38 -0700
Subject: [PATCH] interfaces: use explicit TupleOf and ChoiceOf constraints,
since the upcoming version of Foolscap changes the meaning of bare tuples
(from ChoiceOf to TupleOf)
---
src/allmydata/interfaces.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/allmydata/interfaces.py b/src/allmydata/interfaces.py
index 099a79e7..f724ccd5 100644
--- a/src/allmydata/interfaces.py
+++ b/src/allmydata/interfaces.py
@@ -1,6 +1,7 @@
from zope.interface import Interface
-from foolscap.schema import StringConstraint, ListOf, TupleOf, SetOf, DictOf
+from foolscap.schema import StringConstraint, ListOf, TupleOf, SetOf, DictOf, \
+ ChoiceOf
from foolscap import RemoteInterface, Referenceable
HASH_SIZE=32
@@ -81,12 +82,12 @@ RIMutableDirectoryNode_ = Any() # TODO: how can we avoid this?
class RIMutableDirectoryNode(RemoteInterface):
def list():
return ListOf( TupleOf(str, # name, relative to directory
- (RIMutableDirectoryNode_, Verifierid)),
+ ChoiceOf(RIMutableDirectoryNode_, Verifierid)),
maxLength=100,
)
def get(name=str):
- return (RIMutableDirectoryNode_, Verifierid)
+ return ChoiceOf(RIMutableDirectoryNode_, Verifierid)
def add_directory(name=str):
return RIMutableDirectoryNode_
--
2.45.2