Changeset 43c50321 in trunk

Timestamp:

2010-08-05T18:55:07Z (15 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

f6f9a97

Parents:

cd8d415

git-author:

Brian Warner <warner@…> (2010-08-05 17:46:18)

git-committer:

Brian Warner <warner@…> (2010-08-05 18:55:07)

Message:

util/spans.py: nonzero cannot return a long either. for #1154

Location:

src/allmydata

Files:

• test/test_util.py (modified) (3 diffs)
• util/spans.py (modified) (2 diffs)

src/allmydata/test/test_util.py ¶

@@ -1667 +1667 @@
         self._check1(s1)
 
+        s1 = Spans(3L, 4L) # 3,4,5,6
+        self._check1(s1)
+
         s2 = Spans(s1)
         self._check1(s2)
@@ -1702 +1705 @@
         self.failIf((7,1) in s)
         self.failUnlessEqual(list(s.each()), [3,4,5,6])
+
+    def test_large(self):
+        s = Spans(4, 2**65) # don't do this with a SimpleSpans
+        self.failUnlessEqual(list(s), [(4, 2**65)])
+        self.failUnless(s)
+        self.failUnlessEqual(s.len(), 2**65)
+        self.failIf((0,1) in s)
+        self.failUnless((4,2) in s)
+        self.failUnless((2**65,2) in s)
 
     def test_math(self):
@@ -1980 +1992 @@
         ds.add(3, "ea")
         self.failUnlessEqual(ds.get(2, 4), "fear")
+
+        ds = klass()
+        ds.add(2L, "four")
+        ds.add(3L, "ea")
+        self.failUnlessEqual(ds.get(2L, 4L), "fear")
+
 
     def do_scan(self, klass):

src/allmydata/util/spans.py ¶

@@ -155 +155 @@
 
     def __nonzero__(self): # this gets us bool()
-        return self.len()
+        return bool(self.len())
 
     def len(self):
@@ -234 +234 @@
 
     def __nonzero__(self): # this gets us bool()
-        return self.len()
+        return bool(self.len())
 
     def len(self):