Merge pull request #14 from Bachmann1234/python3-no-six

Add support for Python 3

.gitignore

@@ -4,3 +4,4 @@
 build
 dist
 .venv
+.tox

.travis.yml

@@ -2,6 +2,7 @@ language: python
 python:
   - "2.6"
   - "2.7"
+  - "3.4"
 
 install:
   - pip install -r requirements.txt

pybloom/__init__.py

@@ -1,4 +1,3 @@
 """pybloom
 
 """
-from pybloom import BloomFilter, ScalableBloomFilter, __version__, __author__

pybloom/benchmarks.py

@@ -4,44 +4,46 @@
 import sys
 from pybloom import BloomFilter
 import bitarray, math, time
+from utils import range_fn
+
 
 def main(capacity=100000, request_error_rate=0.1):
     f = BloomFilter(capacity=capacity, error_rate=request_error_rate)
     assert (capacity == f.capacity)
     start = time.time()
-    for i in xrange(0, f.capacity):
+    for i in range_fn(0, f.capacity):
         f.add(i, skip_check=True)
     end = time.time()
-    print "{:5.3f} seconds to add to capacity, {:10.2f} entries/second".format(
-            end - start, f.capacity / (end - start))
+    print("{:5.3f} seconds to add to capacity, {:10.2f} entries/second".format(
+            end - start, f.capacity / (end - start)))
     oneBits = f.bitarray.count(True)
     zeroBits = f.bitarray.count(False)
     #print "Number of 1 bits:", oneBits
     #print "Number of 0 bits:", zeroBits
-    print "Number of Filter Bits:", f.num_bits
-    print "Number of slices:", f.num_slices
-    print "Bits per slice:", f.bits_per_slice
-    print "------"
-    print "Fraction of 1 bits at capacity: {:5.3f}".format(
-            oneBits / float(f.num_bits))
+    print("Number of Filter Bits:", f.num_bits)
+    print("Number of slices:", f.num_slices)
+    print("Bits per slice:", f.bits_per_slice)
+    print("------")
+    print("Fraction of 1 bits at capacity: {:5.3f}".format(
+            oneBits / float(f.num_bits)))
     # Look for false positives and measure the actual fp rate
     trials = f.capacity
     fp = 0
     start = time.time()
-    for i in xrange(f.capacity, f.capacity + trials + 1):
+    for i in range_fn(f.capacity, f.capacity + trials + 1):
         if i in f:
             fp += 1
     end = time.time()
-    print ("{:5.3f} seconds to check false positives, "
-           "{:10.2f} checks/second".format(end - start, trials / (end - start)))
-    print "Requested FP rate: {:2.4f}".format(request_error_rate)
-    print "Experimental false positive rate: {:2.4f}".format(fp / float(trials))
+    print(("{:5.3f} seconds to check false positives, "
+           "{:10.2f} checks/second".format(end - start, trials / (end - start))))
+    print("Requested FP rate: {:2.4f}".format(request_error_rate))
+    print("Experimental false positive rate: {:2.4f}".format(fp / float(trials)))
     # Compute theoretical fp max (Goel/Gupta)
     k = f.num_slices
     m = f.num_bits
     n = f.capacity
     fp_theory = math.pow((1 - math.exp(-k * (n + 0.5) / (m - 1))), k)
-    print "Projected FP rate (Goel/Gupta): {:2.6f}".format(fp_theory)
+    print("Projected FP rate (Goel/Gupta): {:2.6f}".format(fp_theory))
 
 if __name__ == '__main__' :
     status = main()