Python 3 compatibility

func_name
StringIO
ifilter

Author: mrocklin

strategies/branch/core.py

@@ -1,6 +1,5 @@
 """ Generic SymPy-Independent Strategies """
-import itertools
-from toolz import curry
+from toolz import curry, filter
 
 def identity(x):
     yield x
@@ -31,7 +30,7 @@ def debug(fn, file=None):
         file = stdout
 
     def write(brl, x, result):
-        file.write("Rule: %s\n"%brl.func_name)
+        file.write("Rule: %s\n"%brl.__name__)
         file.write("In: %s\nOut: %s\n\n"%(x, result))
 
     return onaction(fn, write)
@@ -59,7 +58,7 @@ def condition(cond, fn, x):
 @curry
 def sfilter(pred, fn, x):
     """ Yield only those results which satisfy the predicate """
-    for x in itertools.ifilter(pred, fn(x)):
+    for x in filter(pred, fn(x)):
         yield x
 
 @curry

strategies/branch/tests/test_core.py

@@ -35,14 +35,18 @@ def test_exhaust():
     assert set(brl(5)) == set([0, 10])
 
 def test_debug():
-    import StringIO
-    file = StringIO.StringIO()
+    try:
+        from StringIO import StringIO
+    except ImportError:
+        from io import StringIO
+
+    file = StringIO()
     rl = debug(posdec, file)
     list(rl(5))
     log = file.getvalue()
     file.close()
 
-    assert posdec.func_name in log
+    assert posdec.__name__ in log
     assert '5' in log
     assert '4' in log
 

strategies/core.py

@@ -42,7 +42,7 @@ def debug(fn, file=None):
         file = stdout
 
     def write(fn, x, result):
-        file.write("Fn:  %s\n"%fn.func_name)
+        file.write("Fn:  %s\n"%fn.__name__)
         file.write("In:  %s\nOut: %s\n\n"%(x, result))
 
     return onaction(fn, write)

strategies/tests/test_core.py

@@ -33,14 +33,17 @@ def test_do_one():
     assert rl(5) == 4
 
 def test_debug():
-    import StringIO
-    file = StringIO.StringIO()
+    try:
+        from StringIO import StringIO
+    except ImportError:
+        from io import StringIO
+    file = StringIO()
     rl = debug(posdec, file)
     rl(5)
     log = file.getvalue()
     file.close()
 
-    assert posdec.func_name in log
+    assert posdec.__name__ in log
     assert '5' in log
     assert '4' in log