Merge pull request #2205 from lamblin/pep8_tensor_basic

theano/ifelse.py

@@ -435,7 +435,7 @@ where, each of the optimization do the following things:
 acceptable_ops = (theano.tensor.basic.Dot,
                   theano.tensor.basic.Reshape,
                   theano.tensor.basic.Shape,
-                  theano.tensor.basic.SpecifyShape,
+                  theano.tensor.SpecifyShape,
                   theano.tensor.basic.MaxAndArgmax,
                   theano.tensor.Subtensor,
                   theano.tensor.IncSubtensor,

theano/tensor/__init__.py

@@ -65,3 +65,6 @@ from theano.tensor.sort import sort, argsort
 from theano.tensor.extra_ops import (DiffOp, bincount, squeeze,
                        repeat, bartlett, fill_diagonal, fill_diagonal_offset,
                        cumsum, cumprod)
+
+# SpecifyShape is defined in theano.compile, but should be available in tensor
+from theano.compile import SpecifyShape, specify_shape

theano/tensor/tests/test_opt.py

@@ -1650,8 +1650,7 @@ def test_local_useless_subtensor():
         #theano.printing.debugprint(f)
         prog = f.maker.fgraph.toposort()
         if res:
-            assert isinstance(prog[0].op, theano.tensor.basic.
-                              SpecifyShape), dims
+            assert isinstance(prog[0].op, theano.tensor.SpecifyShape), dims
             assert prog[1].op == tensor.exp, dims
             assert len(prog) == 2, dims
         else: