From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Tue, 26 Aug 2008 15:50:55 +0000 (-0700)
Subject: mutable: remove work-around for a flaw in an older version of foolscap
X-Git-Url: https://git.rkrishnan.org/nxhtml.html?a=commitdiff_plain;h=f7b4c45d4651b25b84b8947eb9c66d34f2095faa;p=tahoe-lafs%2Ftahoe-lafs.git

mutable: remove work-around for a flaw in an older version of foolscap
We now require "foolscap[secure_connections] >= 0.3.0", per [source:_auto_deps.py].
---

diff --git a/src/allmydata/mutable/publish.py b/src/allmydata/mutable/publish.py
index 04621559..d6706d54 100644
--- a/src/allmydata/mutable/publish.py
+++ b/src/allmydata/mutable/publish.py
@@ -576,18 +576,7 @@ class Publish:
 
             else:
                 # add a testv that requires the share not exist
-                #testv = (0, 1, 'eq', "")
-
-                # Unfortunately, foolscap-0.2.5 has a bug in the way inbound
-                # constraints are handled. If the same object is referenced
-                # multiple times inside the arguments, foolscap emits a
-                # 'reference' token instead of a distinct copy of the
-                # argument. The bug is that these 'reference' tokens are not
-                # accepted by the inbound constraint code. To work around
-                # this, we need to prevent python from interning the
-                # (constant) tuple, by creating a new copy of this vector
-                # each time. This bug is fixed in later versions of foolscap.
-                testv = tuple([0, 1, 'eq', ""])
+                testv = (0, 1, 'eq', "")
 
             testvs = [testv]
             # the write vector is simply the share