merge

compile/_test_builders.py

 
 import unittest
-import gof, gof.opt
+from theano import gof
 
 from theano import compile
 from theano.compile.function_module import *

compile/_test_function.py

 import unittest
-import gof, gof.opt
+from theano import gof
 
 from theano import compile
 from theano.compile.function_module import *

tensor/_test_basic.py

@@ -8,7 +8,7 @@ import unittest
 from copy import copy
 from theano import compile
 from theano import gradient
-import gof, gof.graph
+from theano import gof
 from theano.gof.python25 import any
 from theano import gof
 from theano.gof.utils import AbstractFunctionError

tensor/_test_opt.py

@@ -3,7 +3,7 @@
 
 import unittest
 
-import gof
+from theano import gof
 from theano.tensor.opt import *
 from theano import tensor
 from theano.tensor import Tensor