From c868f77c7108bf39a062771527d94e5ccd4ebe22 Mon Sep 17 00:00:00 2001 From: Brian Warner <warner@allmydata.com> Date: Tue, 16 Jan 2007 19:56:30 -0700 Subject: [PATCH] encode_new.py: recent Foolscap accepts 'None' as a constraint --- src/allmydata/encode_new.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/allmydata/encode_new.py b/src/allmydata/encode_new.py index df09f6d4..0afb9d1f 100644 --- a/src/allmydata/encode_new.py +++ b/src/allmydata/encode_new.py @@ -206,19 +206,18 @@ class Encoder(object): from foolscap import RemoteInterface -from foolscap.schema import ListOf, TupleOf, Nothing -_None = Nothing() +from foolscap.schema import ListOf, TupleOf class RIStorageBucketWriter(RemoteInterface): def put_subshare(segment_number=int, subshare=str): - return _None + return None def put_segment_hashes(all_hashes=ListOf(str)): - return _None + return None def put_share_hashes(needed_hashes=ListOf(TupleOf(int,str))): - return _None + return None #def write(data=str, offset=int): - # return _None + # return None class RIStorageBucketReader(RemoteInterface): def get_share_hashes(): return ListOf(TupleOf(int,str)) @@ -228,5 +227,3 @@ class RIStorageBucketReader(RemoteInterface): return str #def read(size=int, offset=int): # return str - -"figleaf doesn't like the last line of the file to be a comment" -- 2.45.2