From: Brian Warner <warner@allmydata.com>
Date: Wed, 17 Jan 2007 02:56:30 +0000 (-0700)
Subject: encode_new.py: recent Foolscap accepts 'None' as a constraint
X-Git-Tag: tahoe_v0.1.0-0-UNSTABLE~364
X-Git-Url: https://git.rkrishnan.org/components/com_hotproperty/simplejson/running.html?a=commitdiff_plain;h=c868f77c7108bf39a062771527d94e5ccd4ebe22;p=tahoe-lafs%2Ftahoe-lafs.git

encode_new.py: recent Foolscap accepts 'None' as a constraint
---

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"