Make adjustments to fix tbloom for python 3

[bup.git] / lib / bup / t / tbloom.py

diff --git a/lib/bup/t/tbloom.py b/lib/bup/t/tbloom.py
index 2f17046eb002bab12b17049870dd4da775f99517..3fa9f358cf30bcb8073914a04d280ceba1719f62 100644 (file)
--- a/lib/bup/t/tbloom.py
+++ b/lib/bup/t/tbloom.py
@@ -1,5 +1,5 @@
 
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
 import errno, platform, tempfile
 
 from wvtest import *
@@ -12,32 +12,32 @@ from buptest import no_lingering_errors, test_tempdir
 @wvtest
 def test_bloom():
     with no_lingering_errors():
-        with test_tempdir('bup-tbloom-') as tmpdir:
+        with test_tempdir(b'bup-tbloom-') as tmpdir:
             hashes = [os.urandom(20) for i in range(100)]
             class Idx:
                 pass
             ix = Idx()
-            ix.name='dummy.idx'
-            ix.shatable = ''.join(hashes)
+            ix.name = b'dummy.idx'
+            ix.shatable = b''.join(hashes)
             for k in (4, 5):
-                b = bloom.create(tmpdir + '/pybuptest.bloom', expected=100, k=k)
+                b = bloom.create(tmpdir + b'/pybuptest.bloom', expected=100, k=k)
                 b.add_idx(ix)
                 WVPASSLT(b.pfalse_positive(), .1)
                 b.close()
-                b = bloom.ShaBloom(tmpdir + '/pybuptest.bloom')
+                b = bloom.ShaBloom(tmpdir + b'/pybuptest.bloom')
                 all_present = True
                 for h in hashes:
-                    all_present &= b.exists(h)
+                    all_present &= (b.exists(h) or False)
                 WVPASS(all_present)
                 false_positives = 0
                 for h in [os.urandom(20) for i in range(1000)]:
                     if b.exists(h):
                         false_positives += 1
                 WVPASSLT(false_positives, 5)
-                os.unlink(tmpdir + '/pybuptest.bloom')
+                os.unlink(tmpdir + b'/pybuptest.bloom')
 
             tf = tempfile.TemporaryFile(dir=tmpdir)
-            b = bloom.create('bup.bloom', f=tf, expected=100)
+            b = bloom.create(b'bup.bloom', f=tf, expected=100)
             WVPASSEQ(b.rwfile, tf)
             WVPASSEQ(b.k, 5)
 
@@ -47,7 +47,7 @@ def test_bloom():
             tf = tempfile.TemporaryFile(dir=tmpdir)
             skip_test = False
             try:
-                b = bloom.create('bup.bloom', f=tf, expected=2**28,
+                b = bloom.create(b'bup.bloom', f=tf, expected=2**28,
                                  delaywrite=False)
             except EnvironmentError as ex:
                 (ptr_width, linkage) = platform.architecture()