Merge pull request #1411 from nouiz/py3

theano/compat/__init__.py

@@ -4,7 +4,8 @@
 
 # Python 3.x compatibility
 from theano.compat.six import PY3, b, BytesIO, next, get_unbound_function
-from theano.compat.six.moves import reload_module as reload, configparser
+from theano.compat.six.moves import configparser
+from theano.compat.six.moves import reload_module as reload
 
 if PY3:
 

theano/compile/tests/test_monitormode.py

@@ -49,7 +49,7 @@ def test_optimizer():
     f = theano.function([x], [theano.tensor.log(x) * x],
                         mode=mode)
     # Test that the fusion wasn't done
-    assert len(f.maker.fgraph.nodes) == 2
+    assert len(f.maker.fgraph.apply_nodes) == 2
     f(0)  # log(0) * 0 = -inf * 0 = NaN
 
     # Test that we still detect the nan
@@ -83,7 +83,7 @@ def test_not_inplace():
                         mode=mode)
 
     # Test that the fusion wasn't done
-    assert len(f.maker.fgraph.nodes) == 5
+    assert len(f.maker.fgraph.apply_nodes) == 5
     assert not f.maker.fgraph.toposort()[-1].op.destroy_map
     f([0, 0])  # log(0) * 0 = -inf * 0 = NaN